adding spells to stories and tests

Author: neph1

llm_config.yaml

@@ -17,7 +17,7 @@ CHARACTER_TEMPLATE: '{"name":"", "description": "50 words", "appearance": "25 wo
 FOLLOW_TEMPLATE: '{{"response":"yes or no", "reason":"50 words"}}'
 ITEM_TYPES: ["Weapon", "Wearable", "Health", "Money", "Trash", "Food", "Drink", "Key"]
 PRE_PROMPT: 'You are a creative game keeper for a role playing game (RPG). You craft detailed worlds and interesting characters with unique and deep personalities for the player to interact with. Do not acknowledge the task or speak directly to the user, just perform it.'
-BASE_PROMPT: '<context>{context}</context>\n[USER_START]Rewrite [{input_text}] in your own words using the information found inside the <context> tags to create a background for your text. Use about {max_words} words.'
+BASE_PROMPT: '<context>{context}</context>\n[USER_START] Rewrite [{input_text}] in your own words. The information inside the <context> tags should be used to ensure it fits the story. Use about {max_words} words.'
 DIALOGUE_PROMPT: '<context>{context}</context>\nThe following is a conversation between {character1} and {character2}; {character2}s sentiment towards {character1}: {sentiment}. Write a single response as {character2} in third person pov, using {character2} description and other information found inside the <context> tags. If {character2} has a quest active, they will discuss it based on its status. Respond in JSON using this template: """{dialogue_template}""". [USER_START]Continue the following conversation as {character2}: {previous_conversation}'
 COMBAT_PROMPT: '<context>{context}</context>\nThe following is a combat scene between {attackers} and {defenders} in {location}. [USER_START] Describe the following combat result in about 150 words in vivid language, using the characters weapons and their health status: 1.0 is highest, 0.0 is lowest. Combat Result: {input_text}'
 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.'

stories/anything/story.py

@@ -8,6 +8,7 @@
 from tale import parse_utils
 from tale.driver import Driver
 from tale.json_story import JsonStory
+from tale.magic import MagicType
 from tale.main import run_from_cmdline
 from tale.player import Player, PlayerConnection
 from tale.charbuilder import PlayerNaming
@@ -33,6 +34,10 @@ def init_player(self, player: Player) -> None:
         player.stats.set_weapon_skill(weapon_type=WeaponType.ONE_HANDED, value=random.randint(10, 30))
         player.stats.set_weapon_skill(weapon_type=WeaponType.TWO_HANDED, value=random.randint(10, 30))
         player.stats.set_weapon_skill(weapon_type=WeaponType.UNARMED, value=random.randint(20, 30))
+        player.stats.magic_skills[MagicType.HEAL] = 30
+        player.stats.magic_skills[MagicType.BOLT] = 30
+        player.stats.magic_skills[MagicType.DRAIN] = 30
+        player.stats.magic_skills[MagicType.REJUVENATE] = 30
         pass
 
     def create_account_dialog(self, playerconnection: PlayerConnection, playernaming: PlayerNaming) -> Generator:

stories/dungeon/story.py

@@ -11,6 +11,7 @@
 from tale.dungeon.dungeon_generator import ItemPopulator, Layout, LayoutGenerator, MobPopulator
 from tale.items.basic import Money
 from tale.json_story import JsonStory
+from tale.magic import MagicType
 from tale.main import run_from_cmdline
 from tale.npc_defs import RoamingMob
 from tale.player import Player, PlayerConnection
@@ -44,6 +45,10 @@ def init_player(self, player: Player) -> None:
         player.stats.set_weapon_skill(weapon_type=WeaponType.ONE_HANDED, value=random.randint(10, 30))
         player.stats.set_weapon_skill(weapon_type=WeaponType.TWO_HANDED, value=random.randint(10, 30))
         player.stats.set_weapon_skill(weapon_type=WeaponType.UNARMED, value=random.randint(20, 30))
+        player.stats.magic_skills[MagicType.HEAL] = 30
+        player.stats.magic_skills[MagicType.BOLT] = 30
+        player.stats.magic_skills[MagicType.DRAIN] = 30
+        player.stats.magic_skills[MagicType.REJUVENATE] = 30
         pass
 
     def create_account_dialog(self, playerconnection: PlayerConnection, playernaming: PlayerNaming) -> Generator:

stories/prancingllama/story.py

@@ -4,8 +4,10 @@
 
 import tale
 from tale.base import Location
+from tale.cmds import spells
 from tale.driver import Driver
 from tale.llm.llm_ext import DynamicStory
+from tale.magic import MagicType
 from tale.main import run_from_cmdline
 from tale.player import Player, PlayerConnection
 from tale.charbuilder import PlayerNaming
@@ -55,6 +57,7 @@ def init_player(self, player: Player) -> None:
         player.stats.set_weapon_skill(weapon_type=WeaponType.ONE_HANDED, value=25)
         player.stats.set_weapon_skill(weapon_type=WeaponType.TWO_HANDED, value=15)
         player.stats.set_weapon_skill(weapon_type=WeaponType.UNARMED, value=35)
+        player.stats.magic_skills[MagicType.HEAL] = 50
 
     def create_account_dialog(self, playerconnection: PlayerConnection, playernaming: PlayerNaming) -> Generator:
         """

stories/prancingllama/zones/prancingllama.py

@@ -1,10 +1,8 @@
 import random
 
-from tale.base import Location, Item, Exit, Door, Key, Living, ParseResult, Weapon
+from tale.base import Location, Item, Exit, Weapon
 from tale.errors import StoryCompleted
 from tale.items.basic import Note
-from tale.lang import capital
-from tale.player import Player
 from tale.util import Context, call_periodically
 from tale.verbdefs import AGGRESSIVE_VERBS
 from tale.verbdefs import VERBS

tale/accounts.py

@@ -110,8 +110,11 @@ def _create_database(self) -> None:
                             strength integer NOT NULL,
                             dexterity integer NOT NULL,
                             weapon_skills varchar NOT NULL,
+                            magic_skills varchar NOT NULL,
                             combat_points integer NOT NULL,
                             max_combat_points integer NOT NULL,
+                            magic_points integer NOT NULL,
+                            max_magic_points integer NOT NULL,
                             FOREIGN KEY(account) REFERENCES Account(id)
                         );
                         """)

tale/cmds/spells.py

@@ -2,24 +2,31 @@
 import random
 from typing import Optional
 from tale import base, util, cmds
+from tale import magic
 from tale.cmds import cmd
 from tale.errors import ActionRefused, ParseError
