mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-23 11:42:39 -06:00
Fix a crash and update resources.
This commit is contained in:
parent
d5d0d42e97
commit
2aa8488175
4 changed files with 10 additions and 3 deletions
|
@ -74,6 +74,9 @@ want-pstats 0
|
||||||
want-whitelist #f
|
want-whitelist #f
|
||||||
want-sequence-list #f
|
want-sequence-list #f
|
||||||
|
|
||||||
|
want-emblems #t
|
||||||
|
cogdo-want-barrel-room #t
|
||||||
|
|
||||||
|
|
||||||
#<dev>
|
#<dev>
|
||||||
show-total-population #t
|
show-total-population #t
|
||||||
|
|
|
@ -40,6 +40,10 @@ get-key-reward-always #t
|
||||||
get-crate-reward-always #t
|
get-crate-reward-always #t
|
||||||
|
|
||||||
|
|
||||||
|
want-emblems #t
|
||||||
|
cogdo-want-barrel-room #t
|
||||||
|
|
||||||
|
|
||||||
# Chat Settings
|
# Chat Settings
|
||||||
want-whitelist #f
|
want-whitelist #f
|
||||||
want-sequence-list #f
|
want-sequence-list #f
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 769d26390634d17384aa28021cc7afd88306c4af
|
Subproject commit aacdc95eac2459a4af7234f2b8ad7b36eab5d516
|
|
@ -1059,7 +1059,7 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem):
|
||||||
return 24 * 60
|
return 24 * 60
|
||||||
|
|
||||||
def getPicture(self, avatar):
|
def getPicture(self, avatar):
|
||||||
model = self.loadModel(animate=0)
|
model = self.loadModel()
|
||||||
spin = 1
|
spin = 1
|
||||||
flags = self.getFlags()
|
flags = self.getFlags()
|
||||||
if flags & FLRug:
|
if flags & FLRug:
|
||||||
|
@ -1095,7 +1095,7 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem):
|
||||||
def getBasePrice(self):
|
def getBasePrice(self):
|
||||||
return FurnitureTypes[self.furnitureType][FTBasePrice]
|
return FurnitureTypes[self.furnitureType][FTBasePrice]
|
||||||
|
|
||||||
def loadModel(self, animate=1):
|
def loadModel(self):
|
||||||
type = FurnitureTypes[self.furnitureType]
|
type = FurnitureTypes[self.furnitureType]
|
||||||
model = loader.loadModel(type[FTModelName])
|
model = loader.loadModel(type[FTModelName])
|
||||||
self.applyColor(model, type[FTColor])
|
self.applyColor(model, type[FTColor])
|
||||||
|
|
Loading…
Reference in a new issue