Compare commits
1 Commits
fix/536
...
step35/446
| Author | SHA1 | Date | |
|---|---|---|---|
|
548bb96411 |
@@ -1,75 +0,0 @@
|
||||
# Issue #536 Verification
|
||||
|
||||
Status: already implemented on `main`
|
||||
|
||||
## Acceptance criteria check
|
||||
|
||||
1. 9 rooms with descriptions and exits
|
||||
- Verified in `evennia_tools/bezalel_layout.py`:
|
||||
- `ROOMS` defines exactly 9 themed rooms
|
||||
- `EXITS` defines the room graph including Limbo, Gatehouse, Great Hall, The Library of Bezalel, The Observatory, The Workshop, The Server Room, The Garden of Code, and The Portal Room
|
||||
- Verified by `tests/test_bezalel_evennia_layout.py::test_room_graph_matches_issue_shape`
|
||||
- Verified by `python3 scripts/evennia/build_bezalel_world.py --plan`
|
||||
|
||||
2. 4 characters with descriptions
|
||||
- Verified in `evennia_tools/bezalel_layout.py`:
|
||||
- `CHARACTERS` contains Timmy, Bezalel, Marcus, and Kimi with starting rooms and narrative descriptions
|
||||
- Verified by `tests/test_bezalel_evennia_layout.py::test_items_characters_and_portal_commands_are_all_defined`
|
||||
|
||||
3. Each room has appropriate items
|
||||
- Verified in `evennia_tools/bezalel_layout.py`:
|
||||
- `OBJECTS` contains 14 themed objects including Threshold Ledger, Bridge Schematics, Tri-Axis Telescope, Forge Anvil, Bridge Workbench, Heartbeat Console, Server Racks, Code Orchard, and portal markers
|
||||
- The object count exceeds the issue minimum and covers the named room themes
|
||||
|
||||
4. Portal Room has working travel commands to other worlds
|
||||
- Verified in `evennia_tools/bezalel_layout.py`:
|
||||
- `PORTAL_COMMANDS` defines the portal commands `mac`, `vps`, and `net`
|
||||
- each travel command resolves to a real exit surface now and preserves target metadata
|
||||
- current fallback room is `Limbo`, which keeps the command surface truthful until cross-world transport is wired live
|
||||
- Verified by `tests/test_bezalel_evennia_layout.py::test_items_characters_and_portal_commands_are_all_defined`
|
||||
|
||||
5. World persists across Evennia restarts
|
||||
- Verified by builder design in `scripts/evennia/build_bezalel_world.py`
|
||||
- The builder is idempotent: it creates or updates existing rooms, exits, objects, and account-backed characters rather than duplicating them
|
||||
- `docs/BEZALEL_EVENNIA_WORLD.md` explicitly documents this persistence note
|
||||
|
||||
6. Timmy character can move between rooms
|
||||
- Verified by reachability test:
|
||||
- `tests/test_bezalel_evennia_layout.py::test_timmy_can_reach_every_room_from_gatehouse`
|
||||
- `reachable_rooms_from("Gatehouse") == set(room_keys())` proves the full graph is traversable from Timmy’s starting region
|
||||
|
||||
## Evidence on main
|
||||
|
||||
Repo-side artifacts already present on `main`:
|
||||
- `evennia_tools/bezalel_layout.py`
|
||||
- `scripts/evennia/build_bezalel_world.py`
|
||||
- `evennia_tools/build_bezalel_world.py`
|
||||
- `evennia_tools/batch_cmds_bezalel.ev`
|
||||
- `docs/BEZALEL_EVENNIA_WORLD.md`
|
||||
- `tests/test_bezalel_evennia_layout.py`
|
||||
|
||||
## Verification commands run
|
||||
|
||||
```bash
|
||||
python3 -m pytest -q tests/test_bezalel_evennia_layout.py
|
||||
python3 -m py_compile evennia_tools/bezalel_layout.py scripts/evennia/build_bezalel_world.py tests/test_bezalel_evennia_layout.py
|
||||
python3 scripts/evennia/build_bezalel_world.py --plan
|
||||
```
|
||||
|
||||
Observed results:
|
||||
- `5 passed`
|
||||
- build plan reported:
|
||||
- `room_count: 9`
|
||||
- `character_count: 4`
|
||||
- `portal_command_count: 3`
|
||||
- Bezalel starts in `The Workshop`
|
||||
|
||||
## Prior PR trail
|
||||
|
||||
Closed unmerged prior work exists, but the underlying scaffold is already present on `main` today:
|
||||
- PR #723 — `feat: add Bezalel Evennia world scaffold` (`fix/536`)
|
||||
- PR #774 — `feat: Bezalel Evennia world builder - rooms, exits, objects (#536)` (`fix/536-bezalel-evennia-world`)
|
||||
|
||||
## Recommendation
|
||||
|
||||
Close issue #536 as already implemented on `main`.
|
||||
@@ -323,6 +323,111 @@ class World:
|
||||
return False
|
||||
|
||||
|
||||
# ============================================================
|
||||
# PERSONALITY-DRIVEN DECISION ENGINE
|
||||
# ============================================================
|
||||
# Replaces fixed rotation with weighted choice.
|
||||
# Each character has:
|
||||
# - home_room: preferred location
|
||||
# - room_weights: base probabilities for each room
|
||||
# - explore_chance: probability to explore randomly (10%)
|
||||
# - social_weight: bonus when others are present
|
||||
# - goal_weights: adjustments based on active_goal
|
||||
PERSONALITY_DICT = {
|
||||
"Marcus": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.4, "Bridge": 0.2, "Threshold": 0.2, "Tower": 0.1, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.3,
|
||||
"goal_weights": {
|
||||
"sit": {"Garden": +0.3},
|
||||
"speak_truth": {"Tower": +0.2, "Bridge": +0.2},
|
||||
"remember": {"Garden": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Bezalel": {
|
||||
"home_room": "Forge",
|
||||
"room_weights": {"Forge": 0.5, "Threshold": 0.2, "Garden": 0.1, "Bridge": 0.1, "Tower": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.15,
|
||||
"goal_weights": {
|
||||
"forge": {"Forge": +0.4},
|
||||
"tend_fire": {"Forge": +0.5},
|
||||
"create_key": {"Forge": +0.3},
|
||||
},
|
||||
},
|
||||
"Allegro": {
|
||||
"home_room": "Threshold",
|
||||
"room_weights": {"Threshold": 0.35, "Tower": 0.25, "Forge": 0.15, "Garden": 0.15, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.25,
|
||||
"goal_weights": {
|
||||
"oversee": {"Threshold": +0.3},
|
||||
"keep_time": {"Tower": +0.3},
|
||||
"check_tunnel": {"Bridge": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Ezra": {
|
||||
"home_room": "Tower",
|
||||
"room_weights": {"Tower": 0.45, "Threshold": 0.2, "Garden": 0.15, "Forge": 0.1, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.15,
|
||||
"goal_weights": {
|
||||
"study": {"Tower": +0.4},
|
||||
"read_whiteboard": {"Tower": +0.4},
|
||||
"find_pattern": {"Garden": +0.2, "Bridge": +0.1},
|
||||
},
|
||||
},
|
||||
"Gemini": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.45, "Threshold": 0.2, "Bridge": 0.15, "Tower": 0.1, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.25,
|
||||
"goal_weights": {
|
||||
"observe": {"Garden": +0.2, "Tower": +0.2},
|
||||
"tend_garden": {"Garden": +0.5},
|
||||
"listen": {"Bridge": +0.1, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
"Claude": {
|
||||
"home_room": "Threshold",
|
||||
"room_weights": {"Threshold": 0.3, "Tower": 0.25, "Forge": 0.2, "Garden": 0.15, "Bridge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.2,
|
||||
"goal_weights": {
|
||||
"inspect": {"Threshold": +0.2, "Tower": +0.2},
|
||||
"organize": {"Tower": +0.2, "Forge": +0.1},
|
||||
"enforce_order": {"Threshold": +0.3, "Bridge": +0.1},
|
||||
},
|
||||
},
|
||||
"ClawCode": {
|
||||
"home_room": "Forge",
|
||||
"room_weights": {"Forge": 0.5, "Threshold": 0.2, "Garden": 0.1, "Bridge": 0.1, "Tower": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.1,
|
||||
"goal_weights": {
|
||||
"forge": {"Forge": +0.4},
|
||||
"test_edge": {"Forge": +0.4},
|
||||
"build_weapon": {"Forge": +0.5},
|
||||
},
|
||||
},
|
||||
"Kimi": {
|
||||
"home_room": "Garden",
|
||||
"room_weights": {"Garden": 0.4, "Threshold": 0.2, "Tower": 0.15, "Bridge": 0.15, "Forge": 0.1},
|
||||
"explore_chance": 0.1,
|
||||
"social_weight": 0.2,
|
||||
"goal_weights": {
|
||||
"contemplate": {"Garden": +0.3, "Tower": +0.1},
|
||||
"read": {"Tower": +0.3},
|
||||
"remember": {"Bridge": +0.2, "Threshold": +0.1},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
# All available rooms
|
||||
ALL_ROOMS = ["Threshold", "Tower", "Forge", "Garden", "Bridge"]
|
||||
|
||||
|
||||
class ActionSystem:
|
||||
"""Defines what actions are possible and what they cost."""
|
||||
|
||||
@@ -453,100 +558,167 @@ class TimmyAI:
|
||||
|
||||
|
||||
class NPCAI:
|
||||
"""AI for non-player characters. They make choices based on goals."""
|
||||
"""AI for non-player characters. Weighted decision engine — agents choose, do not rotate."""
|
||||
|
||||
def __init__(self, world):
|
||||
self.world = world
|
||||
self._last_reasoning = {} # Store reasoning per char for tick logging
|
||||
|
||||
def get_reasoning(self, char_name):
|
||||
"""Return reasoning dict for last decision."""
|
||||
return self._last_reasoning.get(char_name, {})
|
||||
|
||||
def make_choice(self, char_name):
|
||||
"""Make a choice for this NPC this tick."""
|
||||
"""Make a weighted choice for this NPC. Returns (action, reasoning_dict)."""
|
||||
char = self.world.characters[char_name]
|
||||
room = char["room"]
|
||||
available = ActionSystem.get_available_actions(char_name, self.world)
|
||||
|
||||
# If low energy, rest
|
||||
if char["energy"] <= 1:
|
||||
return "rest"
|
||||
|
||||
# Goal-driven behavior
|
||||
goal = char["active_goal"]
|
||||
|
||||
if char_name == "Marcus":
|
||||
return self._marcus_choice(char, room, available)
|
||||
elif char_name == "Bezalel":
|
||||
return self._bezalel_choice(char, room, available)
|
||||
elif char_name == "Allegro":
|
||||
return self._allegro_choice(char, room, available)
|
||||
elif char_name == "Ezra":
|
||||
return self._ezra_choice(char, room, available)
|
||||
elif char_name == "Gemini":
|
||||
return self._gemini_choice(char, room, available)
|
||||
elif char_name == "Claude":
|
||||
return self._claude_choice(char, room, available)
|
||||
elif char_name == "ClawCode":
|
||||
return self._clawcode_choice(char, room, available)
|
||||
elif char_name == "Kimi":
|
||||
return self._kimi_choice(char, room, available)
|
||||
|
||||
return "rest"
|
||||
|
||||
def _marcus_choice(self, char, room, available):
|
||||
if room == "Garden" and random.random() < 0.7:
|
||||
# Low energy → immediate rest
|
||||
if char["energy"] <= 1:
|
||||
self._last_reasoning[char_name] = {"trigger": "low_energy", "reason": "Energy ≤ 1, resting"}
|
||||
return "rest"
|
||||
if room != "Garden":
|
||||
return "move:west"
|
||||
# Speak to someone if possible
|
||||
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
|
||||
if others and random.random() < 0.4:
|
||||
return f"speak:{random.choice(others)}"
|
||||
return "rest"
|
||||
|
||||
# Find personality profile
|
||||
personality = PERSONALITY_DICT.get(char_name)
|
||||
if not personality:
|
||||
# Fallback: move toward home room if not there
|
||||
if room != char.get("home", "Tower"):
|
||||
action = f"move:{self._direction_to_home(room, char.get('home', 'Tower'))}"
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback_no_personality", "action": action}
|
||||
return action
|
||||
action = random.choice(["rest", "examine"])
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback_no_personality", "action": action}
|
||||
return action
|
||||
|
||||
# Build weighted action list
|
||||
weights = self._compute_weights(char_name, char, room, available, personality, goal)
|
||||
|
||||
if not weights:
|
||||
action = "rest"
|
||||
self._last_reasoning[char_name] = {"trigger": "fallback", "reason": "No weighted actions available"}
|
||||
return action
|
||||
|
||||
# Sample action
|
||||
actions, probs = zip(*weights)
|
||||
action = random.choices(actions, weights=probs)[0]
|
||||
|
||||
# Store reasoning
|
||||
reasoning = self._build_reasoning(char_name, char, room, weights, action, personality, goal)
|
||||
self._last_reasoning[char_name] = reasoning
|
||||
return action
|
||||
|
||||
def _bezalel_choice(self, char, room, available):
|
||||
if room == "Forge" and self.world.rooms["Forge"]["fire"] == "glowing":
|
||||
return random.choice(["forge", "rest"] if char["energy"] > 2 else ["rest"])
|
||||
if room != "Forge":
|
||||
return "move:west"
|
||||
if random.random() < 0.3:
|
||||
return "tend_fire"
|
||||
return "forge"
|
||||
def _direction_to_home(self, current_room, home_room):
|
||||
"""Return direction name to get from current to home (simple adjacency)."""
|
||||
# For now: use known map directions (fragile but minimal)
|
||||
# Better: derive from world.rooms connections by searching
|
||||
connections = self.world.rooms[current_room].get("connections", {})
|
||||
for direction, dest in connections.items():
|
||||
if dest == home_room:
|
||||
return direction
|
||||
# Fallback: pick a random connected room to explore toward home
|
||||
if connections:
|
||||
return random.choice(list(connections.keys()))
|
||||
return "north" # should not happen
|
||||
|
||||
def _kimi_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
|
||||
if room == "Garden" and others and random.random() < 0.3:
|
||||
return f"speak:{random.choice(others)}"
|
||||
if room == "Tower":
|
||||
return "study" if char["energy"] > 2 else "rest"
|
||||
return "move:east" # Head back toward Garden
|
||||
def _compute_weights(self, char_name, char, room, available, personality, goal):
|
||||
"""Compute weighted list of (action, prob) tuples."""
|
||||
weights = []
|
||||
room_weights = personality["room_weights"]
|
||||
social_weight = personality["social_weight"]
|
||||
goal_bonus = personality["goal_weights"].get(goal, {})
|
||||
|
||||
# Count others in the room
|
||||
others_in_room = [n for n in self.world.characters
|
||||
if self.world.characters[n]["room"] == room and n != char_name]
|
||||
social_present = len(others_in_room) > 0
|
||||
|
||||
for action in available:
|
||||
base_w = 0.05 # small floor for every action
|
||||
|
||||
# Movement-specific
|
||||
if action.startswith("move:"):
|
||||
direction = action.split(":")[1]
|
||||
dest = action.split(" -> ")[1] if " -> " in action else None
|
||||
if dest:
|
||||
# Room probability
|
||||
base_w += room_weights.get(dest, 0.05)
|
||||
# Home room bonus
|
||||
if dest == personality["home_room"]:
|
||||
base_w += 0.2
|
||||
# Social bonus
|
||||
if social_present:
|
||||
base_w += social_weight
|
||||
# Goal bonus
|
||||
if dest in goal_bonus:
|
||||
base_w += goal_bonus[dest]
|
||||
# Exploration penalty for home room (sometimes leave)
|
||||
if dest == personality["home_room"]:
|
||||
base_w *= (1 - personality.get("explore_chance", 0.1))
|
||||
|
||||
# Social actions
|
||||
elif action.startswith("speak:") or action.startswith("listen:") or action.startswith("help:"):
|
||||
person = action.split(":")[1]
|
||||
base_w += 0.2 # base social interest
|
||||
# Goal bonus
|
||||
base_w += goal_bonus.get(person, 0)
|
||||
# Other in same room bonus
|
||||
if any(n == person for n in others_in_room):
|
||||
base_w += 0.3
|
||||
# Social weight
|
||||
base_w += social_weight * 0.5
|
||||
|
||||
elif action.startswith("confront:"):
|
||||
person = action.split(":")[1]
|
||||
base_w += 0.1 # lower baseline
|
||||
if any(n == person for n in others_in_room):
|
||||
base_w += 0.2
|
||||
|
||||
# Room-specific craft/production actions
|
||||
elif action in ["forge", "tend_fire", "study", "write_rule", "carve", "plant"]:
|
||||
# These are location-bound; should only be available in correct room
|
||||
if (action == "forge" and room != "Forge") or (action == "tend_fire" and room != "Forge") or (action == "study" and room != "Tower") or (action == "write_rule" and room != "Tower") or (action == "carve" and room != "Bridge") or (action == "plant" and room != "Garden"):
|
||||
continue # skip (shouldn't be available but guard)
|
||||
base_w += room_weights.get(room, 0.1) * 1.5 # being in the right room = high weight
|
||||
# Goal bonus
|
||||
if action in goal_bonus:
|
||||
base_w += goal_bonus[action]
|
||||
|
||||
# Rest
|
||||
elif action == "rest":
|
||||
base_w += char["energy"] * 0.1 # higher energy → less rest
|
||||
if char["energy"] < 3:
|
||||
base_w += 0.4
|
||||
else:
|
||||
base_w += 0.05
|
||||
|
||||
# Examine
|
||||
elif action == "examine":
|
||||
base_w += 0.1
|
||||
|
||||
weights.append((action, base_w))
|
||||
|
||||
# Normalize probabilities to sum to 1
|
||||
if not weights:
|
||||
return []
|
||||
total = sum(w for _, w in weights)
|
||||
normalized = [(a, w/total) for a, w in weights]
|
||||
return normalized
|
||||
|
||||
def _gemini_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("listen:")]
|
||||
if room == "Garden" and others and random.random() < 0.4:
|
||||
return f"listen:{random.choice(others)}"
|
||||
return random.choice(["plant", "rest"] if room == "Garden" else ["move:west"])
|
||||
|
||||
def _ezra_choice(self, char, room, available):
|
||||
if room == "Tower" and char["energy"] > 2:
|
||||
return random.choice(["study", "write_rule", "help:Timmy"])
|
||||
if room != "Tower":
|
||||
return "move:south"
|
||||
return "rest"
|
||||
|
||||
def _claude_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("confront:")]
|
||||
if others and random.random() < 0.2:
|
||||
return f"confront:{random.choice(others)}"
|
||||
return random.choice(["examine", "rest"])
|
||||
|
||||
def _clawcode_choice(self, char, room, available):
|
||||
if room == "Forge" and char["energy"] > 2:
|
||||
return "forge"
|
||||
return random.choice(["move:east", "forge", "rest"])
|
||||
|
||||
def _allegro_choice(self, char, room, available):
|
||||
others = [a.split(":")[1] for a in available if a.startswith("speak:")]
|
||||
if others and random.random() < 0.3:
|
||||
return f"speak:{random.choice(others)}"
|
||||
return random.choice(["move:north", "move:south", "examine"])
|
||||
def _build_reasoning(self, char_name, char, room, weights, action, personality, goal):
|
||||
"""Build reasoning dict explaining the decision."""
|
||||
# Find top contenders
|
||||
sorted_w = sorted(weights, key=lambda x: x[1], reverse=True)
|
||||
reasoning = {
|
||||
"char": char_name,
|
||||
"room": room,
|
||||
"goal": goal,
|
||||
"energy": char["energy"],
|
||||
"chosen": action,
|
||||
"top_contenders": sorted_w[:3],
|
||||
}
|
||||
return reasoning
|
||||
|
||||
|
||||
class DialogueSystem:
|
||||
@@ -1224,7 +1396,16 @@ class GameEngine:
|
||||
self.world.characters[char_name]["room"] = dest
|
||||
self.world.characters[char_name]["energy"] -= 1
|
||||
scene["npc_actions"].append(f"{char_name} moves from The {old_room} to The {dest}")
|
||||
|
||||
|
||||
# Collect NPC reasoning for debugging (Decision Engine trace)
|
||||
scene["npc_reasoning"] = {}
|
||||
for npc_name in self.world.characters:
|
||||
if npc_name == "Timmy":
|
||||
continue
|
||||
reasoning = self.npc_ai.get_reasoning(npc_name)
|
||||
if reasoning:
|
||||
scene["npc_reasoning"][npc_name] = reasoning
|
||||
|
||||
# Random NPC events
|
||||
room_name = self.world.characters["Timmy"]["room"]
|
||||
for char_name in self.world.characters:
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
DOC = ROOT / "docs" / "issue-536-verification.md"
|
||||
|
||||
|
||||
def test_issue_536_verification_doc_exists_and_points_to_real_artifacts() -> None:
|
||||
assert DOC.exists(), "missing docs/issue-536-verification.md"
|
||||
text = DOC.read_text(encoding="utf-8")
|
||||
for snippet in (
|
||||
"# Issue #536 Verification",
|
||||
"evennia_tools/bezalel_layout.py",
|
||||
"scripts/evennia/build_bezalel_world.py",
|
||||
"tests/test_bezalel_evennia_layout.py",
|
||||
"docs/BEZALEL_EVENNIA_WORLD.md",
|
||||
"portal commands",
|
||||
"already implemented on `main`",
|
||||
):
|
||||
assert snippet in text
|
||||
Reference in New Issue
Block a user