Merge pull request #3626 from feyrkh/feyrkh-patch-1
Fix 'defense_type' typos in beginner tutorial + EvAdventure utils.py
This commit is contained in:
commit
26e671f146
2 changed files with 4 additions and 4 deletions
|
|
@ -248,7 +248,7 @@ class EvAdventureWeapon(EvAdventureObject):
|
||||||
quality = AttributeProperty(3, autocreate=False)
|
quality = AttributeProperty(3, autocreate=False)
|
||||||
|
|
||||||
attack_type = AttributeProperty(Ability.STR, autocreate=False)
|
attack_type = AttributeProperty(Ability.STR, autocreate=False)
|
||||||
defend_type = AttributeProperty(Ability.ARMOR, autocreate=False)
|
defense_type = AttributeProperty(Ability.ARMOR, autocreate=False)
|
||||||
|
|
||||||
damage_roll = AttributeProperty("1d6", autocreate=False)
|
damage_roll = AttributeProperty("1d6", autocreate=False)
|
||||||
|
|
||||||
|
|
@ -387,7 +387,7 @@ class EvAdventureRuneStone(EvAdventureWeapon, EvAdventureConsumable):
|
||||||
quality = AttributeProperty(3, autocreate=False)
|
quality = AttributeProperty(3, autocreate=False)
|
||||||
|
|
||||||
attack_type = AttributeProperty(Ability.INT, autocreate=False)
|
attack_type = AttributeProperty(Ability.INT, autocreate=False)
|
||||||
defend_type = AttributeProperty(Ability.DEX, autocreate=False)
|
defense_type = AttributeProperty(Ability.DEX, autocreate=False)
|
||||||
|
|
||||||
damage_roll = AttributeProperty("1d8", autocreate=False)
|
damage_roll = AttributeProperty("1d8", autocreate=False)
|
||||||
|
|
||||||
|
|
@ -488,4 +488,4 @@ Well, we just figured out all we need! You can go back and update `get_obj_stats
|
||||||
|
|
||||||
When you change this function you must also update the related unit test - so your existing test becomes a nice way to test your new Objects as well! Add more tests showing the output of feeding different object-types to `get_obj_stats`.
|
When you change this function you must also update the related unit test - so your existing test becomes a nice way to test your new Objects as well! Add more tests showing the output of feeding different object-types to `get_obj_stats`.
|
||||||
|
|
||||||
Try it out yourself. If you need help, a finished utility example is found in [evennia/contrib/tutorials/evadventure/utils.py](get_obj_stats).
|
Try it out yourself. If you need help, a finished utility example is found in [evennia/contrib/tutorials/evadventure/utils.py](get_obj_stats).
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ def get_obj_stats(obj, owner=None):
|
||||||
carried = f", Worn: [{carried.value}]" if carried else ""
|
carried = f", Worn: [{carried.value}]" if carried else ""
|
||||||
|
|
||||||
attack_type = getattr(obj, "attack_type", None)
|
attack_type = getattr(obj, "attack_type", None)
|
||||||
defense_type = getattr(obj, "attack_type", None)
|
defense_type = getattr(obj, "defense_type", None)
|
||||||
|
|
||||||
return _OBJ_STATS.format(
|
return _OBJ_STATS.format(
|
||||||
key=obj.key,
|
key=obj.key,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue