SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

Avoid extraneous bool call

Browse Source 
(cherry picked from commit 6a4b56a182)
This commit is contained in:
Gouvernathor 2023-11-14 23:35:10 +01:00 committed by LoafyLemon
parent f1a0c779f6
commit 5ef4d4f2db
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
game/scripts/shops/item/menu.rpy
View File

@ -31,9 +31,9 @@ label shop_item_menu(xx=150, yy=90):
current_sorting = "Price (Asc)" current_sorting = "Price (Asc)"
if current_category in {"Gifts", "Ingredients"}: if current_category in {"Gifts", "Ingredients"}:
category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.unlocked)] category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.unlocked)]
elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}: elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}:
category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.owned < x.limit and x.unlocked)] category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.owned < x.limit and x.unlocked)]
menu_items = shop_item_sortfilter(category_items, current_sorting) menu_items = shop_item_sortfilter(category_items, current_sorting)
menu_items_length = len(menu_items) menu_items_length = len(menu_items)
@ -50,9 +50,9 @@ label shop_item_menu(xx=150, yy=90):
elif __choice[0] == "category": elif __choice[0] == "category":
$ current_category = __choice[1] $ current_category = __choice[1]
if current_category in {"Gifts", "Ingredients"}: if current_category in {"Gifts", "Ingredients"}:
$ category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.unlocked)] $ category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.unlocked)]
elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}: elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}:
$ category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.owned < x.limit and x.unlocked)] $ category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.owned < x.limit and x.unlocked)]
$ menu_items = shop_item_sortfilter(category_items, current_sorting) $ menu_items = shop_item_sortfilter(category_items, current_sorting)
$ menu_items_length = len(menu_items) $ menu_items_length = len(menu_items)
$ current_page = 0 $ current_page = 0
@ -73,9 +73,9 @@ label shop_item_menu(xx=150, yy=90):
$ renpy.call("purchase_item", current_item) $ renpy.call("purchase_item", current_item)
if current_category in {"Gifts", "Ingredients"}: if current_category in {"Gifts", "Ingredients"}:
$ category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.unlocked)] $ category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.unlocked)]
elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}: elif current_category in {"Books", "Scrolls", "Decorations", "Quest Items"}:
$ category_items = [x for x in inventory_dict[current_category] if bool(x.price > 0 and x.owned < x.limit and x.unlocked)] $ category_items = [x for x in inventory_dict[current_category] if (x.price > 0 and x.owned < x.limit and x.unlocked)]
$ menu_items = shop_item_sortfilter(category_items, current_sorting) $ menu_items = shop_item_sortfilter(category_items, current_sorting)
$ menu_items_length = len(menu_items) $ menu_items_length = len(menu_items)