Merge pull request #53 from neph1/v0.19.0

V0.19.0

Author: neph1

backend_kobold_cpp.yaml

@@ -3,6 +3,6 @@ ENDPOINT: "/api/v1/generate"
 STREAM: False
 STREAM_ENDPOINT: "/api/extra/generate/stream"
 DATA_ENDPOINT: "/api/extra/generate/check"
-DEFAULT_BODY: '{"stop_sequence": "\n\n\n", "max_length":750, "max_context_length":4096, "temperature":0.5, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
+DEFAULT_BODY: '{"stop_sequence": "\n\n\n\n", "max_length":750, "max_context_length":4096, "temperature":0.5, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'
 ANALYSIS_BODY: '{}'
 GENERATION_BODY: '{"stop_sequence": "\n\n\n\n", "max_length":750, "max_context_length":4096, "temperature":1.0, "top_k":120, "top_a":0.0, "top_p":0.85, "typical_p":1.0, "tfs":1.0, "rep_pen":1.2, "rep_pen_range":256, "sampler_order":[6,0,1,3,4,2,5], "seed":-1}'

backend_llama_cpp.yaml

@@ -1,4 +1,4 @@
-URL: "http://127.0.0.1:8081"
+URL: "http://127.0.0.1:8080"
 ENDPOINT: "/v1/chat/completions"
 STREAM: False
 OPENAI_HEADERS: '{"Content-Type":"application/json", "Authorization":""}'

llm_config.yaml

@@ -2,7 +2,7 @@ WORD_LIMIT: 200
 BACKEND: "kobold_cpp" # valid options: "openai", "llama_cpp", "kobold_cpp"
 ANALYSIS_BODY: '{}'
 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.'
+PRE_PROMPT: 'You are a creative game keeper. You craft detailed worlds and interesting characters with unique and deep personalities for the player to interact with.'
 BASE_PROMPT: "[Story context: {story_context}]; [History: {history}]; [USER_START] Rewrite [{input_text}] in your own words using the supplied Context and History to create a background for your text. Use about {max_words} words."
 ACTION_PROMPT: "[Story context: {story_context}]; [History: {history}]; [USER_START] 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. [Action: {input_text}]."
 DIALOGUE_PROMPT: 'Story context: {story_context}; Location: {location}; The following is a conversation between {character1} and {character2}; {character1}:{character1_description}; {character2}:{character2_description}; {character2}s sentiment towards {character1}: {sentiment}. Write a single response as {character2} in third person pov, using {character2} description. If {character2} has a quest active, they will discuss it based on its status. Respond in JSON using this template: {{"response":"may be both dialogue and action.", "sentiment":"sentiment based on response", "give":"if any physical item of {character2}s is given as part of the dialogue. Or nothing."}}. [USER_START]Continue the following conversation as {character2}: {previous_conversation}'
@@ -28,5 +28,6 @@ PLAYER_ENTER_PROMPT: 'Story context: {story_context}; World info: {world_info};
 QUEST_PROMPT: '[Story context: {story_context}]; World info: {world_info}; Zone info: {zone_info}; Character: {character_card}; [USER_START] In an RPG described as {story_type}, {character_name} needs someone to perform a task. Based on the following input, come up with a suitable reason for it, using {character_name}s personality and history. Task info: {base_quest}. Fill in this JSON template and do not write anything else: {{"reason":""}} \n\n '
 NOTE_QUEST_PROMPT: '[Story context: {story_context}]; World info: {world_info}; Zone info: {zone_info}; [USER_START]For an RPG described as {story_type}, generate a quest that starts from reading a note. The reader must find and talk to a person. Fill in the following JSON template and write nothing else.: {{"reason": "only what the note says. 50 words.", "type":"talk", "target":"who to talk to", "location":"", "name":"name of quest"}}'
 NOTE_LORE_PROMPT: '[Story context: {story_context}]; World info: {world_info}; Zone info: {zone_info}; [USER_START]For an RPG described as {story_type}, Decide what is written on a note that has been found. Use the provided story and world information to generate a piece of lore. Use about 50 words.'
-USER_START: '[INST]'
-USER_END: '[/INST]'
+ACTION_PROMPT: 'Story context: {story_context};<location>{location}</location> \nAct as as {character_name} in a {story_type} RPG and perform an action.<description>{character}</description> <actions>{actions}</actions>. <items>{location_items}</items>. <characters>{characters}</characters> <exits>{exits}</exits>.\nPick an action according to {character_name}s description and mood. If suitable, select something to perform the action on (target). Make sure the action is from the list and is related to {character_name}s thoughts.\n Respond using JSON in the following format: """{{"goal": reason for action, "thoughts":thoughts about performing action, "action":action chosen, "target":character, item or exit or description, "text": if anything is said during the action}}"""<history>{history}</history>'
+USER_START: '### Instruction:'
+USER_END: '### Response:'

stories/prancingllama/npcs/npcs.py

@@ -101,10 +101,6 @@ class Shanda(Patron):
     def init(self) -> None:
         self.stats.set_weapon_skill(weapon_type=WeaponType.UNARMED, value=65)
 
