fix tests

Author: neph1

tale/driver.py

@@ -645,7 +645,7 @@ def go_through_exit(self, player: player.Player, direction: str, evoke: bool=Tru
                 except errors.LocationIntegrityError:
                     # fail silently
                     pass
-        elif random.random() < 1:
+        elif random.random() < 0.2 and isinstance(self.story, DynamicStory):
             dynamic_story = typing.cast(DynamicStory, self.story)
             zone = dynamic_story.find_zone(location=xt.target.name)
             self.llm_util.generate_random_spawn(xt.target, zone.get_info())

tale/llm/requests/build_location.py

@@ -27,6 +27,11 @@ def build_prompt(self, args: dict) -> str:
         spawn_chance = 0.25
         spawn = random.random() < spawn_chance
         if spawn:
+            mood = zone_info.get('mood', 0)
+            if isinstance(mood, str):
+                num_mood = parse_utils.mood_int_from_string(mood)
+            else:
+                num_mood = mood
             num_mood = (int) (random.gauss(zone_info.get('mood', 0), 2))
             level = (int) (random.gauss(zone_info.get('level', 1), 2))
             mood_string = parse_utils.mood_string_from_int(num_mood)

tale/parse_utils.py

@@ -220,7 +220,7 @@ def _init_weapon(item: dict):
                     short_descr=item.get('short_descr', ''),
                     descr=item.get('descr', ''),
                     wc=item.get('wc', 1),
-                    weapon_type=item.get('type', WeaponType.UNARMED),
+                    weapon_type=WeaponType[item.get('weapon_type', WeaponType.UNARMED.name)],
                     base_damage=item.get('base_damage', random.randint(1,3)),
                     bonus_damage=item.get('bonus_damage', 0),
                     weight=item.get('weight', 1),
@@ -449,6 +449,22 @@ def mood_string_from_int(mood: int):
     else:
         return f' slightly {base_mood}'
 
+def mood_string_to_int(mood: str):
+    """ Returns an int from a mood description"""
+    if mood.startswith('uttermost'):
+        return 5 if mood.endswith('friendly') else -5
+    if mood.startswith('extremely'):
+        return 4 if mood.endswith('friendly') else -4
+    if mood.startswith('very'):
+        return 3 if mood.endswith('friendly') else -3
+    if mood.startswith('friendly'):
+        return 2
+    if mood.startswith('hostile'):
+        return -2
+    if mood.startswith('neutral'):
+        return 0
+    return 1 if mood.endswith('friendly') else -1
+    
 def replace_items_with_world_items(items: list, world_items: dict) -> list:
     """ Replaces items in a list with world items"""
     new_items = []

tests/test_llm_utils.py

@@ -4,7 +4,7 @@
 from tale import mud_context, weapon_type
 from tale import zone
 from tale import util
-from tale.base import Location
+from tale.base import Item, Location, Weapon
 from tale.coord import Coord
 from tale.json_story import JsonStory
 from tale.llm.llm_utils import LlmUtil
@@ -233,17 +233,18 @@ def test_generate_start_zone(self):
         assert(result.races == ['human', 'elf', 'dwarf'])
 
     def test_generate_world_items(self):
-        self.llm_util._world_building.io_util.response = '{"items":[{"name": "sword", "type": "Weapon", "value": 100}, {"name": "shield", "type": "Armor", "value": 60}]}'
+        self.llm_util._world_building.io_util.response = '{"items":[{"name": "sword", "type": "Weapon","value": 100}, {"name": "shield", "type": "Armor", "value": 60}]}'
         result = self.llm_util._world_building.generate_world_items(story_context='', 
                                                    story_type='',
                                                    world_mood=0,
                                                    world_info='')
         assert(len(result) == 2)
         sword = result.get('sword')
         assert(sword.name == 'sword')
-        assert(sword.type == weapon_type.WeaponType.ONE_HANDED)
+        assert(isinstance(sword, Weapon))
         shield = result.get('shield')
         assert(shield.name == 'shield')
+        assert(isinstance(shield, Item))
 
     def test_generate_world_creatures(self):
         # mostly for coverage