Update v0.26.1 (#73)

* make rat quadruped

* add body parts for quadrupeds
some more tests

* support for targeting body parts

* fix wrong callback for spawner
refactor do_on_death to be defered

* fix body type parsing

* fix parsing race and body type

* change up the order of tells for actions

* commit tests

* fix spawner tests

Author: neph1

stories/combat_sandbox/world.json

@@ -98,7 +98,8 @@
                     "xp": 0,
                     "strength": 3,
                     "dexterity": 3,
-                    "unarmed_attack": "BITE"
+                    "unarmed_attack": "BITE",
+                    "race": "giant rat"
                     }
                 }
         ]

tale/base.py

@@ -1270,7 +1270,11 @@ def do_socialize_cmd(self, parsed: ParseResult) -> None:
         if attacking:
             for thing in who:
                 if isinstance(thing, Living):
-                    pending_actions.send(lambda victim=thing: self.start_attack(victim))
+                    body_part = None
+                    if len(parsed.args) == 2:
+                        arg = parsed.args[1].upper()
+                        body_part = arg if arg in wearable.WearLocation.__members__ else None
+                    pending_actions.send(lambda victim=thing: self.start_attack(victim, target_body_part=body_part))
         elif parsed.verb in verbdefs.AGGRESSIVE_VERBS:
             # usually monsters immediately attack,
             # other npcs may choose to attack or to ignore it
@@ -1415,11 +1419,11 @@ def locate_item(self, name: str, include_inventory: bool=True, include_location:
                         break
         return (found, containing_object) if found else (None, None)
 
-    def start_attack(self, victim: 'Living') -> combat.Combat:
+    def start_attack(self, defender: 'Living', target_body_part: wearable.WearLocation= None) -> combat.Combat:
         """Starts attacking the given living for one round."""
         attacker_name = lang.capital(self.title)
-        victim_name = lang.capital(victim.title)
-        c = combat.Combat(self, victim)
+        victim_name = lang.capital(defender.title)
+        c = combat.Combat(self, defender, target_body_part=target_body_part)
         result, damage_to_attacker, damage_to_defender = c.resolve_attack()
 
         room_msg = "%s attacks %s! %s" % (attacker_name, victim_name, result)
@@ -1428,30 +1432,30 @@ def start_attack(self, victim: 'Living') -> combat.Combat:
         #victim.tell(victim_msg, evoke=True, short_len=False)
 
         combat_prompt, attacker_msg = mud_context.driver.prepare_combat_prompt(attacker=self, 
-                              defender=victim, 
+                              defender=defender, 
                               location_title = self.location.title,
                               combat_result = result,
                               attacker_msg = attacker_msg)
 
         combat_context = CombatContext(attacker_name=self.name,
                                         attacker_health=self.stats.hp / self.stats.max_hp, 
                                         attacker_weapon=self.wielding.name, 
-                                        defender_name=victim.name, 
-                                        defender_health=victim.stats.hp / victim.stats.max_hp, 
-                                        defender_weapon=victim.wielding.name, 
+                                        defender_name=defender.name, 
+                                        defender_health=defender.stats.hp / defender.stats.max_hp, 
+                                        defender_weapon=defender.wielding.name, 
                                         location_description=self.location.description)
 
-        victim.location.tell(room_msg,
+        defender.location.tell(room_msg,
                              evoke=True,
                              short_len=False,
                              alt_prompt=combat_prompt,
                              extra_context=combat_context.to_prompt_string())
         self.stats.hp -= damage_to_attacker
-        victim.stats.hp -= damage_to_defender
+        defender.stats.hp -= damage_to_defender
         if self.stats.hp < 1:
-            self.do_on_death(util.Context)
-        if victim.stats.hp < 1:
-            victim.do_on_death(util.Context)  
+            mud_context.driver.defer(0.1, self.do_on_death)
+        if defender.stats.hp < 1:
+            mud_context.driver.defer(0.1, defender.do_on_death)
         return c
 
     def allow_give_money(self, amount: float, actor: Optional['Living']) -> None:
@@ -1585,7 +1589,7 @@ def get_worn_items(self) -> Iterable[Wearable]:
         """Return all items that are currently worn."""
         return self.__wearing.values()
 
-    def do_on_death(self, ctx: util.Context) -> 'Container':
+    def do_on_death(self) -> 'Container':
         """Called when the living dies."""
         remains = None
         self.alive = False
@@ -1595,7 +1599,7 @@ def do_on_death(self, ctx: util.Context) -> 'Container':
             self.location.insert(remains, None)
         if self.on_death_callback:
             self.on_death_callback()
-        self.destroy(ctx)
+        self.destroy(util.Context)
         return remains
 
 

tale/combat.py

@@ -6,25 +6,27 @@
 
 import random
 from tale import weapon_type
-from tale.races import BodyType
-import tale.util as util
 import tale.base as base
-from tale.util import Context
-from tale.wearable import WearLocation
+from tale.wearable import WearLocation, body_parts_for_bodytype
 from tale.wearable import WearLocation
 import random
 from collections import Counter
 import random
 
 class Combat():
 
-    def __init__(self, attacker: 'base.Living', defender: 'base.Living') -> None:
+    def __init__(self, attacker: 'base.Living', defender: 'base.Living', target_body_part: WearLocation = None) -> None:
         self.attacker = attacker
         self.defender = defender
+        self.target_body_part = target_body_part
 
     def _calculate_attack_success(self, actor: 'base.Living') -> int:
-        """ Calculate the success of an attack. <5 is a critical hit."""
-        return random.randrange(0, 100) - actor.stats.get_weapon_skill(actor.wielding.type)
+        """ Calculate the success of an attack. <5 is a critical hit.
+        Lower chance for attacker if trying to hit a specific body part."""
+        chance = actor.stats.get_weapon_skill(actor.wielding.type)
+        if self.target_body_part and actor == self.attacker:
+            chance *= 1.2
+        return random.randrange(0, 100) - chance
 
     def _calculate_block_success(self, actor1: 'base.Living', actor2: 'base.Living') -> int:
         """ Calculate the chance of blocking an attack.
@@ -51,10 +53,10 @@ def _calculate_armor_bonus(self, actor: 'base.Living', body_part: WearLocation =
 
     def resolve_body_part(self, defender: 'base.Living', size_factor: float, target_part: WearLocation = None) -> WearLocation:
         """ Resolve the body part that was hit. """
-        if defender.stats.bodytype != BodyType.HUMANOID:
-            return WearLocation.FULL_BODY
-
-        locations = list(WearLocation)[1:-1]
+        body_parts = body_parts_for_bodytype(defender.stats.bodytype)
+        if not body_parts:
+            body_parts = [WearLocation.FULL_BODY]
+        locations = body_parts
         probability_distribution = self.create_probability_distribution(locations, size_factor=size_factor, target_part=target_part)
 
         return random.choices(list(probability_distribution.keys()), list(probability_distribution.values()))[0]
@@ -64,10 +66,14 @@ def create_probability_distribution(self, locations, size_factor: float = 1.0, t
         total_items = sum(distribution.values())
 
         if size_factor != 1.0:
-            distribution[WearLocation.HEAD] *= size_factor
-            distribution[WearLocation.TORSO] *= size_factor
-            distribution[WearLocation.LEGS] /= size_factor
-            distribution[WearLocation.FEET] /= size_factor
+            if WearLocation.HEAD in distribution:
+                distribution[WearLocation.HEAD] *= size_factor
+            if WearLocation.TORSO in distribution:
+                distribution[WearLocation.TORSO] *= size_factor
+            if WearLocation.LEGS in distribution:
+                distribution[WearLocation.LEGS] /= size_factor
+            if WearLocation.FEET in distribution:
+                distribution[WearLocation.FEET] /= size_factor
 
         if target_part:
             distribution[target_part] *= 2
@@ -114,7 +120,7 @@ def _round(self, actor1: 'base.Living', actor2: 'base.Living') -> ([str], int):
                 texts.append(f'but {actor2.title} blocks')
             else:
                 actor1_strength = self._calculate_weapon_bonus(actor1) * actor1.stats.size.order
-                body_part = self.resolve_body_part(actor2, actor1.stats.size.order / actor2.stats.size.order)
+                body_part = self.resolve_body_part(actor2, actor1.stats.size.order / actor2.stats.size.order, target_part=self.target_body_part)
                 actor2_strength = self._calculate_armor_bonus(actor2, body_part) * actor2.stats.size.order
                 damage_to_defender = int(max(0, actor1_strength - actor2_strength))
                 if damage_to_defender > 0:

tale/llm/LivingNpc.py

@@ -238,8 +238,12 @@ def _parse_action(self, action):
             if action.target:
                 target = self.location.search_living(action.target)
                 if target:
+                    target.tell(text, evoke=False)
                     target.notify_action(ParseResult(verb='say', unparsed=text, who_list=[target]), actor=self)
-            defered_actions.append(f'"{text}"')
+                else:
+                    defered_actions.append(f'"{text}"')
+            else:
+                defered_actions.append(f'"{text}"')
         if not action.action:
             return defered_actions
         if action.action == 'move':
@@ -282,8 +286,8 @@ def _defer_result(self, action: str, verb: str="idle-action"):
     def tell_action_deferred(self):
         actions = '\n'.join(self.deferred_actions) + '\n'
         deferred_action = ParseResult(verb='idle-action', unparsed=actions, who_info=None)
-        self.location._notify_action_all(deferred_action, actor=self)
         self.tell_others(actions)
+        self.location._notify_action_all(deferred_action, actor=self)
         self.deferred_actions.clear()
 
     def get_observed_events(self, amount: int) -> list:

tale/npc_defs.py

@@ -41,7 +41,7 @@ def do_idle_action(self, ctx: Context) -> None:
             self.idle_action()
 
     def do_attack(self, target: Living) -> None:
-        self.start_attack(victim=target)
+        self.start_attack(defender=target)
 
 class RoamingMob(StationaryMob):
 

tale/parse_utils.py

@@ -148,23 +148,20 @@ def load_npcs(json_npcs: list, locations = {}) -> dict:
             name = npc['name']
         new_npc = _load_npc(npc, name, npc_type)
 
-        if npc.get('stats', None):
-            new_npc.stats = load_stats(npc['stats'])
-
         if locations and npc['location']:
             _insert(new_npc, locations, npc['location'])
 
-        if npc.get('memory', None):
-            new_npc.load_memory(npc['memory'])
-
         npcs[name] = new_npc
     return npcs
 
 def _load_npc(npc: dict, name: str = None, npc_type: str = 'Mob'):
+    race = None
+    if npc.get('stats', None):
+        race = npc['stats'].get('race', None)
     if 'npc' in npc_type.lower():
         new_npc = StationaryNpc(name=name, 
                             gender=lang.validate_gender(npc.get('gender', 'm')[0]), 
-                            race=npc.get('race', 'human').lower(), 
+                            race=race, 
                             title=npc.get('title', name), 
                             descr=npc.get('descr', ''), 
                             short_descr=npc.get('short_descr', npc.get('description', '')), 
@@ -174,17 +171,26 @@ def _load_npc(npc: dict, name: str = None, npc_type: str = 'Mob'):
         new_npc.aliases.add(name.split(' ')[0].lower())
         new_npc.stats.set_weapon_skill(WeaponType.UNARMED, random.randint(10, 30))
         new_npc.stats.level = npc.get('level', 1)
+
+
     else:
 
         new_npc = StationaryMob(name=npc['name'], 
                             gender=lang.validate_gender(npc.get('gender', 'm')[0]), 
-                            race=npc.get('race', 'human').lower(), 
+                            race=race, 
                             title=npc.get('title', npc['name']), 
                             descr=npc.get('descr', ''), 
                             short_descr=npc.get('short_descr', npc.get('description', '')))
         new_npc.aliases.add(name.split(' ')[0].lower())
         new_npc.stats.set_weapon_skill(WeaponType.UNARMED, random.randint(10, 30))
         new_npc.stats.level = npc.get('level', 1)
+
+    if npc.get('stats', None):
+        new_npc.stats = load_stats(npc['stats'])
+
+    if npc.get('memory', None):
+        new_npc.load_memory(npc['memory'])
+
     new_npc.autonomous = npc.get('autonomous', False)
     new_npc.aggressive = npc.get('aggressive', False)
     return new_npc
@@ -625,7 +631,7 @@ def save_stats(stats: Stats) -> dict:
     json_stats['dexterity'] = stats.dexterity
     json_stats['unarmed_attack'] = stats.unarmed_attack.name.upper()
     json_stats['race'] = stats.race
-    json_stats['bodytype'] = stats.bodytype.name
+    json_stats['bodytype'] = stats.bodytype.name.upper()
     return json_stats
 
 
@@ -644,7 +650,7 @@ def load_stats(json_stats: dict) -> Stats:
     stats.dexterity = json_stats.get('dexterity')
     stats.race = json_stats.get('race', 'human')
     if json_stats.get('bodytype'):
-        stats.bodytype = BodyType[json_stats.get('bodytype', BodyType.HUMANOID.name)]
+        stats.bodytype = BodyType[json_stats['bodytype'].upper()]
     if json_stats.get('unarmed_attack'):
         stats.unarmed_attack = Weapon(UnarmedAttack[json_stats['unarmed_attack'].upper()], WeaponType.UNARMED)
     if json_stats.get('weapon_skills'):

tale/player.py

@@ -210,7 +210,7 @@ def tell_object_location(self, obj: base.MudObject, known_container: Union[base.
             else:
                 self.tell("%s was found in %s." % (lang.capital(obj.name), known_container.name))
 
-    def do_on_death(self, ctx: util.Context) -> Optional[base.Item]:
+    def do_on_death(self) -> Optional[base.Item]:
         """Called when the player dies. Returns the remains of the player."""
         self.tell("You die.")
         self.location.tell("%s dies." % self.title, exclude_living=self)

tale/races.py

@@ -763,7 +763,6 @@ class UnarmedAttack(str, enum.Enum):
     }
 }
 
-
 # Races that can be chosen by players. Can be changed in story configuration.
 playable_races = {'human', 'dwarf', 'elf', 'dark-elf', 'half-elf', 'half-orc', 'halfling', 'orc', 'goblin', 'hobbit'}
 

tale/spawner.py

@@ -33,7 +33,7 @@ def spawn(self):
             if self.max_spawns > 0:
                 self.max_spawns -= 1
             mob = self._clone_mob()
-            mob.do_on_death = lambda ctx: self.remove_mob()
+            mob.on_death_callback = lambda: self.remove_mob()
             self.location.insert(mob)
             self.location.tell("%s arrives." % mob.title, extra_context=f'Location:{self.location.description}; {mob.title}: {mob.description}')
             return mob
@@ -73,7 +73,7 @@ def _clone_mob(self):
         gender = self.mob_type.gender
         if self.randomize_gender:
             gender = "m" if random.randint(0, 1) == 0 else "f"
-        mob = self.mob_type.__class__(self.mob_type.name, gender)
+        mob = self.mob_type.__class__(self.mob_type.name, gender, race=self.mob_type.stats.race)
         mob.aggressive = self.mob_type.aggressive
         mob.should_produce_remains = self.mob_type.should_produce_remains
         return mob

tale/verbdefs.py

@@ -428,5 +428,9 @@ def adjust_available_verbs(allowed_verbs: Sequence[str]=None, remove_verbs: Sequ
     "cheek": "on the cheek",
     "side": "in the side",
     "everywhere": "everywhere",
-    "shoulder": "on the shoulder"
+    "shoulder": "on the shoulder",
+    "feet": "on the feet",
+    "tail": "on the tail",
+    "wing": "on the wing",
+    "wings": "on the wings"
 }