Merge pull request #12 from neph1/combat_hot_fix

fixing broken combat

Author: neph1

tale/base.py

@@ -1361,19 +1361,11 @@ def start_attack(self, victim: 'Living') -> None:
         attacker_msg = "You attack %s! %s" % (victim_name, result)
         victim.tell(victim_msg, evoke=True, max_length=False)
 
-
-        if isinstance(self, 'tale.player.Player'):
-            attacker_name += "as 'You'"
-        if isinstance(victim, 'tale.player.Player'):
-            victim_name += "as 'You'"
-
-        combat_prompt = mud_context.driver.llm_util.combat_prompt.format(attacker=attacker_name, 
-                                                                         victim=victim_name, 
-                                                                         attacker_weapon=self.wielding.name,
-                                                                         victim_weapon=victim.wielding.name,
-                                                                         attacker_msg=attacker_msg,
-                                                                         location=self.location.title,
-                                                                         location_description=self.location.short_description)
+        combat_prompt = mud_context.driver.prepare_combat_prompt(attacker=self, 
+                              victim=victim, 
+                              location_title = self.location.title, 
+                              location_description = self.location.short_description,
+                              attacker_msg = attacker_msg)
         victim.location.tell(room_msg,
                              exclude_living=victim,
                              specific_targets={self},

tale/driver.py

@@ -603,7 +603,7 @@ 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, evoke: bool=True) -> None:
+    def go_through_exit(self, player: player.Player, direction: str, evoke: bool=False) -> None:
         xt = player.location.exits[direction]
         xt.allow_passage(player)
         if not xt.target.built:
@@ -818,3 +818,25 @@ def uptime(self) -> Tuple[int, int, int]:
         hours, seconds = divmod(uptime.total_seconds(), 3600)
         minutes, seconds = divmod(seconds, 60)
         return int(hours), int(minutes), int(seconds)
+    
+    def prepare_combat_prompt(self, 
+                              attacker: LivingNpc, 
+                              victim: LivingNpc, 
+                              location_title: str, 
+                              location_description: str, 
+                              attacker_msg: str):
+        attacker_name = lang.capital(attacker.title)
+        victim_name = lang.capital(victim.title)
+
+        if isinstance(attacker, player.Player):
+            attacker_name += "as 'You'"
+        if isinstance(victim, player.Player):
+            victim_name += "as 'You'"
+
+        return self.llm_util.combat_prompt.format(attacker=attacker_name, 
+                                                                         victim=victim_name, 
+                                                                         attacker_weapon=attacker.wielding.name,
+                                                                         victim_weapon=victim.wielding.name,
+                                                                         attacker_msg=attacker_msg,
+                                                                         location=location_title,
+                                                                         location_description=location_description)