-    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 Rat(Living):
     def init(self) -> None:
@@ -131,7 +127,7 @@ def do_idle_action(self, ctx: Context) -> None:
 
 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"}
-shanda.quest = Quest(name="bring a rat skull", reason="to prove your worth", giver=shanda.name, type=QuestType.GIVE, target="rat_skull")
+shanda.quest = Quest(name="bring a rat skull", reason="prove your worth to Shanda", giver=shanda.name, type=QuestType.GIVE, target="rat_skull")
 
 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"}

stories/prancingllama/story.py

@@ -31,7 +31,7 @@ class Story(DynamicStory):
     config.startlocation_player = "prancingllama.entrance"
     config.startlocation_wizard = "prancingllama.entrance"
     config.zones = ["prancingllama"]
-    config.context = "The final outpost high up in a cold, craggy mountain range. It's frequented by adventurers and those looking to avoid attention."
+    config.context = "The final outpost high up in a cold, craggy mountain range. It's frequented by adventurers and those seeking to avoid attention."
     config.type = "A low level fantasy adventure with focus of character building and interaction."
     config.custom_resources = True
 

tale/base.py

@@ -285,6 +285,7 @@ def __init__(self, name: str, title: str = "", *, descr: str = "", short_descr:
         self.verbs = {}  # type: Dict[str, str]
         # register all periodical tagged methods
         self.story_data = {}  # type: Dict[Any, Any]   # not used by Tale itself, story can put custom data here. Use builtin types only.
+        self.visible = True  # can this object be seen by others?
         self.init()
         if util.get_periodicals(self):
             if mud_context.driver is None:
@@ -766,7 +767,7 @@ def look(self, exclude_living: 'Living'=None, short: bool=False) -> Sequence[str
                 item_names = sorted(item.name for item in self.items)
                 paragraphs.append("You see: " + lang.join(item_names))
             if self.livings:
-                living_names = sorted(living.name for living in self.livings if living != exclude_living)
+                living_names = sorted(living.name for living in self.livings if living != exclude_living and living.visible)
                 if living_names:
                     paragraphs.append("Present here: " + lang.join(living_names))
             return paragraphs
@@ -783,8 +784,8 @@ def look(self, exclude_living: 'Living'=None, short: bool=False) -> Sequence[str
                     exit_paragraph.append(exit.short_description)
             paragraphs.append(" ".join(exit_paragraph))
         items_and_livings = []  # type: List[str]
-        items_with_short_descr = [item for item in self.items if item.short_description]
-        items_without_short_descr = [item for item in self.items if not item.short_description]
+        items_with_short_descr = [item for item in self.items if item.short_description and item.visible]
+        items_without_short_descr = [item for item in self.items if not item.short_description and item.visible]
         uniq_descriptions = set()
         if items_with_short_descr:
             for item in items_with_short_descr:
@@ -793,8 +794,8 @@ def look(self, exclude_living: 'Living'=None, short: bool=False) -> Sequence[str
         if items_without_short_descr:
             titles = sorted([lang.a(item.title) for item in items_without_short_descr])
             items_and_livings.append("You see " + lang.join(titles) + ".")
-        livings_with_short_descr = [living for living in self.livings if living != exclude_living and living.short_description]
-        livings_without_short_descr = [living for living in self.livings if living != exclude_living and not living.short_description]
+        livings_with_short_descr = [living for living in self.livings if living != exclude_living and living.short_description and living.visible]
+        livings_without_short_descr = [living for living in self.livings if living != exclude_living and not living.short_description and living.visible]
         if livings_without_short_descr:
             titles = sorted(living.title for living in livings_without_short_descr)
             if titles:
@@ -1406,7 +1407,7 @@ def locate_item(self, name: str, include_inventory: bool=True, include_location:
                         break
         return (found, containing_object) if found else (None, None)
 
-    def start_attack(self, victim: 'Living') -> None:
+    def start_attack(self, victim: 'Living') -> combat.Combat:
         """Starts attacking the given living for one round."""
         attacker_name = lang.capital(self.title)
         victim_name = lang.capital(victim.title)
@@ -1436,6 +1437,7 @@ def start_attack(self, victim: 'Living') -> None:
             combat.produce_remains(util.Context, self)
         if victim.stats.hp < 1:
             combat.produce_remains(util.Context, victim)  
+        return c
 
     def allow_give_money(self, amount: float, actor: Optional['Living']) -> None:
         """Do we accept money? Raise ActionRefused if not."""
@@ -1518,7 +1520,7 @@ def _move_follow(self, target_location: Location, ctx: util.Context) -> None:
 
     def check_stat(self, stat : str):
         if stat == 'hp':
-            return self.stat.hp
+            return self.stats.hp
 
     @property
     def wielding(self) -> Weapon:
@@ -1528,16 +1530,30 @@ def wielding(self) -> Weapon:
     @wielding.setter
     def wielding(self, weapon: Optional[Weapon]) -> None:
         """Wield a weapon. If weapon is None, unwield."""
+        if not weapon and not self.__wielding:
+            raise ActionRefused("You're not wielding anything.")
         self.__wielding = weapon
         self.stats.wc = weapon.wc if self.__wielding else 0
+        if weapon:
+            self.tell_others("{Actor} wields %s." % self.wielding.title, evoke=True, short_len=True)
+            self.tell("You wield %s." % self.wielding.title)
+        elif self.__wielding:
+            self.tell_others("{Actor} unwields %s." % self.__wielding.title, evoke=True, short_len=True)
+            self.tell("You unwield %s." % self.__wielding.title)
 
     def set_wearable(self, wearable: Optional[Wearable], wear_location: Optional[wearable.WearLocation]) -> None:
         """ Wear an item if item is not None, else unwear location"""
         if wearable:
             loc = wear_location if wear_location else wearable.wear_location
             self.__wearing[loc] = wearable
+            self.tell_others("{Actor} puts on %s." % wearable.title, evoke=True, short_len=True)
+            self.tell("You put on %s." % wearable.title)
         elif wear_location:
-            self.__wearing.pop(wear_location, None)
+            item = self.__wearing.pop(wear_location, None)
+            if item:
+                self.tell_others("{Actor} removes %s." % item.title, evoke=True, short_len=True)
+                self.tell("You remove %s." % item.title)
+
 
     def get_wearable(self, location: wearable.WearLocation) -> Optional[Wearable]:
         """Return the wearable item at the given location, or None if no item is worn there."""

tale/cmds/normal.py

@@ -1739,7 +1739,7 @@ def do_save(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None
 
 @cmd("eat", "drink")
 def do_consume(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
-    """Eat or drinksomething."""
+    """Eat or drink something."""
     if len(parsed.args) != 1:
         raise ParseError("You need to specify the item to consume")
     try:

tale/cmds/wizard.py

@@ -798,4 +798,22 @@ def do_load_character(player: Player, parsed: base.ParseResult, ctx: util.Contex
         ctx.driver.load_character(player, path)
     except FileNotFoundError:
         raise ActionRefused("File not found")
+    
+@wizcmd("set_visibility")
+def do_set_visible(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
+    """Set the visibility of a creature."""
+    if len(parsed.args) != 2:
+        raise ParseError("You need to specify the object and the visibility(true or false)")
+    try:
+        object = player.location.search_living(parsed.args[0])
+        if not object:
+            object = player.search_item(parsed.args[0], include_inventory=True, include_location=True)
+        if not object:
+            raise ParseError("No object found")
+        
+        visible = parsed.args[1].lower() == 'true' or parsed.args[1] == '1'
+        object.visible = visible
+        player.tell("%s visibility set to %s" % (object, visible))
+    except ValueError as x:
+        raise ActionRefused(str(x))
 

tale/combat.py

@@ -54,6 +54,11 @@ def resolve_attack(self) -> (str, int, int):
 
         text_result, damage_to_attacker = self._round(self.defender, self.attacker)
         texts.extend(text_result)
+
+        if self.defender.stats.hp - damage_to_defender < 0:
+            texts.append(f'{self.defender.title} dies')
+        if self.attacker.stats.hp - damage_to_attacker < 0:
+            texts.append(f'{self.attacker.title} dies')
 
         return ', '.join(texts), damage_to_attacker, damage_to_defender
 
@@ -78,8 +83,6 @@ def _round(self, actor1: 'base.Living', actor2: 'base.Living') -> ([str], int):
                     texts.append(f', {actor2.title} is injured')
                 else:
                     texts.append(f', {actor2.title} is unharmed')
-                if actor2.stats.hp - damage_to_defender < 1:
-                    texts.append(f', {actor2.title} dies')
                 return texts, damage_to_defender
         elif attack_result > 50:
             texts.append(f'{actor1.title} misses completely')

tale/driver.py

@@ -843,7 +843,7 @@ def load_character(self, player: player.Player, path: str):
         if not char_data:
             raise errors.TaleError("Character not found.")
         character = CharacterV2().from_json(char_data)
-        npc = LivingNpc(name = character.name.lower(), 
+        npc = StationaryNpc(name = character.name.lower(), 
                         gender = character.gender,
                         title = character.name, 
                         descr  = character.appearance, 
@@ -852,8 +852,19 @@ def load_character(self, player: player.Player, path: str):
                         personality = character.personality, 
                         race = character.race,
                         occupation = character.occupation)
+        npc.autonomous = character.autonomous
+        wearing = character.wearing.split(',')
+        for item in wearing:
+            if item:
+                wearable = base.Wearable(name=item.lower().trim())
+                npc.set_wearable(wearable)
+        
         npc.following = player
         npc.stats.hp = character.hp
+        if isinstance(self.story, DynamicStory):
+            dynamic_story = typing.cast(DynamicStory, self.story)
+            dynamic_story.world.add_npc(npc)
+
         player.location.insert(npc, None)
         player.location.tell("%s arrives." % npc.title)