fix missing params

Author: neph1

tale/driver.py

@@ -909,7 +909,7 @@ def prepare_combat_prompt(self,
             defender_titles.append(defender_title)
 
 
-        return llm_config['COMBAT_PROMPT'].format(attackers=attacker_names, 
+        return llm_config.params['COMBAT_PROMPT'].format(attackers=attacker_names, 
                                                     defenders=defender_titles,
                                                     location=location_title,
                                                     input_text=combat_result,

tale/llm/llm_utils.py

@@ -286,7 +286,7 @@ def free_form_action(self, location: Location, character_name: str,  character_c
                                        character_card=character_card,
                                        event_history=event_history,
                                        location=location,
-                                       actions=self.action_list)
+                                       actions=llm_config.params['ACTION_LIST'])
         return self._character.free_form_action(action_context)
 
     def request_follow(self, actor: MudObject, character_name: str, character_card: str, event_history: str, location: Location, asker_reason: str):

tale/llm/quest_building.py

@@ -20,7 +20,7 @@ def __init__(self, backend: str, io_util: IoUtil, default_body: dict, json_gramm
 
     def generate_quest(self, base_quest: dict, character_name: str, location: Location, context: WorldGenerationContext, character_card: str = '', story_type: str = '', world_info: str = '', zone_info: str = '') -> Quest:
         prompt = self.pre_prompt
-        prompt += self.llm_config.params['QUEST_PROMPT'].format(
+        prompt += llm_config.params['QUEST_PROMPT'].format(
             context='{context}',
             base_quest=base_quest,
             location_name=location.name,
@@ -33,7 +33,7 @@ def generate_quest(self, base_quest: dict, character_name: str, location: Locati
 
     def generate_note_quest(self, context: WorldGenerationContext, zone_info: str) -> Quest:
         prompt = self.pre_prompt
-        prompt += self.llm_config.params['NOTE_QUEST_PROMPT'].format(
+        prompt += llm_config.params['NOTE_QUEST_PROMPT'].format(
             context='{context}',
             zone_info=zone_info)
         request_body = deepcopy(self.default_body)

tale/llm/world_building.py

@@ -64,7 +64,7 @@ def build_location(self, location: Location,
         if item_amount > 0:
             items_prompt = llm_config.params['ITEMS_PROMPT'].format(items=item_amount)
 
-        prompt = self.pre_json_prompt
+        prompt = llm_config.params['PRE_JSON_PROMPT']
         prompt += llm_config.params['CREATE_LOCATION_PROMPT'].format(
             context = '{context}',
             zone_info=zone_info,

tests/test_living_npc.py

@@ -74,6 +74,7 @@ def test_character_card(self):
         assert(json_card['name'] == 'test')
         assert('ale' in json_card['items'])
         assert('knife' in json_card['items'])
+        assert('goal' in json_card.keys())
         assert(eval(json_card['wielding']) == knife.to_dict())
 
         npc.wielding = None