Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Zach's getPos, CatalogGUI and furniture fixes.

Browse source
This commit is contained in:
Loudrob 2015-03-04 05:45:35 -05:00
parent de77765d44
commit 5727c4355b
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
otp/avatar/DistributedAvatar.py
View file

@ -327,3 +327,12 @@ def leftHand(prop=None):
child.removeNode() child.removeNode()
requestedProp = globalPropPool.getProp(prop) requestedProp = globalPropPool.getProp(prop)
requestedProp.reparentTo(leftHand) requestedProp.reparentTo(leftHand)
@magicWord(category=CATEGORY_PROGRAMMER, types=[])
def getPos():
"""
print av position
"""
target = spellbook.getTarget()
pos = target.getPos()
print(pos)

12
toontown/catalog/CatalogGUI.py
View file

@ -36,11 +36,17 @@ class CatalogGUI(NodePath, DirectObject):
guiItems = loader.loadModel('phase_5.5/models/gui/catalog_gui') guiItems = loader.loadModel('phase_5.5/models/gui/catalog_gui')
hangupGui = guiItems.find('**/hangup') hangupGui = guiItems.find('**/hangup')
hangupRolloverGui = guiItems.find('**/hangup_rollover') hangupRolloverGui = guiItems.find('**/hangup_rollover')
self.hangup = DirectButton(self, relief=None, pos=(2.28, 0, -1.3), self.hangup = DirectButton(self,
relief=None,
pos=(-0.158, 0, 0.17),
parent=base.a2dBottomRight,
image=[hangupGui, hangupRolloverGui, hangupRolloverGui, hangupGui], image=[hangupGui, hangupRolloverGui, hangupRolloverGui, hangupGui],
text=['', TTLocalizer.CatalogHangUp, TTLocalizer.CatalogHangUp], text=['', TTLocalizer.CatalogHangUp, TTLocalizer.CatalogHangUp],
text_fg=Vec4(1), text_scale=0.07, text_pos=(0.0, 0.14), text_fg=Vec4(1),
command=self.hangUp) text_scale=0.07,
text_pos=(0.0, 0.14),
command=self.hangUp
)
guiItems.removeNode() guiItems.removeNode()
def setCurrentTab(self, tab): def setCurrentTab(self, tab):

4
toontown/estate/DistributedFurnitureManager.py
View file

@ -34,8 +34,8 @@ class DistributedFurnitureManager(DistributedObject.DistributedObject):
if self.ownerId == base.localAvatar.doId: if self.ownerId == base.localAvatar.doId:
self.cr.furnitureManager = self self.cr.furnitureManager = self
if self.cr.objectManager == None: if self.cr.objectManager == None:
import houseDesign import HouseDesign
self.cr.objectManager = houseDesign.ObjectManager() self.cr.objectManager = HouseDesign.ObjectManager()
return return
def setOwnerName(self, name): def setOwnerName(self, name):