removing erroneous json preprompt from dialogue

making all inherit from LivingNpc, for now

Author: neph1

llm_config.yaml

@@ -12,7 +12,7 @@ MEMORY_SIZE: 512
 PRE_PROMPT: 'Below is an instruction that describes a task, paired with an input that provides further context. As an game keeper for an RPG, write a response that appropriately completes the request.\n\n'
 BASE_PROMPT: "[Story context: {story_context}]; [History: {history}]; ### Instruction: Rewrite the following Text in your own words using the supplied Context and History to create a background for your text. Use about {max_words} words. [Text:{input_text}] \n\nEnd of text.\n\n ### Instruction: Rewrite [Text] in your own words. ### Response:\n"
 ACTION_PROMPT: "[Story context: {story_context}]; [History: {history}]; ### Instruction: Rewrite the Action, and nothing else, in your own words using the supplied Context and Location. History is what happened before. Use less than {max_words} words. [Text: {input_text}] \n\nEnd of text.\n\n### Response:\n"
-DIALOGUE_PROMPT: '[Story context: {story_context}]; [Location: {location}]; The following is a conversation between {character1} and {character2}; {character1}:{character1_description}; character2:{character2_description}; [Chat history: {previous_conversation}]\n\n [{character2}s sentiment towards {character1}: {sentiment}]. ### Instruction: Write a single response for {character2} in third person pov, using {character2} description. Respond in plain text. \n\n### Response:\n'
+DIALOGUE_PROMPT: '[Story context: {story_context}]; [Location: {location}]; The following is a conversation between {character1} and {character2}; {character1}:{character1_description}; character2:{character2_description}; [Chat history: {previous_conversation}]\n\n [{character2}s sentiment towards {character1}: {sentiment}]. ### Instruction: Write a single response for {character2} in third person pov, using {character2} description. \n\n### Response:\n'
 ITEM_PROMPT: 'Items:[{items}];Characters:[{character1},{character2}]  \n\n ### Instruction: Decide if an item was explicitly given, taken, dropped or put somewhere in the following text:[Text:{text}]. Insert your thoughts about whether an item was explicitly given, taken, put somewhere or dropped in "my thoughts", and the results in "item", "from" and "to", or make them empty if . Insert {character1}s sentiment towards {character2} in a single word in "sentiment assessment". Fill in the following JSON template: {{ "thoughts":"my thoughts", "result": {{ "item":"", "from":"", "to":""}}, {{"sentiment":"sentiment assessment"}} }} End of example. \n\n Write your response in valid JSON\n\n### Response:\n'
 COMBAT_PROMPT: 'Rewrite the following combat between user {attacker} using {attacker_weapon}, and {victim} using {victim_weapon} in {location}, {location_description} into a vivid description in less than 300 words. ### Instruction: Rewrite the following combat result in about 150 words, using the characters weapons . Combat Result: {attacker_msg} ### Response:\n\n'
 PRE_JSON_PROMPT: 'Below is an instruction that describes a task, paired with an input that provides further context. Write a response in valid JSON format that appropriately completes the request.\n\n'

tale/llm/character.py

@@ -16,7 +16,7 @@
 class Character():
 
     def __init__(self, backend: str, io_util: IoUtil, default_body: dict):
-        self.pre_prompt = llm_config.params['PRE_JSON_PROMPT']
+        self.pre_prompt = llm_config.params['PRE_PROMPT']
         self.dialogue_prompt = llm_config.params['DIALOGUE_PROMPT']
         self.character_prompt = llm_config.params['CREATE_CHARACTER_PROMPT']
         self.item_prompt = llm_config.params['ITEM_PROMPT']

tale/npc_defs.py

@@ -22,12 +22,12 @@ def do_idle_action(self, ctx: Context) -> None:
         if player_in_location:
             self.idle_action()
 
-class StationaryMob(Living):
+class StationaryMob(LivingNpc):
 
     def __init__(self, name: str, gender: str, *,
                  title: str="", descr: str="", short_descr: str="", race: str=""):
         super(StationaryMob, self).__init__(name=name, gender=gender,
-                 title=title, descr=descr, short_descr=short_descr, race=race)
+                 title=title, descr=descr, short_descr=short_descr, race=race, age=0, personality='', occupation='')
 
     @call_periodically(15, 60)
     def do_idle_action(self, ctx: Context) -> None: