Merge pull request #7 from neph1/test_fixes

v0.7.4

Author: neph1

stories/prancingllama/npcs/npcs.py

@@ -8,6 +8,7 @@
 from tale.player import Player
 from tale.util import call_periodically, Context
 from tale import lang
+from typing import Optional
 
 class InnKeeper(LivingNpc):
 
@@ -54,6 +55,8 @@ def do_random_move(self, ctx: Context) -> None:
     def do_pick_up_dishes(self, ctx: Context) -> None:
         self.location.tell(f"{lang.capital(self.title)} wipes a table and picks up dishes.", evoke=False, max_length=True)
 
+
+    
 class Patron(LivingNpc):
 
     def __init__(self, name: str, gender: str, *,
@@ -64,6 +67,13 @@ def __init__(self, name: str, gender: str, *,
     def init(self) -> None:
         self.aliases = {"patron"}
 
+class Shanda(Patron):
+
+    def allow_give_item(self, item: Item, actor: Optional[Living]) -> None:
+        if item.name == "rat_skull":
+            self.sentiments(actor.title, 'impressed')
+            self.do_say(f'{actor.title} gives Shanda a giant rat skull', actor=actor)
+
 class Guard(LivingNpc):
 
     def __init__(self, name: str, gender: str, *,
@@ -104,9 +114,9 @@ def init(self) -> None:
     @call_periodically(10, 25)
     def do_idle_action(self, ctx: Context) -> None:
         if random.random() < 0.5:
-            self.tell_others("{Actor} hisses.", evoke=True, max_length=True)
+            self.tell_others("{Actor} hisses.", evoke=False, max_length=True)
         else:
-            self.tell_others("{Actor} sniffs around.", evoke=True, max_length=True)
+            self.tell_others("{Actor} sniffs around.", evoke=False, max_length=True)
 
 
 norhardt = Patron("Norhardt", "m", age=56, descr="A grizzled old man, with parchment-like skin and sunken eyes. He\'s wearing ragged clothing and big leather boots. He\'s a formidable presence, commanding yet somber.", personality="An experienced explorer who is obsessed with finding the mythological Yeti which supposedly haunts these mountains. He won\'t stop talking about it.", short_descr="An old grizzled man sitting by the bar.")
@@ -115,11 +125,11 @@ def do_idle_action(self, ctx: Context) -> None:
 elid_gald = Patron("Elid Gald", "m", age=51, descr="A gentleman who's aged with grace. He has a slender appearance with regal facial features, and dark hair, but his (one) eye has a dangerous squint. The other is covered by a patch.", personality="Old Gold is a smooth-talking pick-pocket and charlatan. Although claiming to be retired, he never passes on an opportunity to relieve strangers of their valuables. He wishes to obtain the map Norhardt possesses.", short_descr="A slender gentleman with a patch over one of his eyes, leaning against the wall.")
 elid_gald.aliases = {"elid", "one eyed man", "gentleman"}
 
-shanda = Patron("Shanda Heard", "f", age=31, descr="A fierce looking woman, with a face like chiseled from granite and a red bandana around her wild hair. She keeps an unblinking gaze on her surroundings.", personality="She's a heavy drinker and boaster, and for a drink she will spill tales of her conquests and battles and long lost love. She's feared by many but respected by all for her prowess in battle.", short_descr="A fierce looking woman sitting by a table, whose eyes seem to follow you.")
+shanda = Shanda("Shanda Heard", "f", age=31, descr="A fierce looking woman, with a face as if chiseled from granite and a red bandana around her wild hair. She keeps an unblinking gaze on her surroundings.", personality="She's a heavy drinker and boaster, and for a drink she will spill tales of her conquests and battles and long lost love. She's feared by many but respected by all for her prowess in battle.", short_descr="A fierce looking woman sitting by a table, whose eyes seem to follow you.")
 shanda.aliases = {"shanda", "fierce woman", "woman by table"}
 
-count_karta = Patron("Count of Karta", "m", age=43, descr="A hood shadows his facial features, but a prominent jaw juts out. His mouth seems to be working constantly, as if muttering about something.", personality="Having fled from an attempt on his life, and being discredited, he has come here to plan his revenge. He seems to have gold and is looking for able bodies to help him.", short_descr="A mysterious man by the fire.")
-count_karta.aliases = {"count", "karta", "mysterious man"}
+count_karta = Patron("Count of Karta", "m", age=43, descr="A hood shadows his facial features, but a prominent jaw juts out from beneath it. His mouth seems to be working constantly, as if muttering about something.", personality="Having fled from an attempt on his life, and being discredited, he has come here to plan his revenge. He seems to have gold and is looking for able bodies to help him.", short_descr="A mysterious man by the fire.")
+count_karta.aliases = {"count", "karta", "mysterious man", "hooded man"}
 
 urta = InnKeeper("Urta", "f", age=44, descr="A gruff, curvy woman with a long brown coat and bushy hair that reaches her waist. When not serving, she keeps polishing jugs with a dirty rag.", personality="She's the owner of The Prancing Llama, and of few words. But the words she speak are kind. She knows a little about all the patrons in her establishment.", short_descr="A curvy woman with long brown coat standing behind the bar.")
 urta.aliases = {"bartender", "inn keeper", "curvy woman"}

stories/prancingllama/zones/prancingllama.py

@@ -16,8 +16,10 @@ def init(self):
 
     @call_periodically(40, 90)
     def spawn_rat(self, ctx: Context) -> None:
+        rat_skull = Item("rat_skull", "giant rat skull", descr="It's a giant rat's bloody skull.")
         if not self.rat or self.rat.alive == False:
             self.rat = Rat("giant rat", random.choice("m"), descr="A vicious looking, giant, rat", race="rodent")
+            self.rat.init_inventory([rat_skull])
             self.rat.move(self)
 
 main_hall = Location("Main Hall", "An area full of tables with people eating, drinking and talking")

tale/accounts.py

@@ -102,9 +102,12 @@ def _create_database(self) -> None:
                             xp integer NOT NULL,
                             hp integer NOT NULL,
                             ac integer NOT NULL,
+                            wc integer NOT NULL,
                             maxhp_dice varchar NULL,
                             attack_dice varchar NULL,
                             alignment integer NOT NULL,
+                            strength integer NOT NULL,
+                            dexterity integer NOT NULL,
                             FOREIGN KEY(account) REFERENCES Account(id)
                         );
                         """)

tale/base.py

@@ -53,6 +53,7 @@
 from . import story
 from . import verbdefs
 from . import combat
+from . import player
 from .errors import ActionRefused, ParseError, LocationIntegrityError, TaleError, UnknownVerbException, NonSoulVerb
 
 __all__ = ["MudObject", "Armour", 'Container', "Door", "Exit", "Item", "Living", "Stats", "Location", "Weapon", "Key", "Soul"]
@@ -891,7 +892,7 @@ def __init__(self) -> None:
         self.gender = 'n'
         self.level = 1
         self.xp = 0
-        self.hp = 0
+        self.hp = 5
         self.maxhp_dice = ""
         self.ac = 0
         self.wc = 0
@@ -903,7 +904,7 @@ def __init__(self) -> None:
         self.size = races.BodySize.HUMAN_SIZED
         self.race = ""      # the name of the race of this creature
         self.strength = 3
-        self.agility = 3
+        self.dexterity = 3
 
     def __repr__(self):
         return "<Stats: %s>" % vars(self)
@@ -926,6 +927,7 @@ def set_stats_from_race(self) -> None:
         self.language = r.language
         self.weight = r.mass
         self.size = r.size
+        self.hp = r.hp
 
 
 class Living(MudObject):
@@ -1083,7 +1085,7 @@ def tell_later(self, message: str) -> None:
         """Tell something to this creature, but do it after all other messages."""
         pending_tells.send(lambda: self.tell(message, evoke=True, max_length=False))
 
-    def tell_others(self, message: str, target: Optional['Living']=None, evoke=False, max_length : bool=True, alt_prompt='') -> None:
+    def tell_others(self, message: str, target: Optional['Living']=None, evoke: bool=False, max_length : bool=True, alt_prompt='') -> None:
         """
         Send a message to the other livings in the location, but not to self.
         There are a few formatting strings for easy shorthands:
@@ -1274,7 +1276,7 @@ def display_direction(directions: Sequence[str]) -> str:
                 if direction_txt:
                     message = f"{lang.capital(self.title)} leaves {direction_txt}."
                 else:
-                    message = f"{lang.capital(self.title)} leaves."
+                    message = f"{lang.capital(self.title)} leaves towards {target.title}."
                 original_location.tell(message, exclude_living=self, evoke=False, max_length=True)
             # queue event
             if is_player:
@@ -1284,7 +1286,7 @@ def display_direction(directions: Sequence[str]) -> str:
         else:
             target.insert(self, actor)
         if not silent:
-            target.tell(f"{lang.capital(self.title)} arrives from {original_location}." , exclude_living=self, evoke=False, max_length=True)
+            target.tell(f"{lang.capital(self.title)} arrives from {original_location.title}." , exclude_living=self, evoke=False, max_length=True)
         # queue event
         if is_player:
             pending_actions.send(lambda who=self, where=original_location: target.notify_player_arrived(who, where))
@@ -1330,25 +1332,39 @@ def locate_item(self, name: str, include_inventory: bool=True, include_location:
 
     def start_attack(self, victim: 'Living') -> None:
         """Starts attacking the given living until death ensues on either side."""
-        # @todo I'm not yet sure if the combat/attack logic should go here (just on Living), or that it should be split with Player...
-        # @todo actual fight.   Also implement 'assist' command to help someone that is already fighting.
-        # NOTE: combat commands should have a check so that you cannot spam them!
-        name = lang.capital(self.title)
-
-        result, dead = combat.resolve_attack(self, victim)
+        attacker_name = lang.capital(self.title)
+        victim_name = lang.capital(victim.title)
+        result, damage_to_attacker, damage_to_defender = combat.resolve_attack(self, victim)
 
-        room_msg = "%s attacks %s! %s" % (name, victim.title, result)
-        victim_msg = "%s attacks you. %s" % (name, result)
-        attacker_msg = "You attack %s! %s" % (victim.title, result)
+        room_msg = "%s attacks %s! %s" % (attacker_name, victim_name, result)
+        victim_msg = "%s attacks you. %s" % (attacker_name, result)
+        attacker_msg = "You attack %s! %s" % (victim_name, result)
         victim.tell(victim_msg, evoke=True, max_length=False)
-        # TODO: try to get from config file instead
-        combat_prompt = mud_context.driver.llm_util.combat_prompt
-        victim.location.tell(room_msg, exclude_living=victim, specific_targets={self}, specific_target_msg=attacker_msg, evoke=True, max_length=False, alt_prompt=combat_prompt)
-        if dead:
-            remains = Container(f"remains of {dead.title}")
-            remains.init_inventory(dead.inventory)
-            dead.location.insert(remains, None)
-            dead.destroy(util.Context)
+        
+
+        if isinstance(self, player.Player):
+            attacker_name += "as 'You'"
+        if isinstance(victim, player.Player):
+            victim_name += "as 'You'"
+
+        combat_prompt = mud_context.driver.llm_util.combat_prompt.format(attacker=attacker_name, 
+                                                                         victim=victim_name, 
+                                                                         attacker_msg=attacker_msg,
+                                                                         location=self.location.title,
+                                                                         location_description=self.location.short_description)
+        victim.location.tell(room_msg,
+                             exclude_living=victim,
+                             specific_targets={self},
+                             specific_target_msg=attacker_msg,
+                             evoke=True,
+                             max_length=False,
+                             alt_prompt=combat_prompt)
+        self.stats.hp -= damage_to_attacker
+        victim.stats.hp -= damage_to_defender
+        if self.stats.hp < 1:
+            combat.produce_remains(util.Context, self)
+        if victim.stats.hp < 1:
+            combat.produce_remains(util.Context, victim)  
 
     def allow_give_money(self, amount: float, actor: Optional['Living']) -> None:
         """Do we accept money? Raise ActionRefused if not."""
@@ -1680,8 +1696,8 @@ def open(self, actor: Living, item: Item=None) -> None:
             raise ActionRefused("You try to open it, but it's locked.")
         else:
             self.opened = True
-            actor.tell("You open it.", evoke=True, max_length=True)
-            actor.tell_others("{Actor} opens the %s." % self.name, evoke=True, max_length=True)
+            actor.tell("You open it.", evoke=False, max_length=True)
+            actor.tell_others("{Actor} opens the %s." % self.name, evoke=False, max_length=True)
             if self.linked_door:
                 self.linked_door.opened = True
                 self.target.tell("The %s is opened from the other side." % self.linked_door.name, evoke=False, max_length=True)
@@ -1691,8 +1707,8 @@ def close(self, actor: Living, item: Item=None) -> None:
         if not self.opened:
             raise ActionRefused("It's already closed.")
         self.opened = False
-        actor.tell("You close it.", evoke=True, max_length=True)
-        actor.tell_others("{Actor} closes the %s." % self.name, evoke=True, max_length=True)
+        actor.tell("You close it.", evoke=False, max_length=True)
+        actor.tell_others("{Actor} closes the %s." % self.name, evoke=False, max_length=True)
         if self.linked_door:
             self.linked_door.opened = False
             self.target.tell("The %s is closed from the other side." % self.linked_door.name, evoke=False, max_length=True)
@@ -1740,12 +1756,12 @@ def unlock(self, actor: Living, item: Item=None) -> None:
                 raise ActionRefused("You don't seem to have the means to unlock it.")
         self.locked = False
         self.opened = True
-        actor.tell("Your %s fits! You unlock the %s and open it." % (key.title, self.name), evoke=True, max_length=True)
-        actor.tell_others("{Actor} unlocks the %s with %s %s, and opens it." % (self.name, actor.possessive, key.title), evoke=True, max_length=True)
+        actor.tell("Your %s fits! You unlock the %s and open it." % (key.title, self.name), evoke=False, max_length=True)
+        actor.tell_others("{Actor} unlocks the %s with %s %s, and opens it." % (self.name, actor.possessive, key.title), evoke=False, max_length=True)
         if self.linked_door:
             self.linked_door.locked = False
             self.linked_door.opened = True
-            self.target.tell("The %s is unlocked and opened from the other side." % self.linked_door.name, evoke=True, max_length=True)
+            self.target.tell("The %s is unlocked and opened from the other side." % self.linked_door.name, evoke=False, max_length=True)
 
     def check_key(self, item: Item) -> bool:
         """Check if the item is a proper key for this door (based on key_code)"""

tale/combat.py

@@ -5,30 +5,34 @@
 """
 
 import random
+import tale.util as util
+import tale.base as base
+from tale.util import Context
 
 def resolve_attack(attacker, victim):
-    result = combat(attacker, victim)
-      
-    text = 'After a fierce battle'
-    if result < 0.5:
-        return text + ', %s dies.' % (victim.title), victim
-    elif result > 0.5:
-        return text + ', %s dies.' % (attacker.title), attacker
-    else:
-        return text + 'both retreat.'
+    damage_to_attacker, damage_to_defender = combat(attacker, victim)
+    text = 'After a fierce exchange of attacks '
+    if damage_to_attacker > 0:
+        text = text + f', {attacker.title} is injured '
+    if damage_to_defender > 0:
+        text = text + f', {victim.title} is injured '
+    if victim.stats.hp - damage_to_defender < 1:
+        text = text + f', {victim.title} dies.'
+    if attacker.stats.hp - damage_to_attacker < 1:
+        text = text + f', {attacker.title} dies.'
+    
+    return text, damage_to_attacker, damage_to_defender
 
 def combat(actor1: 'Living', actor2: 'Living'):
-    """ Simple combat, but rather complex logic. Credit to ChatGPT.
-        < 0.5 actor2 'victim' dies
-        > 0.5 actor1 'attacker' dies"""
+    """ Simple combat, but rather complex logic. Credit to ChatGPT."""
 
     def calculate_attack(actor: 'Living'):
         # The attack strength depends on the level and strength of the actor
         return actor.stats.level
 
     def calculate_defense(actor: 'Living'):
-        # The defense strength depends on the level and agility of the actor
-        return actor.stats.level * actor.stats.agility
+        # The defense strength depends on the level and dexterity of the actor
+        return actor.stats.level * actor.stats.dexterity
 
     def calculate_weapon_bonus(actor: 'Living'):
         # The weapon bonus is a random factor between 0 and 1. If the actor has no weapon, bonus is 1.
@@ -53,9 +57,13 @@ def calculate_damage(attacker: 'Living', defender: 'Living'):
     damage_to_actor1 *= random.uniform(0.9, 1.1)
     damage_to_actor2 *= random.uniform(0.9, 1.1)
 
-    # Calculate the normalized factor
-    total_damage = damage_to_actor1 + damage_to_actor2
-    if total_damage == 0:
-        return 0.5
-    return damage_to_actor1 / total_damage
-    
+    return int(damage_to_actor1), int(damage_to_actor2)
+    
+
+def produce_remains(context: Context, actor: 'Living'):
+    # Produce the remains of the actor
+    remains = base.Container(f"remains of {actor.title}")
+    remains.init_inventory(actor.inventory)
+    actor.location.insert(remains, None)
+    actor.destroy(context)
+    return remains

tale/driver.py

@@ -32,6 +32,7 @@
 from .errors import StoryCompleted
 from tale.load_character import CharacterLoader, CharacterV2
 from tale.llm_ext import LivingNpc
+from tale.llm_utils import LlmUtil
 
 
 topic_pending_actions = pubsub.topic("driver-pending-actions")
@@ -210,6 +211,7 @@ def __init__(self) -> None:
         self.game_clock = None    # type: util.GameDateTime
         self.game_mode = None     # type: GameMode
         self._stop_mainloop = True
+        self.llm_util = LlmUtil()
         # playerconnections that wait for input; maps connection to tuple (dialog, validator, echo_input)
         self.waiting_for_input = {}   # type: Dict[player.PlayerConnection, Tuple[Generator, Any, Any]]
         mud_context.driver = self
@@ -601,14 +603,14 @@ def _process_player_command(self, cmd: str, conn: player.PlayerConnection) -> No
                 # the player command ended but signaled that an async dialog should be initiated
                 topic_async_dialogs.send((conn, x.dialog))
 
-    def go_through_exit(self, player: player.Player, direction: str) -> None:
+    def go_through_exit(self, player: player.Player, direction: str, evoke: bool=True) -> None:
         xt = player.location.exits[direction]
         xt.allow_passage(player)
         if xt.enter_msg:
-            player.tell(xt.enter_msg, end=True, evoke=True, max_length=True)
+            player.tell(xt.enter_msg, end=True, evoke=evoke, max_length=True)
             player.tell("\n")
         player.move(xt.target, direction_names=[xt.name] + list(xt.aliases))
-        player.look()
+        player.look(evoke=evoke)
 
     def lookup_location(self, location_name: str) -> base.Location:
         location = self.zones
@@ -792,6 +794,7 @@ def load_character(self, player: player.Player, path: str):
                         personality = character.personality, 
                         occupation = character.occupation)
         npc.following = player
+        npc.stats.hp = character.hp
         player.location.insert(npc, None)