experimental: get rid of gender exclusive items
all items are available to everyone now
This commit is contained in:
parent
8bc02ddc8d
commit
bcff94ff44
|
|
@ -18,41 +18,9 @@ class CatalogAccessoryItem(CatalogItem.CatalogItem):
|
|||
def storedInTrunk(self):
|
||||
return 1
|
||||
|
||||
def notOfferedTo(self, avatar):
|
||||
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
|
||||
|
||||
def forBoysOnly(self):
|
||||
article = AccessoryTypes[self.accessoryType][ATArticle]
|
||||
if article in [ABoysHat,
|
||||
ABoysGlasses,
|
||||
ABoysBackpack,
|
||||
ABoysShoes]:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
def forGirlsOnly(self):
|
||||
article = AccessoryTypes[self.accessoryType][ATArticle]
|
||||
if article in [AGirlsHat,
|
||||
AGirlsGlasses,
|
||||
AGirlsBackpack,
|
||||
AGirlsShoes]:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
|
||||
def getPurchaseLimit(self):
|
||||
return 1
|
||||
|
|
|
|||
|
|
@ -312,29 +312,9 @@ class CatalogClothingItem(CatalogItem.CatalogItem):
|
|||
def storedInCloset(self):
|
||||
return 1
|
||||
|
||||
def notOfferedTo(self, avatar):
|
||||
article = ClothingTypes[self.clothingType][CTArticle]
|
||||
if article == AShirt or article == AShorts:
|
||||
return 0
|
||||
forBoys = (article == ABoysShirt or article == ABoysShorts)
|
||||
if avatar.getStyle().getGender() == 'm':
|
||||
return not forBoys
|
||||
else:
|
||||
return forBoys
|
||||
|
||||
|
||||
def forBoysOnly(self):
|
||||
article = ClothingTypes[self.clothingType][CTArticle]
|
||||
if article == ABoysShirt or article == ABoysShorts:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
def forGirlsOnly(self):
|
||||
article = ClothingTypes[self.clothingType][CTArticle]
|
||||
if article == AGirlsShirt or article == AGirlsSkirt or article == AGirlsShorts:
|
||||
return 1
|
||||
else:
|
||||
return 0
|
||||
|
||||
|
||||
def getPurchaseLimit(self):
|
||||
return 1
|
||||
|
|
|
|||
|
|
@ -936,15 +936,7 @@ class CatalogFurnitureItem(CatalogAtticItem.CatalogAtticItem):
|
|||
return None
|
||||
return None
|
||||
|
||||
def notOfferedTo(self, avatar):
|
||||
if self.getFlags() & FLCloset or self.getFlags() & FLTrunk:
|
||||
decade = self.furnitureType - self.furnitureType % 10
|
||||
forBoys = (decade == 500 or decade == 4000)
|
||||
if avatar.getStyle().getGender() == 'm':
|
||||
return not forBoys
|
||||
else:
|
||||
return forBoys
|
||||
return 0
|
||||
|
||||
|
||||
def isDeletable(self):
|
||||
return self.getFlags() & (FLBank | FLCloset | FLPhone | FLTrunk) == 0
|
||||
|
|
|
|||
|
|
@ -1642,9 +1642,9 @@ class CatalogGenerator:
|
|||
item = MetaItems[item]
|
||||
selection = []
|
||||
if isinstance(item, CatalogItem.CatalogItem):
|
||||
if not item.notOfferedTo(avatar):
|
||||
item.saleItem = saleItem
|
||||
selection.append(item)
|
||||
|
||||
item.saleItem = saleItem
|
||||
selection.append(item)
|
||||
elif item != None:
|
||||
list = item[:]
|
||||
for i in range(chooseCount):
|
||||
|
|
@ -1661,7 +1661,7 @@ class CatalogGenerator:
|
|||
index = random.randrange(len(list))
|
||||
item = list[index]
|
||||
del list[index]
|
||||
while item.notOfferedTo(avatar) or item.reachedPurchaseLimit(avatar) or item in duplicateItems or item in avatar.backCatalog or item in avatar.weeklyCatalog:
|
||||
while item.reachedPurchaseLimit(avatar) or item in duplicateItems or item in avatar.backCatalog or item in avatar.weeklyCatalog:
|
||||
if len(list) == 0:
|
||||
return None
|
||||
index = random.randrange(len(list))
|
||||
|
|
|
|||
|
|
@ -82,8 +82,7 @@ class CatalogItem:
|
|||
def storedInAttic(self):
|
||||
return 0
|
||||
|
||||
def notOfferedTo(self, avatar):
|
||||
return 0
|
||||
|
||||
|
||||
def getPurchaseLimit(self):
|
||||
return 0
|
||||
|
|
@ -120,11 +119,7 @@ class CatalogItem:
|
|||
def isRental(self):
|
||||
return 0
|
||||
|
||||
def forBoysOnly(self):
|
||||
return 0
|
||||
|
||||
def forGirlsOnly(self):
|
||||
return 0
|
||||
|
||||
def setLoyaltyRequirement(self, days):
|
||||
self.loyaltyDays = days
|
||||
|
|
|
|||
|
|
@ -484,13 +484,8 @@ class CatalogItemPanel(DirectFrame):
|
|||
return
|
||||
elif self.parentCatalogScreen.gotAvatar == 1:
|
||||
avatar = self.parentCatalogScreen.giftAvatar
|
||||
if self['item'].forBoysOnly() and avatar.getStyle().getGender() == 'f' or self['item'].forGirlsOnly() and avatar.getStyle().getGender() == 'm':
|
||||
self.giftButton.show()
|
||||
self.giftButton['state'] = DGG.DISABLED
|
||||
auxText = TTLocalizer.CatalogNoFit
|
||||
self.auxText['text'] = auxText
|
||||
return
|
||||
elif self['item'].reachedPurchaseLimit(avatar):
|
||||
|
||||
if self['item'].reachedPurchaseLimit(avatar):
|
||||
self.giftButton.show()
|
||||
self.giftButton['state'] = DGG.DISABLED
|
||||
auxText = TTLocalizer.CatalogPurchasedGiftText
|
||||
|
|
|
|||
Loading…
Reference in New Issue