Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
06a6b53a37 | ||
|
|
5ce4fa6cb8 |
@@ -12,6 +12,29 @@ WORLD_DIR = Path('/Users/apayne/.timmy/evennia/timmy_world')
|
||||
STATE_FILE = WORLD_DIR / 'game_state.json'
|
||||
TIMMY_LOG = WORLD_DIR / 'timmy_log.md'
|
||||
|
||||
WORLD_ITEMS = {
|
||||
"foraged key": {"effect": "unlock_tower_cache", "quest_item": True, "consumable": False, "effect_text": "A hidden cache clicks open in the Tower wall."},
|
||||
"seed packet": {"effect": "grow_garden", "quest_item": False, "consumable": True, "effect_text": "Fresh growth pushes through the Garden soil."},
|
||||
"notebook": {"effect": "write_notebook_rule", "quest_item": False, "consumable": False, "effect_text": "A new rule joins the whiteboard in the Tower."},
|
||||
"cloth": {"effect": "patch_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge railing is wrapped tight against the weather."},
|
||||
"oil can": {"effect": "stoke_forge", "quest_item": False, "consumable": True, "effect_text": "The Forge fire answers with a hotter glow."},
|
||||
"lantern": {"effect": "light_bridge", "quest_item": False, "consumable": False, "effect_text": "A steady lantern glow cuts through the dark over the Bridge."},
|
||||
"rope spool": {"effect": "secure_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge is lashed tight and feels safer underfoot."},
|
||||
"chalk": {"effect": "mark_threshold", "quest_item": False, "consumable": True, "effect_text": "A chalk mark at the Threshold points wanderers home."},
|
||||
"weather vane": {"effect": "read_weather", "quest_item": False, "consumable": False, "effect_text": "The weather vane settles and the coming storm makes sense."},
|
||||
"sunstone": {"effect": "restore_tower_power", "quest_item": False, "consumable": False, "effect_text": "Warm light races through the Tower circuits."},
|
||||
"iron nails": {"effect": "reinforce_bridge", "quest_item": False, "consumable": True, "effect_text": "The Bridge planks are pinned down against the flood."},
|
||||
"river stone": {"effect": "water_garden", "quest_item": False, "consumable": True, "effect_text": "Moisture returns to the Garden beds."},
|
||||
}
|
||||
|
||||
ROOM_DISCOVERABLES = {
|
||||
"Threshold": ["chalk", "sunstone"],
|
||||
"Tower": ["notebook", "lantern"],
|
||||
"Forge": ["oil can", "iron nails"],
|
||||
"Garden": ["seed packet", "foraged key"],
|
||||
"Bridge": ["cloth", "rope spool", "weather vane", "river stone"],
|
||||
}
|
||||
|
||||
# ============================================================
|
||||
# NARRATIVE ARC — 4 phases that transform the world
|
||||
# ============================================================
|
||||
@@ -143,6 +166,8 @@ class World:
|
||||
"visitors": [],
|
||||
},
|
||||
}
|
||||
for room_name, items in ROOM_DISCOVERABLES.items():
|
||||
self.rooms[room_name]["discoverables"] = list(items)
|
||||
|
||||
# Characters (not NPCs — they have lives)
|
||||
self.characters = {
|
||||
@@ -258,6 +283,14 @@ class World:
|
||||
"items_crafted": 0,
|
||||
"conflicts_resolved": 0,
|
||||
"nights_survived": 0,
|
||||
"bridge_patched": False,
|
||||
"bridge_secured": False,
|
||||
"bridge_reinforced": False,
|
||||
"bridge_lantern_lit": False,
|
||||
"tower_cache_unlocked": False,
|
||||
"threshold_marked": False,
|
||||
"weather_readable": False,
|
||||
"sunstone_socketed": False,
|
||||
}
|
||||
|
||||
def tick_time(self):
|
||||
@@ -285,24 +318,25 @@ class World:
|
||||
self.state.pop("phase_transition_event", None)
|
||||
|
||||
# Natural energy decay: the world is exhausting
|
||||
self.state.pop("energy_collapse_event", None)
|
||||
for char_name, char in self.characters.items():
|
||||
char["energy"] = max(0, char["energy"] - 0.3)
|
||||
# Check for energy collapse
|
||||
if char["energy"] <= 0:
|
||||
current = char.get("room", "Threshold")
|
||||
next_rooms = [room for room in self.rooms.keys() if room != current]
|
||||
new_room = random.choice(next_rooms) if next_rooms else current
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
char["room"] = new_room
|
||||
# Timmy collapse gets special narrative treatment
|
||||
if char.get("is_player", False):
|
||||
char["memories"].append("Collapsed from exhaustion.")
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
# Random room change (scattered)
|
||||
rooms = list(self.rooms.keys())
|
||||
current = char.get("room", "Threshold")
|
||||
new_room = current
|
||||
attempts = 0
|
||||
while new_room == current and attempts < 10:
|
||||
import random as _r
|
||||
new_room = _r.choice(rooms)
|
||||
attempts += 1
|
||||
if new_room != current:
|
||||
char["room"] = new_room
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
# Phase-aware: Breaking phase has higher fire-death chance
|
||||
@@ -375,6 +409,14 @@ class World:
|
||||
desc += " Rain mists on the dark water below."
|
||||
if len(self.rooms["Bridge"]["carvings"]) > 1:
|
||||
desc += f" There are {len(self.rooms['Bridge']['carvings'])} carvings now."
|
||||
if self.state.get("bridge_patched"):
|
||||
desc += " Cloth bindings keep the railing from splintering."
|
||||
if self.state.get("bridge_secured"):
|
||||
desc += " Rope lines keep the span steady against the flood."
|
||||
if self.state.get("bridge_reinforced"):
|
||||
desc += " Fresh iron nails hold the planks tight."
|
||||
if self.state.get("bridge_lantern_lit"):
|
||||
desc += " A lantern glows warm over the water."
|
||||
|
||||
elif room_name == "Tower":
|
||||
power = self.state.get("tower_power_low", False)
|
||||
@@ -383,6 +425,19 @@ class World:
|
||||
|
||||
if self.rooms["Tower"]["messages"]:
|
||||
desc += f" The whiteboard holds {len(self.rooms['Tower']['messages'])} rules."
|
||||
if self.state.get("tower_cache_unlocked"):
|
||||
desc += " A hidden cache stands open beneath the whiteboard."
|
||||
|
||||
if room_name == "Threshold" and self.state.get("threshold_marked"):
|
||||
desc += " A chalk arrow points late arrivals toward shelter."
|
||||
if room_name == "Garden" and self.state.get("weather_readable"):
|
||||
desc += " The beds are arranged to catch whatever weather comes next."
|
||||
if room_name == "Tower" and self.state.get("sunstone_socketed"):
|
||||
desc += " A sunstone keeps the room lit with a stubborn amber glow."
|
||||
|
||||
discoverables = room.get("discoverables", [])
|
||||
if discoverables:
|
||||
desc += f" Discoverable items: {', '.join(discoverables)}."
|
||||
|
||||
# Who's here
|
||||
here = [n for n, c in self.characters.items() if c["room"] == room_name and n != char_name]
|
||||
@@ -484,6 +539,10 @@ class ActionSystem:
|
||||
"cost": 1,
|
||||
"description": "Take an item from the room",
|
||||
},
|
||||
"use": {
|
||||
"cost": 1,
|
||||
"description": "Use an item from your inventory to change the world",
|
||||
},
|
||||
"examine": {
|
||||
"cost": 0,
|
||||
"description": "Examine something in detail",
|
||||
@@ -529,6 +588,13 @@ class ActionSystem:
|
||||
available.append("rest")
|
||||
available.append("examine")
|
||||
|
||||
discoverables = world.rooms[room].get("discoverables", [])
|
||||
for item in discoverables:
|
||||
available.append(f"take:{item}")
|
||||
|
||||
for item in char["inventory"]:
|
||||
available.append(f"use:{item}")
|
||||
|
||||
if char["inventory"]:
|
||||
available.append("give:item")
|
||||
|
||||
@@ -1071,6 +1137,76 @@ class GameEngine:
|
||||
f.write(f"\n*Began: {datetime.now().strftime('%Y-%m-%d %H:%M')}*\n\n")
|
||||
f.write("---\n\n")
|
||||
f.write(message + "\n")
|
||||
|
||||
def _take_item(self, item_name, scene):
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
discoverables = self.world.rooms[room_name].get("discoverables", [])
|
||||
if item_name not in discoverables:
|
||||
scene["log"].append(f"There is no {item_name} here.")
|
||||
return
|
||||
discoverables.remove(item_name)
|
||||
self.world.characters["Timmy"]["inventory"].append(item_name)
|
||||
scene["log"].append(f"You take the {item_name}.")
|
||||
if WORLD_ITEMS.get(item_name, {}).get("quest_item"):
|
||||
scene["world_events"].append(f"The {item_name} feels important. It might open a quest route.")
|
||||
|
||||
def _use_item(self, item_name, scene):
|
||||
inventory = self.world.characters["Timmy"]["inventory"]
|
||||
if item_name not in inventory:
|
||||
scene["log"].append(f"You are not carrying {item_name}.")
|
||||
return
|
||||
item = WORLD_ITEMS.get(item_name)
|
||||
if not item:
|
||||
scene["log"].append(f"The {item_name} doesn't seem to do anything.")
|
||||
return
|
||||
|
||||
effect = item["effect"]
|
||||
effect_text = item["effect_text"]
|
||||
if effect == "grow_garden":
|
||||
self.world.rooms["Garden"]["growth"] = min(5, self.world.rooms["Garden"]["growth"] + 2)
|
||||
self.world.state["garden_drought"] = False
|
||||
elif effect == "unlock_tower_cache":
|
||||
self.world.state["tower_cache_unlocked"] = True
|
||||
cache_rule = "Rule: Keys open more than doors when the world trusts you."
|
||||
if cache_rule not in self.world.rooms["Tower"]["messages"]:
|
||||
self.world.rooms["Tower"]["messages"].append(cache_rule)
|
||||
elif effect == "write_notebook_rule":
|
||||
note_rule = f"Rule #{self.world.tick}: A notebook can turn memory into structure."
|
||||
self.world.rooms["Tower"]["messages"].append(note_rule)
|
||||
elif effect == "patch_bridge":
|
||||
self.world.state["bridge_patched"] = True
|
||||
self.world.state["bridge_flooding"] = False
|
||||
self.world.rooms["Bridge"]["weather"] = None
|
||||
self.world.rooms["Bridge"]["rain_ticks"] = 0
|
||||
elif effect == "stoke_forge":
|
||||
self.world.rooms["Forge"]["fire"] = "glowing"
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
elif effect == "light_bridge":
|
||||
self.world.state["bridge_lantern_lit"] = True
|
||||
elif effect == "secure_bridge":
|
||||
self.world.state["bridge_secured"] = True
|
||||
self.world.state["bridge_flooding"] = False
|
||||
self.world.rooms["Bridge"]["weather"] = None
|
||||
self.world.rooms["Bridge"]["rain_ticks"] = 0
|
||||
elif effect == "mark_threshold":
|
||||
self.world.state["threshold_marked"] = True
|
||||
elif effect == "read_weather":
|
||||
self.world.state["weather_readable"] = True
|
||||
self.world.state["garden_drought"] = False
|
||||
elif effect == "restore_tower_power":
|
||||
self.world.state["tower_power_low"] = False
|
||||
self.world.state["sunstone_socketed"] = True
|
||||
elif effect == "reinforce_bridge":
|
||||
self.world.state["bridge_reinforced"] = True
|
||||
self.world.state["bridge_flooding"] = False
|
||||
elif effect == "water_garden":
|
||||
self.world.state["garden_drought"] = False
|
||||
self.world.rooms["Garden"]["growth"] = min(5, self.world.rooms["Garden"]["growth"] + 1)
|
||||
|
||||
scene["log"].append(f"You use the {item_name}. {effect_text}")
|
||||
scene["world_events"].append(effect_text)
|
||||
if item.get("consumable"):
|
||||
inventory.remove(item_name)
|
||||
|
||||
def run_tick(self, timmy_action="look"):
|
||||
"""Run one tick. Return the scene and available choices."""
|
||||
@@ -1093,27 +1229,13 @@ class GameEngine:
|
||||
}
|
||||
|
||||
# Process Timmy's action
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
timmy_energy = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
collapse_event = self.world.state.pop("energy_collapse_event", None)
|
||||
if collapse_event and collapse_event.get("character") == "Timmy":
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_room"] = room_name
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
|
||||
here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
|
||||
scene["here"] = here
|
||||
scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
|
||||
if collapse_event.get("from_room") != collapse_event.get("to_room"):
|
||||
scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
|
||||
return scene
|
||||
|
||||
# Energy constraint checks
|
||||
action_costs = {
|
||||
"move": 2, "tend_fire": 3, "write_rule": 2, "carve": 2,
|
||||
"plant": 2, "study": 2, "forge": 3, "help": 2, "speak": 1,
|
||||
"listen": 0, "rest": -2, "examine": 0, "give": 0, "take": 1,
|
||||
"listen": 0, "rest": -2, "examine": 0, "give": 0, "take": 1, "use": 1,
|
||||
}
|
||||
|
||||
# Extract action name
|
||||
@@ -1170,7 +1292,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -1278,7 +1400,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
|
||||
self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
|
||||
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 0
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -1315,7 +1437,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Forge":
|
||||
self.world.rooms["Forge"]["fire"] = "glowing"
|
||||
self.world.rooms["Forge"]["fire_tended"] += 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 2
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -1337,7 +1459,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -1356,7 +1478,7 @@ class GameEngine:
|
||||
new_carving = random.choice(carvings)
|
||||
if new_carving not in self.world.rooms["Bridge"]["carvings"]:
|
||||
self.world.rooms["Bridge"]["carvings"].append(new_carving)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -1365,7 +1487,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Garden":
|
||||
self.world.rooms["Garden"]["growth"] = min(5,
|
||||
self.world.rooms["Garden"]["growth"] + 1)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
|
||||
else:
|
||||
scene["log"].append("You are not in the Garden.")
|
||||
@@ -1373,9 +1495,17 @@ class GameEngine:
|
||||
elif timmy_action == "examine":
|
||||
room = self.world.characters["Timmy"]["room"]
|
||||
room_data = self.world.rooms[room]
|
||||
items = room_data.get("items", [])
|
||||
items = room_data.get("items", []) + room_data.get("discoverables", [])
|
||||
scene["log"].append(f"You examine The {room}. You see: {', '.join(items) if items else 'nothing special'}")
|
||||
|
||||
elif timmy_action.startswith("take:"):
|
||||
item_name = timmy_action.split(":", 1)[1]
|
||||
self._take_item(item_name, scene)
|
||||
|
||||
elif timmy_action.startswith("use:"):
|
||||
item_name = timmy_action.split(":", 1)[1]
|
||||
self._use_item(item_name, scene)
|
||||
|
||||
elif timmy_action.startswith("help:"):
|
||||
# Help increases trust
|
||||
target_name = timmy_action.split(":")[1]
|
||||
@@ -1384,7 +1514,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
|
||||
self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
|
||||
self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
else:
|
||||
@@ -1440,9 +1570,6 @@ class GameEngine:
|
||||
self.world.characters[char_name]["spoken"].append(line)
|
||||
scene["log"].append(f"{char_name} says: \"{line}\"")
|
||||
|
||||
scene["timmy_room"] = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
# Save the world
|
||||
self.world.save()
|
||||
|
||||
|
||||
@@ -203,25 +203,26 @@ class World:
|
||||
def update_world_state(self):
|
||||
"""World changes independent of character actions."""
|
||||
# Natural energy decay: the world is exhausting
|
||||
self.state.pop("energy_collapse_event", None)
|
||||
for char_name, char in self.characters.items():
|
||||
char["energy"] = max(0, char["energy"] - 0.3)
|
||||
# Check for energy collapse
|
||||
if char["energy"] <= 0:
|
||||
current = char.get("room", "Threshold")
|
||||
next_rooms = [room for room in self.rooms.keys() if room != current]
|
||||
new_room = random.choice(next_rooms) if next_rooms else current
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
char["room"] = new_room
|
||||
# Timmy collapse gets special narrative treatment
|
||||
if char.get("is_player", False):
|
||||
char["memories"].append("Collapsed from exhaustion.")
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
# Random room change (scattered)
|
||||
rooms = list(self.rooms.keys())
|
||||
current = char.get("room", "Threshold")
|
||||
new_room = current
|
||||
attempts = 0
|
||||
while new_room == current and attempts < 10:
|
||||
new_room = rooms[0] # Will change to random
|
||||
attempts += 1
|
||||
if new_room != current:
|
||||
char["room"] = new_room
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
self.state["forge_fire_dying"] = random.random() < 0.1
|
||||
|
||||
# Random weather events
|
||||
@@ -926,21 +927,7 @@ class GameEngine:
|
||||
}
|
||||
|
||||
# Process Timmy's action
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
timmy_energy = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
collapse_event = self.world.state.pop("energy_collapse_event", None)
|
||||
if collapse_event and collapse_event.get("character") == "Timmy":
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_room"] = room_name
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
|
||||
here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
|
||||
scene["here"] = here
|
||||
scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
|
||||
if collapse_event.get("from_room") != collapse_event.get("to_room"):
|
||||
scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
|
||||
return scene
|
||||
|
||||
# Energy constraint checks
|
||||
action_costs = {
|
||||
@@ -1003,7 +990,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -1105,7 +1092,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
|
||||
self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
|
||||
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 0
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -1142,7 +1129,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Forge":
|
||||
self.world.rooms["Forge"]["fire"] = "glowing"
|
||||
self.world.rooms["Forge"]["fire_tended"] += 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 2
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -1164,7 +1151,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -1183,7 +1170,7 @@ class GameEngine:
|
||||
new_carving = random.choice(carvings)
|
||||
if new_carving not in self.world.rooms["Bridge"]["carvings"]:
|
||||
self.world.rooms["Bridge"]["carvings"].append(new_carving)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -1192,7 +1179,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Garden":
|
||||
self.world.rooms["Garden"]["growth"] = min(5,
|
||||
self.world.rooms["Garden"]["growth"] + 1)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
|
||||
else:
|
||||
scene["log"].append("You are not in the Garden.")
|
||||
@@ -1211,7 +1198,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
|
||||
self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
|
||||
self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
else:
|
||||
@@ -1255,9 +1242,6 @@ class GameEngine:
|
||||
self.world.characters[char_name]["spoken"].append(line)
|
||||
scene["log"].append(f'{char_name} says: "{line}"')
|
||||
|
||||
scene["timmy_room"] = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
# Save the world
|
||||
self.world.save()
|
||||
|
||||
|
||||
@@ -1,127 +0,0 @@
|
||||
from importlib.util import module_from_spec, spec_from_file_location
|
||||
from pathlib import Path
|
||||
import random as std_random
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
GAME_PATH = ROOT / "evennia" / "timmy_world" / "game.py"
|
||||
|
||||
|
||||
def load_game_module(tmp_path: Path):
|
||||
spec = spec_from_file_location("evennia_local_world_game_energy", GAME_PATH)
|
||||
module = module_from_spec(spec)
|
||||
assert spec.loader is not None
|
||||
spec.loader.exec_module(module)
|
||||
module.random.seed(0)
|
||||
module.WORLD_DIR = tmp_path
|
||||
module.STATE_FILE = tmp_path / "game_state.json"
|
||||
module.TIMMY_LOG = tmp_path / "timmy_log.md"
|
||||
module.WORLD_DIR.mkdir(parents=True, exist_ok=True)
|
||||
return module
|
||||
|
||||
|
||||
def make_engine(tmp_path: Path):
|
||||
module = load_game_module(tmp_path)
|
||||
engine = module.GameEngine()
|
||||
engine.start_new_game()
|
||||
return module, engine
|
||||
|
||||
|
||||
def choose_action(module, engine):
|
||||
energy = engine.world.characters["Timmy"]["energy"]
|
||||
room = engine.world.characters["Timmy"]["room"]
|
||||
actions = module.PlayerInterface(engine).get_available_actions()
|
||||
|
||||
if energy <= 1 and "rest" in actions:
|
||||
return "rest"
|
||||
if room == "Garden" and "speak:Marcus" in actions and energy <= 4.3:
|
||||
return "speak:Marcus"
|
||||
if room == "Forge" and "tend_fire" in actions:
|
||||
return "tend_fire"
|
||||
if room == "Tower" and "write_rule" in actions:
|
||||
return "write_rule"
|
||||
if room == "Bridge" and "carve" in actions:
|
||||
return "carve"
|
||||
if room == "Garden" and "plant" in actions:
|
||||
return "plant"
|
||||
|
||||
moves = [action.split(" ->")[0] for action in actions if action.startswith("move:")]
|
||||
if moves:
|
||||
return moves[0]
|
||||
if "look" in actions:
|
||||
return "look"
|
||||
return actions[0]
|
||||
|
||||
|
||||
class TestTowerGameEnergyConstraints:
|
||||
def test_low_energy_blocks_costly_action_without_crashing(self, tmp_path):
|
||||
module, engine = make_engine(tmp_path)
|
||||
engine.world.characters["Timmy"]["energy"] = 1
|
||||
|
||||
result = engine.run_tick("move:north")
|
||||
|
||||
assert any("too exhausted" in line for line in result["log"])
|
||||
assert engine.world.characters["Timmy"]["room"] == "Threshold"
|
||||
assert engine.world.characters["Timmy"]["energy"] == pytest.approx(0.7)
|
||||
|
||||
def test_tired_move_uses_extra_effort_and_drains_energy(self, tmp_path):
|
||||
module, engine = make_engine(tmp_path)
|
||||
engine.world.characters["Timmy"]["energy"] = 3.3
|
||||
|
||||
result = engine.run_tick("move:north")
|
||||
|
||||
assert any("more effort than usual" in line for line in result["log"])
|
||||
assert engine.world.characters["Timmy"]["room"] == "Tower"
|
||||
assert engine.world.characters["Timmy"]["energy"] == pytest.approx(0.0)
|
||||
assert result["timmy_energy"] == pytest.approx(0.0)
|
||||
|
||||
def test_rest_is_meaningful_choice_with_room_specific_recovery(self, tmp_path):
|
||||
module, garden_engine = make_engine(tmp_path / "garden")
|
||||
garden_engine.world.characters["Timmy"]["room"] = "Garden"
|
||||
garden_engine.world.characters["Timmy"]["energy"] = 1.0
|
||||
garden_result = garden_engine.run_tick("rest")
|
||||
|
||||
module, bridge_engine = make_engine(tmp_path / "bridge")
|
||||
bridge_engine.world.characters["Timmy"]["room"] = "Bridge"
|
||||
bridge_engine.world.characters["Timmy"]["energy"] = 1.0
|
||||
bridge_result = bridge_engine.run_tick("rest")
|
||||
|
||||
assert any("stone bench" in line for line in garden_result["log"])
|
||||
assert any("no place to rest" in line.lower() for line in bridge_result["log"])
|
||||
assert garden_engine.world.characters["Timmy"]["energy"] > bridge_engine.world.characters["Timmy"]["energy"]
|
||||
|
||||
def test_marcus_can_provide_energy_relief_when_timmy_is_tired(self, tmp_path):
|
||||
module, engine = make_engine(tmp_path)
|
||||
engine.world.characters["Timmy"]["room"] = "Garden"
|
||||
engine.world.characters["Timmy"]["energy"] = 4.3
|
||||
|
||||
result = engine.run_tick("speak:Marcus")
|
||||
|
||||
assert any("Marcus offers you food" in line for line in result["log"])
|
||||
assert engine.world.characters["Timmy"]["energy"] == pytest.approx(5.0)
|
||||
assert result["timmy_energy"] == pytest.approx(5.0)
|
||||
|
||||
def test_energy_collapse_moves_timmy_and_records_memory(self, tmp_path, monkeypatch):
|
||||
module, engine = make_engine(tmp_path)
|
||||
engine.world.characters["Timmy"]["energy"] = 0
|
||||
engine.world.characters["Timmy"]["room"] = "Threshold"
|
||||
monkeypatch.setattr(std_random, "choice", lambda seq: "Tower")
|
||||
|
||||
result = engine.run_tick("look")
|
||||
|
||||
assert any("collapse from exhaustion" in line.lower() for line in result["log"])
|
||||
assert engine.world.characters["Timmy"]["room"] == "Tower"
|
||||
assert engine.world.characters["Timmy"]["energy"] == 2
|
||||
assert "Collapsed from exhaustion." in engine.world.characters["Timmy"]["memories"]
|
||||
|
||||
def test_intentional_play_reaches_low_energy_within_100_ticks(self, tmp_path):
|
||||
module, engine = make_engine(tmp_path)
|
||||
min_energy = engine.world.characters["Timmy"]["energy"]
|
||||
|
||||
for _ in range(100):
|
||||
action = choose_action(module, engine)
|
||||
engine.run_tick(action)
|
||||
min_energy = min(min_energy, engine.world.characters["Timmy"]["energy"])
|
||||
|
||||
assert min_energy <= 3
|
||||
58
tests/test_tower_game_items.py
Normal file
58
tests/test_tower_game_items.py
Normal file
@@ -0,0 +1,58 @@
|
||||
from importlib.util import module_from_spec, spec_from_file_location
|
||||
from pathlib import Path
|
||||
import unittest
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
GAME_PATH = ROOT / "evennia" / "timmy_world" / "game.py"
|
||||
|
||||
|
||||
def load_game_module():
|
||||
spec = spec_from_file_location("tower_game_items", GAME_PATH)
|
||||
module = module_from_spec(spec)
|
||||
assert spec.loader is not None
|
||||
spec.loader.exec_module(module)
|
||||
module.random.seed(0)
|
||||
return module
|
||||
|
||||
|
||||
class TestTowerGameWorldItems(unittest.TestCase):
|
||||
def test_world_has_ten_unique_items_and_a_quest_item(self):
|
||||
module = load_game_module()
|
||||
world = module.World()
|
||||
|
||||
room_items = {
|
||||
item
|
||||
for room in world.rooms.values()
|
||||
for item in room.get("discoverables", [])
|
||||
}
|
||||
|
||||
self.assertGreaterEqual(len(room_items), 10)
|
||||
self.assertIn("foraged key", room_items)
|
||||
self.assertTrue(module.WORLD_ITEMS["foraged key"]["quest_item"])
|
||||
|
||||
def test_items_change_world_state_when_used(self):
|
||||
module = load_game_module()
|
||||
engine = module.GameEngine()
|
||||
engine.start_new_game()
|
||||
engine.world.characters["Timmy"]["energy"] = 10
|
||||
engine.world.characters["Timmy"]["room"] = "Garden"
|
||||
|
||||
initial_growth = engine.world.rooms["Garden"]["growth"]
|
||||
engine.run_tick("take:seed packet")
|
||||
use_seed = engine.run_tick("use:seed packet")
|
||||
|
||||
self.assertGreater(engine.world.rooms["Garden"]["growth"], initial_growth)
|
||||
self.assertNotIn("seed packet", engine.world.characters["Timmy"]["inventory"])
|
||||
self.assertTrue(any("garden" in line.lower() for line in use_seed["world_events"] + use_seed["log"]))
|
||||
|
||||
engine.world.characters["Timmy"]["energy"] = 10
|
||||
engine.run_tick("take:foraged key")
|
||||
use_key = engine.run_tick("use:foraged key")
|
||||
|
||||
self.assertTrue(engine.world.state["tower_cache_unlocked"])
|
||||
self.assertTrue(any("cache" in line.lower() or "quest" in line.lower() for line in use_key["world_events"] + use_key["log"]))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -203,25 +203,26 @@ class World:
|
||||
def update_world_state(self):
|
||||
"""World changes independent of character actions."""
|
||||
# Natural energy decay: the world is exhausting
|
||||
self.state.pop("energy_collapse_event", None)
|
||||
for char_name, char in self.characters.items():
|
||||
char["energy"] = max(0, char["energy"] - 0.3)
|
||||
# Check for energy collapse
|
||||
if char["energy"] <= 0:
|
||||
current = char.get("room", "Threshold")
|
||||
next_rooms = [room for room in self.rooms.keys() if room != current]
|
||||
new_room = random.choice(next_rooms) if next_rooms else current
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
char["room"] = new_room
|
||||
# Timmy collapse gets special narrative treatment
|
||||
if char.get("is_player", False):
|
||||
char["memories"].append("Collapsed from exhaustion.")
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
char["energy"] = 2 # Wake up with some energy
|
||||
# Random room change (scattered)
|
||||
rooms = list(self.rooms.keys())
|
||||
current = char.get("room", "Threshold")
|
||||
new_room = current
|
||||
attempts = 0
|
||||
while new_room == current and attempts < 10:
|
||||
new_room = rooms[0] # Will change to random
|
||||
attempts += 1
|
||||
if new_room != current:
|
||||
char["room"] = new_room
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
self.state["forge_fire_dying"] = random.random() < 0.1
|
||||
|
||||
# Random weather events
|
||||
@@ -670,21 +671,7 @@ class GameEngine:
|
||||
}
|
||||
|
||||
# Process Timmy's action
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
timmy_energy = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
collapse_event = self.world.state.pop("energy_collapse_event", None)
|
||||
if collapse_event and collapse_event.get("character") == "Timmy":
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_room"] = room_name
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
scene["room_desc"] = self.world.get_room_desc(room_name, "Timmy")
|
||||
here = [n for n in self.world.characters if self.world.characters[n]["room"] == room_name and n != "Timmy"]
|
||||
scene["here"] = here
|
||||
scene["log"].append("You collapse from exhaustion. The world spins. You wake somewhere else.")
|
||||
if collapse_event.get("from_room") != collapse_event.get("to_room"):
|
||||
scene["log"].append(f"You are in The {collapse_event['to_room']}, disoriented.")
|
||||
return scene
|
||||
|
||||
# Energy constraint checks
|
||||
action_costs = {
|
||||
@@ -747,7 +734,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -861,7 +848,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"]["Kimi"] = min(1.0,
|
||||
self.world.characters["Timmy"]["trust"].get("Kimi", 0) + 0.1)
|
||||
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 0
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -898,7 +885,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Forge":
|
||||
self.world.rooms["Forge"]["fire"] = "glowing"
|
||||
self.world.rooms["Forge"]["fire_tended"] += 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 2
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -927,7 +914,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -953,7 +940,7 @@ class GameEngine:
|
||||
new_carving = random.choice(carvings)
|
||||
if new_carving not in self.world.rooms["Bridge"]["carvings"]:
|
||||
self.world.rooms["Bridge"]["carvings"].append(new_carving)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -962,7 +949,7 @@ class GameEngine:
|
||||
if self.world.characters["Timmy"]["room"] == "Garden":
|
||||
self.world.rooms["Garden"]["growth"] = min(5,
|
||||
self.world.rooms["Garden"]["growth"] + 1)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append("You plant something in the dark soil. The earth takes it without question.")
|
||||
else:
|
||||
scene["log"].append("You are not in the Garden.")
|
||||
@@ -988,7 +975,7 @@ class GameEngine:
|
||||
self.world.characters["Timmy"]["trust"].get(target_name, 0) + 0.2)
|
||||
self.world.characters[target_name]["trust"]["Timmy"] = min(1.0,
|
||||
self.world.characters[target_name]["trust"].get("Timmy", 0) + 0.2)
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
elif timmy_action.startswith("confront:"):
|
||||
@@ -1089,9 +1076,6 @@ class GameEngine:
|
||||
self.world.characters[char_name]["spoken"].append(line)
|
||||
scene["log"].append(f"{char_name} says: \"{line}\"")
|
||||
|
||||
scene["timmy_room"] = self.world.characters["Timmy"]["room"]
|
||||
scene["timmy_energy"] = self.world.characters["Timmy"]["energy"]
|
||||
|
||||
# Save the world
|
||||
self.world.save()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user