Skip to content

Commit 0ff7968

Browse files
committed
fix duplication issue
1 parent b93fb5f commit 0ff7968

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

worlds/crosscode/types/pools.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ def __should_include(self, metadata: IncludeOptions | None) -> bool:
123123

124124
result = True
125125

126-
if metadata.get("trade", False):
127-
result &= self.options["trade"]
128-
if metadata.get("shop", False):
129-
result &= self.options["shop"]
130-
if metadata.get("arena", False):
131-
result &= self.options["arena"]
132-
if metadata.get("chest", False):
133-
result &= self.options["chest"]
134-
if metadata.get("quest", False):
135-
result &= self.options["quest"]
126+
if metadata.get("trade", False) != self.options["trade"]:
127+
result = False
128+
if metadata.get("shop", False) != self.options["shop"]:
129+
result = False
130+
if metadata.get("arena", False) != self.options["arena"]:
131+
result = False
132+
if metadata.get("chest", False) != self.options["chest"]:
133+
result = False
134+
if metadata.get("quest", False) != self.options["quest"]:
135+
result = False
136136

137137
return result
138138

worlds/crosscode/world.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,6 @@ def generate_early(self):
270270

271271
green_leaf_shade_name = "Green Leaf Shade"
272272

273-
self.required_items = Counter()
274-
self.required_items.update(self.pools.item_pools["required"])
275-
276273
area_unlocks = self.options.progressive_area_unlocks.value
277274
if area_unlocks & ProgressiveAreaUnlocks.COMBINE_POOLS:
278275
self.enabled_chain_names.add("areaItemsAll")

0 commit comments

Comments
 (0)