Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3201 from InspectorCaracal/patch-6

Browse source 
Minor fixes to crafting contrib
This commit is contained in:
Griatch 2023-06-10 07:40:12 +02:00 • committed by GitHub
commit 3d40b2237d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/contrib/game_systems/crafting/crafting.py
View file

@ -604,8 +604,12 @@ class CraftingRecipe(CraftingRecipeBase):
else: else:
self.tool_names = self.tool_tags self.tool_names = self.tool_tags
assert isinstance(
self.output_prototypes, (list, tuple)
), "Crafting {self.__class__}.output_prototypes must be a list or tuple."
if self.output_names: if self.output_names:
assert len(self.consumable_names) == len(self.consumable_tags), ( assert len(self.output_names) == len(self.output_prototypes), (
f"Crafting {self.__class__}.output_names list must " f"Crafting {self.__class__}.output_names list must "
"have the same length as .output_prototypes." "have the same length as .output_prototypes."
) )
@ -617,10 +621,6 @@ class CraftingRecipe(CraftingRecipeBase):
for prot in self.output_prototypes for prot in self.output_prototypes
] ]
assert isinstance(
self.output_prototypes, (list, tuple)
), "Crafting {self.__class__}.output_prototypes must be a list or tuple."
# don't allow reuse if we have consumables. If only tools we can reuse # don't allow reuse if we have consumables. If only tools we can reuse
# over and over since nothing changes. # over and over since nothing changes.
self.allow_reuse = not bool(self.consumable_tags) self.allow_reuse = not bool(self.consumable_tags)