-from tale.magic import MagicType, MagicSkill
+from tale.magic import MagicType, MagicSkill, Spell
 from tale.player import Player
 
 
 @cmd("heal")
 def do_heal(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
     """ Heal someone or something """
 
-    skill = player.stats.magic_skills.get(MagicType.HEAL) # type: MagicSkill
-    if not skill:
+    skillValue = player.stats.magic_skills.get(MagicType.HEAL, None)
+    if not skillValue:
         raise ActionRefused("You don't know how to heal")
+    spell =  magic.spells[MagicType.HEAL] # type: Spell
 
-    if not skill.spell.check_cost(player, level):
+    num_args = len(parsed.args)
+
+    level = player.stats.level
+    if num_args == 2:
+        level = int(parsed.args[1])
+
+    if not spell.check_cost(player.stats.magic_points, level):
         raise ActionRefused("You don't have enough magic points")
 
-    num_args = len(parsed.args)
     if num_args < 1:
         raise ParseError("You need to specify who or what to heal")
     try:
@@ -31,33 +38,37 @@ def do_heal(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None
     if not result or not isinstance(result, base.Living):
         raise ActionRefused("Can't heal that")
 
-    level = player.stats.level
-    if num_args == 2:
-        level = int(parsed.args[1])
 
-    player.stats.magic_points -= skill.spell.base_cost * level
+    player.stats.magic_points -= spell.base_cost * level
 
-    if random.randint(1, 100) > skill.skill:
-        player.tell("Your healing spell fizzles out", evoke=True)
+    if random.randint(1, 100) > skillValue:
+        player.tell("Your healing spell fizzles out", evoke=True, short_len=True)
         return
 
     result.stats.replenish_hp(5 * level)
-    player.tell("You heal %s for %d hit points" % (result.name, 5 * level), evoke=True)
-    player.tell_others("%s heals %s" % (player.name, result.name), evoke=True)
+    player.tell("You cast a healing spell that heals %s for %d hit points" % (result.name, 5 * level), evoke=True)
+    player.tell_others("%s casts a healing spell that heals %s" % (player.name, result.name), evoke=True)
 
 
 @cmd("bolt")
 def do_bolt(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
     """ Cast a bolt of energy """
 
-    skill = player.stats.magic_skills.get(MagicType.BOLT)   # type: MagicSkill
-    if not skill:
+    skillValue = player.stats.magic_skills.get(MagicType.BOLT, None)
+    if not skillValue:
         raise ActionRefused("You don't know how to cast a bolt")
 
-    if not skill.spell.check_cost(player, level):
+    spell =  magic.spells[MagicType.BOLT] # type: Spell
+
+    num_args = len(parsed.args)
+
+    level = player.stats.level
+    if num_args == 2:
+        level = int(parsed.args[1])
+
+    if not spell.check_cost(player.stats.magic_points, level):
         raise ActionRefused("You don't have enough magic points")
 
-    num_args = len(parsed.args)
     if num_args < 1:
         raise ParseError("You need to specify who or what to attack")
 
@@ -69,35 +80,37 @@ def do_bolt(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None
     result = player.location.search_living(entity) # type: Optional[base.Living]
     if not result or not isinstance(result, base.Living):
         raise ActionRefused("Can't attack that")
-    
-    level = player.stats.level
-    if num_args == 2:
-        level = int(parsed.args[1])
 
-    
-    player.stats.magic_points -= skill.spell.base_cost * level
+    player.stats.magic_points -= spell.base_cost * level
 
-    if random.randint(1, 100) > skill.skill:
-        player.tell("Your bolt spell fizzles out", evoke=True)
+    if random.randint(1, 100) > skillValue:
+        player.tell("Your bolt spell fizzles out", evoke=True, short_len=True)
         return
 
-    hp = random.randrange(1, level)
+    hp = random.randint(1, level)
     result.stats.hp -= hp
-    player.tell("Your energy bolt hits %s for %d damage" % (result.name, hp), evoke=True)
-    player.tell_others("%s's energy bolt hits %s for %d damage" % (player.name, result.name, hp), evoke=True)
+    player.tell("You cast an energy bolt that hits %s for %d damage" % (result.name, hp), evoke=True)
+    player.tell_others("%s casts an energy bolt that hits %s for %d damage" % (player.name, result.name, hp), evoke=True)
 
 @cmd("drain")
 def do_drain(player: Player, parsed: base.ParseResult, ctx: util.Context) -> None:
     """ Drain energy from someone or something """
 
-    skill = player.stats.magic_skills.get(MagicType.DRAIN)
-    if not skill:
+    skillValue = player.stats.magic_skills.get(MagicType.DRAIN, None)
+    if not skillValue:
         raise ActionRefused("You don't know how to drain")
 
-    if not skill.spell.check_cost(player, level):
+    spell =  magic.spells[MagicType.DRAIN] # type: Spell
+
+    num_args = len(parsed.args)
+
+    level = player.stats.level
+    if num_args == 2:
+        level = int(parsed.args[1])
+    
+    if not spell.check_cost(player.stats.magic_points, level):
         raise ActionRefused("You don't have enough magic points")
 
-    num_args = len(parsed.args)
     if num_args < 1:
         raise ParseError("You need to specify who or what to drain")
 
@@ -110,24 +123,19 @@ def do_drain(player: Player, parsed: base.ParseResult, ctx: util.Context) -> Non
     if not result or not isinstance(result, base.Living):
         raise ActionRefused("Can't drain that")
 
-    level = player.stats.level
-    if num_args == 2:
-        level = int(parsed.args[1])
-    
-    
-    player.stats.magic_points -= skill.spell.base_cost * level
+    player.stats.magic_points -= spell.base_cost * level
 
-    if random.randint(1, 100) > skill.skill:
-        player.tell("Your drain spell fizzles out", evoke=True)
+    if random.randint(1, 100) > skillValue:
+        player.tell("Your drain spell fizzles out", evoke=True, short_len=True)
         return
 
-    points = random.randrange(1, level)
+    points = random.randint(1, level)
     result.stats.combat_points -= points
     result.stats.magic_points -= points
 
     player.stats.magic_points += points
 
-    player.tell("Your drain spell drains %s of %d combat and magic points" % (result.name, points), evoke=True)
-    player.tell_others("%s casts a drain spell that drains energy from %s" % (player.name, result.name), evoke=True)
+    player.tell("You cast a 'drain' spell that drains %s of %d combat and magic points" % (result.name, points), evoke=True)
+    player.tell_others("%s casts a 'drain' spell that drains energy from %s" % (player.name, result.name), evoke=True)
 
 

tale/driver.py

@@ -961,8 +961,9 @@ def build_location(self, targetLocation: base.Location, zone: Zone, player: play
     def do_on_player_death(self, player: player.Player) -> None:
         pass
 
-    @util.call_periodically(10)
+    @util.call_periodically(20)
     def replenish(self):
         for player in self.all_players.values():
             player.player.stats.replenish_hp(1)
-            player.player.stats.replenish_combat_points(1)
+            player.player.stats.replenish_combat_points(1)
+            player.player.stats.replenish_magic_points(1)

tale/magic.py

@@ -1,8 +1,6 @@
 from abc import ABC
 from enum import Enum
 
-from tale.player import Player
-
 
 class MagicType(Enum):
     HEAL = 1
@@ -19,17 +17,13 @@ def __init__(self, name: str, base_cost: int, base_value: int = 1, max_level: in
         self.base_cost = base_cost
         self.max_level = max_level
 
-    def do_cast(self, player, target, level):
-        pass
-
-    def check_cost(self, player: Player, level: int) -> bool:
-        return player.stats.magic_points >= self.base_cost * level
+    def check_cost(self, magic_points: int, level: int) -> bool:
+        return magic_points >= self.base_cost * level
 
 spells = {
     MagicType.HEAL: Spell('heal', base_cost=2, base_value=5),
     MagicType.BOLT: Spell('bolt', base_cost=3, base_value=5),
-    MagicType.DRAIN: Spell('drain', base_cost=3, base_value=5),
-    MagicType.REJUVENATE: Spell('rejuvenate', base_cost=3, base_value=5)
+    MagicType.DRAIN: Spell('drain', base_cost=3, base_value=5)
 }
 
 class MagicSkill: