catalog: Turn off Gardening and add a config variable for accessories.

This commit is contained in:
Joey Z 2014-05-31 13:54:04 -04:00
parent 8118192f48
commit 777a25545a
6 changed files with 36 additions and 29 deletions

View file

@ -47,6 +47,7 @@ want-pets #f
want-news-tab #f
want-news-page #f
want-old-fireworks #t
want-accessories #f
# This is a temporary 'fix' for DistributedSmoothNodes... probably not the permanent solution to our problem, but it works for now.
smooth-lag 0.4

View file

@ -5,12 +5,13 @@
# Client settings
window-title Toontown Rewritten [BETA]
server-version SERVER_VERSION_HERE
language LANGUAGE_HERE
audio-library-name p3openal_audio
sync-video #f
want-dev #f
preload-avatars #t
language LANGUAGE_HERE
# This is a temporary 'fix' for DistributedSmoothNodes... probably not the permanent solution to our problem, but it works for now.
smooth-lag 0.4
# Resources settings
model-path /
@ -42,8 +43,7 @@ want-pets #f
want-news-tab #f
want-news-page #f
want-old-fireworks #t
# This is a temporary 'fix' for DistributedSmoothNodes... probably not the permanent solution to our problem, but it works for now.
smooth-lag 0.4
want-accessories #f
# Holidays and Events

View file

@ -15,3 +15,4 @@ want-bbhq #f
want-pets #f
want-old-fireworks #t
want-parties #f
want-accessories #f

View file

@ -19,21 +19,23 @@ class CatalogAccessoryItem(CatalogItem.CatalogItem):
return 1
def notOfferedTo(self, avatar):
return 1 # We're not offering accessories at the moment.
article = AccessoryTypes[self.accessoryType][ATArticle]
if article in [AHat,
AGlasses,
ABackpack,
AShoes]:
return 0
forBoys = article in [ABoysHat,
ABoysGlasses,
ABoysBackpack,
ABoysShoes]
if avatar.getStyle().getGender() == 'm':
return not forBoys
else:
return forBoys
if simbase.config.GetBool('want-accessories', 1):
article = AccessoryTypes[self.accessoryType][ATArticle]
if article in [AHat,
AGlasses,
ABackpack,
AShoes]:
return 0
forBoys = article in [ABoysHat,
ABoysGlasses,
ABoysBackpack,
ABoysShoes]
if avatar.getStyle().getGender() == 'm':
return not forBoys
else:
return forBoys
# If we get here, we probably don't want accessories yet.
return 1
def forBoysOnly(self):
article = AccessoryTypes[self.accessoryType][ATArticle]

View file

@ -1168,15 +1168,18 @@ def getAllClosets():
def get50ItemTrunk(avatar, duplicateItems):
if avatar.getStyle().getGender() == 'm':
index = 0
else:
index = 1
trunkId = MaxTrunkIds[index]
item = CatalogFurnitureItem(trunkId)
if item in avatar.onOrder or item in avatar.mailboxContents:
return None
return item
if simbase.config.GetBool('want-accessories', 1):
if avatar.getStyle().getGender() == 'm':
index = 0
else:
index = 1
trunkId = MaxTrunkIds[index]
item = CatalogFurnitureItem(trunkId)
if item in avatar.onOrder or item in avatar.mailboxContents:
return None
return item
# If we get here, we probably don't want accessories yet.
return None
def getMaxTrunks():

View file

@ -513,7 +513,7 @@ MonthlySchedule = ((7,
CatalogGardenItem(104, 1),
CatalogToonStatueItem(105, endPoseIndex=108),
CatalogRentalItem(1, 2880, 1000),
CatalogGardenStarterItem(),
# CatalogGardenStarterItem(), # We don't want Gardens yet.
CatalogNametagItem(100),
CatalogNametagItem(0),
CatalogClothingItem(1608, 0, 720),