Compare commits
1 Commits
fix/528-v2
...
fix/511
| Author | SHA1 | Date | |
|---|---|---|---|
|
e00153826b |
@@ -1,281 +0,0 @@
|
||||
# LAB-003: Truck Battery Disconnect Switch Installation
|
||||
|
||||
**Issue:** [timmy-home#528](https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528)
|
||||
**Objective:** Eliminate parasitic battery drain via proper disconnect switch installation
|
||||
**Status:** Planning Complete — Ready for Execution
|
||||
|
||||
---
|
||||
|
||||
## Problem Statement
|
||||
|
||||
Parasitic battery drain is killing the truck battery when parked. This is critical for operational mobility in a rural location where the truck is essential for:
|
||||
- Supply runs to Newport/Claremont
|
||||
- Emergency egress
|
||||
- Equipment transport
|
||||
|
||||
The battery has likely been damaged from repeated deep discharges and may need replacement.
|
||||
|
||||
---
|
||||
|
||||
## Pre-Installation Checklist
|
||||
|
||||
### Diagnostic Steps (Do These First)
|
||||
|
||||
1. **Verify parasitic drain with multimeter:**
|
||||
- Set multimeter to DC Amps (10A scale)
|
||||
- Disconnect negative battery terminal
|
||||
- Connect multimeter in series between battery negative and cable
|
||||
- Normal drain: <50mA (0.05A)
|
||||
- Problem drain: >100mA (0.1A)
|
||||
- Record reading: __________ mA
|
||||
|
||||
2. **Identify the culprit (if drain is high):**
|
||||
- While monitoring current, pull fuses one at a time
|
||||
- When current drops, you've found the circuit
|
||||
- Common culprits: aftermarket radio, alarm system, interior lights, OBD-II tracker
|
||||
|
||||
3. **Test battery health:**
|
||||
- With engine off, battery voltage should be ~12.6V
|
||||
- With engine running, alternator should show ~13.7-14.7V
|
||||
- If voltage <12.4V when "fully charged," battery is degraded
|
||||
|
||||
---
|
||||
|
||||
## Shopping List
|
||||
|
||||
### Required Items
|
||||
|
||||
| Item | Purpose | Est. Cost | Stores |
|
||||
|------|---------|-----------|--------|
|
||||
| Battery disconnect switch (side-post or top-post) | Isolate battery when parked | $8-15 | AutoZone, Advance, O'Reilly, NAPA |
|
||||
| Terminal shim/post riser (if needed) | Ensure proper terminal clearance | $3-8 | Same as above |
|
||||
| Dielectric grease | Prevent corrosion on terminals | $3-5 | Same as above |
|
||||
| Battery terminal cleaner brush | Clean posts before install | $2-4 | Same as above |
|
||||
| **Total Estimated** | | **$15-30** | |
|
||||
|
||||
### Product Recommendations
|
||||
|
||||
#### Option 1: Top Terminal Post Mount (Most Common)
|
||||
- **Recommended:** Battery Doctor Knife Switch #20138 (Advance Auto)
|
||||
- $12-15
|
||||
- 250A continuous, 1000A surge
|
||||
- Easy quarter-turn operation
|
||||
- No tools needed to operate
|
||||
|
||||
- **Alternative:** EverStart Battery Disconnect Switch (Walmart/AutoZone)
|
||||
- $8-12
|
||||
- 125A continuous
|
||||
- Twist-knob style
|
||||
|
||||
#### Option 2: Side Terminal Mount (GM Vehicles)
|
||||
- **Recommended:** Battery Doctor Side Terminal Switch #20140
|
||||
- $12-18
|
||||
- Designed for GM-style side terminals
|
||||
- Requires terminal shim for proper fit
|
||||
|
||||
#### Option 3: Quick-Disconnect (Side Post with Cable)
|
||||
- **Recommended:** Quick Cable Battery Disconnect #5091
|
||||
- $10-15
|
||||
- Works with existing cable ends
|
||||
- Marine-grade (good for NH weather)
|
||||
|
||||
### Store Locations (Newport/Claremont Area)
|
||||
|
||||
**AutoZone — Newport**
|
||||
- 65 Main St, Newport, NH 03773
|
||||
- (603) 863-5040
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-8PM
|
||||
|
||||
**Advance Auto Parts — Newport**
|
||||
- 71 Main St, Newport, NH 03773
|
||||
- (603) 863-2860
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-7PM
|
||||
|
||||
**O'Reilly Auto Parts — Claremont**
|
||||
- 385 Washington St, Claremont, NH 03743
|
||||
- (603) 542-4635
|
||||
- Hours: M-Sat 7:30AM-9PM, Sun 9AM-8PM
|
||||
|
||||
**NAPA Auto Parts — Newport**
|
||||
- 29 John Stark Hwy, Newport, NH 03773
|
||||
- (603) 863-5500
|
||||
- Hours: M-F 7:30AM-6PM, Sat 7:30AM-4PM, Sun Closed
|
||||
|
||||
---
|
||||
|
||||
## Installation Procedure
|
||||
|
||||
### Tools Required
|
||||
- 10mm wrench (for most battery terminals)
|
||||
- 13mm wrench (if GM side terminals)
|
||||
- Wire brush or terminal cleaner
|
||||
- Shop rags
|
||||
- Optional: zip ties for cable management
|
||||
|
||||
### Step-by-Step Installation
|
||||
|
||||
1. **Safety First**
|
||||
- Park on level ground
|
||||
- Engage parking brake
|
||||
- Remove keys from ignition
|
||||
- Wear safety glasses
|
||||
|
||||
2. **Disconnect Battery**
|
||||
- **CRITICAL:** Disconnect NEGATIVE (-) terminal FIRST
|
||||
- This prevents short circuits if wrench touches frame
|
||||
- Loosen 10mm nut, wiggle terminal off post
|
||||
- Tuck cable away so it can't touch battery post
|
||||
|
||||
3. **Clean Terminals**
|
||||
- Use terminal brush to clean inside of cable clamp
|
||||
- Clean battery post until shiny
|
||||
- Apply thin layer of dielectric grease to post
|
||||
|
||||
4. **Install Disconnect Switch**
|
||||
|
||||
**For Top Post Batteries:**
|
||||
- Remove battery cable end from switch (if pre-attached)
|
||||
- Slide switch onto battery negative post
|
||||
- Re-attach cable to other side of switch
|
||||
- Tighten securely (don't overtighten — battery posts strip easily)
|
||||
|
||||
**For Side Terminal (GM) Batteries:**
|
||||
- May need terminal shim/post riser for clearance
|
||||
- Install shim on negative side terminal
|
||||
- Mount switch to shim
|
||||
- Connect cable to switch
|
||||
|
||||
**For Cable-End Style:**
|
||||
- Cut existing negative cable near battery (leave enough slack)
|
||||
- Strip 1/2" of insulation from both ends
|
||||
- Install in quick-disconnect connector
|
||||
- Crimp or bolt securely per manufacturer instructions
|
||||
|
||||
5. **Test Installation**
|
||||
- Switch should rotate/turn smoothly
|
||||
- No binding or interference with battery hold-down
|
||||
- Cable has enough slack for switch operation
|
||||
- Switch in "ON" position: truck electronics work
|
||||
- Switch in "OFF" position: no power to truck
|
||||
|
||||
6. **Reconnect and Verify**
|
||||
- Switch to ON position
|
||||
- Attempt to start truck — should start normally
|
||||
- Check all electronics function
|
||||
- Switch to OFF position
|
||||
- Verify no interior lights, radio, etc.
|
||||
|
||||
---
|
||||
|
||||
## Testing Protocol
|
||||
|
||||
### Immediate Test (Same Day)
|
||||
- [ ] Start truck with switch ON — engine starts normally
|
||||
- [ ] Turn switch OFF while running — engine dies (expected)
|
||||
- [ ] Switch OFF, wait 30 seconds, attempt start — no response (expected)
|
||||
- [ ] Switch ON, attempt start — starts normally
|
||||
|
||||
### Overnight Test (Critical)
|
||||
- [ ] Park truck with switch in OFF position
|
||||
- [ ] Note battery voltage: __________ V
|
||||
- [ ] Wait 24 hours
|
||||
- [ ] Next day, switch ON, attempt start
|
||||
- [ ] Record result: □ Started normally □ Slow crank □ No start
|
||||
- [ ] If started, check voltage: __________ V
|
||||
|
||||
### 48-Hour Test (If Battery Healthy)
|
||||
- [ ] Repeat overnight test with 48-hour duration
|
||||
- [ ] If truck starts normally, installation is successful
|
||||
- [ ] If truck fails to start, battery replacement needed
|
||||
|
||||
---
|
||||
|
||||
## If Battery Needs Replacement
|
||||
|
||||
### Symptoms of Bad Battery
|
||||
- Voltage <12.4V after "charging" overnight
|
||||
- Slow cranking even with switch disconnected
|
||||
- Battery case bulging or terminals corroded
|
||||
- Battery >4 years old
|
||||
|
||||
### Replacement Battery Shopping
|
||||
|
||||
**Common Truck Batteries (Group Size):**
|
||||
- Measure existing battery or check current battery label
|
||||
- Common truck sizes: Group 24F, 27F, 31, 65, 78
|
||||
|
||||
**Recommended:**
|
||||
- **DieHard Platinum AGM** (Advance Auto) — $200-250
|
||||
- Best cold cranking amps (CCA) for NH winters
|
||||
- AGM handles deep discharges better
|
||||
- 3-year full replacement warranty
|
||||
|
||||
- **EverStart Maxx** (Walmart) — $100-150
|
||||
- Budget option
|
||||
- Check CCA rating matches or exceeds old battery
|
||||
|
||||
- **Optima YellowTop** (Pep Boys/Amazon) — $300+
|
||||
- Deep cycle + starting
|
||||
- Best for vehicles with parasitic drain issues
|
||||
- Handles repeated discharge cycles
|
||||
|
||||
---
|
||||
|
||||
## Documentation Requirements
|
||||
|
||||
Per issue #528 acceptance criteria, upload to Gitea:
|
||||
|
||||
- [ ] Photo of installed disconnect switch (close-up)
|
||||
- [ ] Photo of receipt from parts store
|
||||
- [ ] Photo of truck odometer (optional, for record)
|
||||
- [ ] Note of test results (overnight start success/failure)
|
||||
- [ ] Note of battery voltage readings (before/after)
|
||||
|
||||
Upload via:
|
||||
1. Open issue #528 in browser
|
||||
2. Comment with photos attached
|
||||
3. Check off acceptance criteria
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
| Problem | Cause | Solution |
|
||||
|---------|-------|----------|
|
||||
| Switch won't tighten on post | Wrong terminal type | Get side-terminal adapter or different switch style |
|
||||
| Switch hits battery hold-down | Clearance issue | Add terminal shim to raise switch, or relocate hold-down |
|
||||
| Cable too short | Switch adds height | Get battery cable extension or longer replacement cable |
|
||||
| Still drains with switch OFF | Switch installed on wrong terminal | Move to NEGATIVE terminal only |
|
||||
| Switch gets hot | Loose connection | Tighten terminal nuts; check for corrosion |
|
||||
| Truck won't start even with switch ON | Battery too dead | Jump start, then evaluate if battery needs replacement |
|
||||
|
||||
---
|
||||
|
||||
## Cold Weather Considerations (NH)
|
||||
|
||||
- Batteries lose ~50% capacity at 0°F
|
||||
- Disconnect switch prevents drain but doesn't prevent cold damage
|
||||
- If storing truck long-term:
|
||||
- Switch to OFF
|
||||
- Consider battery maintainer (trickle charger)
|
||||
- Or remove battery and store in heated space
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
This installation is straightforward and should take 30-60 minutes including store run. The key steps:
|
||||
|
||||
1. **Diagnose first** — verify parasitic drain, check battery health
|
||||
2. **Buy the right switch** — match your battery terminal type (top vs side)
|
||||
3. **Install on NEGATIVE terminal only** — this is critical for safety
|
||||
4. **Test thoroughly** — overnight test proves the fix worked
|
||||
5. **Document** — photos and receipts to close the issue
|
||||
|
||||
**Estimated total time:** 2-3 hours (including store run)
|
||||
**Estimated cost:** $15-30 (switch only) or $100-300 (if battery replacement needed)
|
||||
|
||||
---
|
||||
|
||||
*Prepared for: timmy-home#528*
|
||||
*Last updated: 2026-04-22*
|
||||
@@ -1,109 +0,0 @@
|
||||
# LAB-003 Verification Report Template
|
||||
|
||||
**Issue:** [timmy-home#528](https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528)
|
||||
**Date:** __________
|
||||
**Technician:** __________
|
||||
|
||||
---
|
||||
|
||||
## Pre-Installation Diagnostics
|
||||
|
||||
| Test | Reading | Normal Range | Status |
|
||||
|------|---------|--------------|--------|
|
||||
| Battery Voltage (engine off) | _____ V | 12.4-12.7V | □ Pass □ Fail |
|
||||
| Parasitic Current | _____ mA | <50mA | □ Pass □ Fail |
|
||||
| Battery Voltage (engine running) | _____ V | 13.7-14.7V | □ Pass □ Fail |
|
||||
|
||||
**Battery Health Assessment:** □ Good □ Fair □ Replace
|
||||
|
||||
---
|
||||
|
||||
## Parts Purchased
|
||||
|
||||
| Item | Store | Cost |
|
||||
|------|-------|------|
|
||||
| Battery Disconnect Switch | _________ | $_____ |
|
||||
| Dielectric Grease | _________ | $_____ |
|
||||
| Terminal Cleaner | _________ | $_____ |
|
||||
| Other: _________ | _________ | $_____ |
|
||||
| **Total** | | **$_____** |
|
||||
|
||||
---
|
||||
|
||||
## Installation Checklist
|
||||
|
||||
- [ ] Negative terminal disconnected first
|
||||
- [ ] Terminals cleaned
|
||||
- [ ] Dielectric grease applied
|
||||
- [ ] Switch installed on NEGATIVE terminal
|
||||
- [ ] All connections tight
|
||||
- [ ] Switch operates smoothly (no tools needed)
|
||||
- [ ] No interference with hood/battery hold-down
|
||||
|
||||
---
|
||||
|
||||
## Post-Installation Tests
|
||||
|
||||
### Immediate Tests
|
||||
- [ ] Truck starts with switch ON
|
||||
- [ ] No power with switch OFF
|
||||
- [ ] All electronics function normally (switch ON)
|
||||
|
||||
### 24-Hour Test
|
||||
- [ ] Parked with switch OFF for 24+ hours
|
||||
- [ ] Truck started normally next day
|
||||
- [ ] Battery voltage before test: _____ V
|
||||
- [ ] Battery voltage after test: _____ V
|
||||
|
||||
### 48-Hour Test (if applicable)
|
||||
- [ ] Parked with switch OFF for 48+ hours
|
||||
- [ ] Truck started normally
|
||||
|
||||
---
|
||||
|
||||
## Photos Required
|
||||
|
||||
Upload these to issue #528:
|
||||
|
||||
- [ ] Photo of installed disconnect switch (close-up)
|
||||
- [ ] Photo of receipt from parts store
|
||||
- [ ] Photo showing switch in OFF position
|
||||
- [ ] Photo of truck dashboard (optional, for records)
|
||||
|
||||
---
|
||||
|
||||
## Results Summary
|
||||
|
||||
| Acceptance Criterion | Status |
|
||||
|---------------------|--------|
|
||||
| Disconnect switch installed and physically secure | □ Pass □ Fail |
|
||||
| Truck starts reliably after 24+ hours with switch disconnected | □ Pass □ Fail |
|
||||
| No special tools required to operate the disconnect | □ Pass □ Fail |
|
||||
| Receipt uploaded to issue | □ Pass □ Fail |
|
||||
|
||||
**Overall Status:** □ Complete - All criteria met
|
||||
□ Partial - See notes
|
||||
□ Failed - Requires follow-up
|
||||
|
||||
---
|
||||
|
||||
## Notes / Issues Encountered
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
_________________________________________________________________
|
||||
|
||||
---
|
||||
|
||||
## Follow-up Actions (if needed)
|
||||
|
||||
- [ ] Replace battery (if tests failed)
|
||||
- [ ] Exchange switch for different style (if fitment issue)
|
||||
- [ ] Troubleshoot remaining parasitic drain
|
||||
- [ ] Other: _____________________________________________
|
||||
|
||||
---
|
||||
|
||||
*Fill out this template during installation and upload to issue #528*
|
||||
@@ -285,25 +285,24 @@ 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.")
|
||||
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
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
# Phase-aware: Breaking phase has higher fire-death chance
|
||||
@@ -1094,7 +1093,21 @@ 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 = {
|
||||
@@ -1157,7 +1170,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -1265,7 +1278,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"] -= 0
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -1302,7 +1315,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"] -= 2
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -1324,7 +1337,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -1343,7 +1356,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -1352,7 +1365,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
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.")
|
||||
@@ -1371,7 +1384,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
else:
|
||||
@@ -1427,6 +1440,9 @@ 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,26 +203,25 @@ 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.")
|
||||
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
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
self.state["forge_fire_dying"] = random.random() < 0.1
|
||||
|
||||
# Random weather events
|
||||
@@ -927,7 +926,21 @@ 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 = {
|
||||
@@ -990,7 +1003,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -1092,7 +1105,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"] -= 0
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -1129,7 +1142,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"] -= 2
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -1151,7 +1164,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -1170,7 +1183,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -1179,7 +1192,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
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.")
|
||||
@@ -1198,7 +1211,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
else:
|
||||
@@ -1242,6 +1255,9 @@ 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,215 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# LAB-003 Battery Disconnect Installation Helper
|
||||
# Reference: timmy-home#528
|
||||
#
|
||||
# Usage:
|
||||
# bash scripts/lab_003_battery_disconnect.sh diagnose # Test battery before install
|
||||
# bash scripts/lab_003_battery_disconnect.sh checklist # Print installation checklist
|
||||
# bash scripts/lab_003_battery_disconnect.sh verify # Post-install verification
|
||||
#
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LOG_FILE="$SCRIPT_DIR/../logs/lab_003_$(date +%Y%m%d_%H%M%S).log"
|
||||
ISSUE_URL="https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/528"
|
||||
|
||||
echo "=== LAB-003: Battery Disconnect Switch Installation ==="
|
||||
echo "Issue: $ISSUE_URL"
|
||||
echo ""
|
||||
|
||||
mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null || true
|
||||
|
||||
log() {
|
||||
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG_FILE" 2>/dev/null || echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1"
|
||||
}
|
||||
|
||||
diagnose() {
|
||||
log "=== Battery Diagnosis ==="
|
||||
echo ""
|
||||
echo "This will help determine if you need a new battery or just the disconnect switch."
|
||||
echo ""
|
||||
|
||||
echo "Step 1: Check battery voltage with multimeter"
|
||||
echo " - Set multimeter to DC Volts (20V scale)"
|
||||
echo " - Red probe to battery positive (+)"
|
||||
echo " - Black probe to battery negative (-)"
|
||||
echo ""
|
||||
read -p "Enter voltage reading (e.g., 12.6): " voltage
|
||||
log "Battery voltage: ${voltage}V"
|
||||
|
||||
if (( $(echo "$voltage >= 12.6" | bc -l) )); then
|
||||
echo "✓ Battery voltage is GOOD (≥12.6V)"
|
||||
log "Battery voltage GOOD"
|
||||
elif (( $(echo "$voltage >= 12.4" | bc -l) )); then
|
||||
echo "⚠ Battery voltage is FAIR (12.4-12.5V) - may need replacement soon"
|
||||
log "Battery voltage FAIR"
|
||||
else
|
||||
echo "✗ Battery voltage is LOW (<12.4V) - likely needs replacement"
|
||||
log "Battery voltage LOW - replacement recommended"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Step 2: Check for parasitic drain"
|
||||
echo " - Set multimeter to DC Amps (10A scale)"
|
||||
echo " - Disconnect negative battery cable"
|
||||
echo " - Connect multimeter between battery negative post and cable"
|
||||
echo " - Wait 2 minutes for modules to sleep"
|
||||
echo ""
|
||||
read -p "Enter current reading in milliamps (e.g., 50): " current
|
||||
log "Parasitic current: ${current}mA"
|
||||
|
||||
if (( $(echo "$current <= 50" | bc -l) )); then
|
||||
echo "✓ Parasitic drain is NORMAL (≤50mA)"
|
||||
log "Parasitic drain NORMAL"
|
||||
echo ""
|
||||
echo "NOTE: Normal drain means the disconnect switch may not be necessary"
|
||||
echo " unless you're storing the truck for weeks at a time."
|
||||
elif (( $(echo "$current <= 100" | bc -l) )); then
|
||||
echo "⚠ Parasitic drain is ELEVATED (50-100mA)"
|
||||
log "Parasitic drain ELEVATED"
|
||||
echo "Disconnect switch will help prevent dead battery."
|
||||
else
|
||||
echo "✗ Parasitic drain is HIGH (>100mA)"
|
||||
log "Parasitic drain HIGH - disconnect switch highly recommended"
|
||||
echo ""
|
||||
echo "You definitely need the disconnect switch!"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
log "Diagnosis complete. Log saved to: $LOG_FILE"
|
||||
}
|
||||
|
||||
checklist() {
|
||||
cat << 'EOF'
|
||||
=== LAB-003 Installation Checklist ===
|
||||
|
||||
BEFORE YOU GO:
|
||||
□ Determine battery terminal type (top post vs side terminal)
|
||||
□ Measure battery group size (look for label like "Group 24F")
|
||||
□ Check if you have 10mm and 13mm wrenches
|
||||
□ Verify multimeter has DC Volts and DC Amps capability
|
||||
|
||||
AT THE STORE:
|
||||
□ Purchase battery disconnect switch (match your terminal type)
|
||||
□ Purchase dielectric grease
|
||||
□ Purchase terminal cleaner brush (if you don't have one)
|
||||
□ Get receipt for documentation
|
||||
|
||||
INSTALLATION:
|
||||
□ Park on level ground, engage parking brake
|
||||
□ Disconnect NEGATIVE (-) terminal first
|
||||
□ Clean terminals with wire brush
|
||||
□ Apply dielectric grease
|
||||
□ Install switch on NEGATIVE terminal
|
||||
□ Reconnect and test operation
|
||||
|
||||
TESTING:
|
||||
□ Switch ON: truck starts normally
|
||||
□ Switch OFF: no power to truck
|
||||
□ Overnight test: switch OFF, verify start next day
|
||||
□ Document with photos
|
||||
□ Upload photos to issue #528
|
||||
|
||||
TROUBLESHOOTING:
|
||||
□ If switch doesn't fit: wrong terminal type - exchange at store
|
||||
□ If still drains overnight: battery needs replacement
|
||||
□ If slow crank with new switch: battery degraded - replace
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
verify() {
|
||||
log "=== Post-Installation Verification ==="
|
||||
echo ""
|
||||
echo "Post-installation tests. Run these AFTER installing the disconnect switch."
|
||||
echo ""
|
||||
|
||||
read -p "Test 1 - Can you start the truck with the switch ON? (y/n): " t1
|
||||
if [[ "$t1" == "y" ]]; then
|
||||
log "Test 1 PASSED: Truck starts with switch ON"
|
||||
echo "✓ Test 1 PASSED"
|
||||
else
|
||||
log "Test 1 FAILED: Truck won't start with switch ON"
|
||||
echo "✗ Test 1 FAILED - Check installation and battery"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
read -p "Test 2 - With truck OFF and switch OFF, do interior lights/radio work? (y/n): " t2
|
||||
if [[ "$t2" == "n" ]]; then
|
||||
log "Test 2 PASSED: No power with switch OFF"
|
||||
echo "✓ Test 2 PASSED"
|
||||
else
|
||||
log "Test 2 FAILED: Power still on with switch OFF"
|
||||
echo "✗ Test 2 FAILED - Switch may be on wrong terminal or defective"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
read -p "Test 3 - Is the switch easy to operate by hand (no tools needed)? (y/n): " t3
|
||||
if [[ "$t3" == "y" ]]; then
|
||||
log "Test 3 PASSED: Switch operable without tools"
|
||||
echo "✓ Test 3 PASSED"
|
||||
else
|
||||
log "Test 3 WARNING: Switch may require tools"
|
||||
echo "⚠ Test 3 WARNING - Consider a different switch style"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "=== 24-Hour Test ==="
|
||||
echo "Park truck with switch OFF. Tomorrow, try to start it."
|
||||
echo "Record result in issue #528: $ISSUE_URL"
|
||||
echo ""
|
||||
|
||||
read -p "Did the 24-hour test pass (truck started normally)? (y/n/skip): " t24
|
||||
case "$t24" in
|
||||
y)
|
||||
log "24-hour test PASSED"
|
||||
echo "✓ Installation SUCCESSFUL!"
|
||||
echo ""
|
||||
echo "Close issue #528 with:"
|
||||
echo " - Photo of installed switch"
|
||||
echo " - Photo of receipt"
|
||||
echo " - Note: '24-hour test passed, truck started normally'"
|
||||
;;
|
||||
n)
|
||||
log "24-hour test FAILED"
|
||||
echo "✗ Test FAILED - Battery likely needs replacement"
|
||||
echo ""
|
||||
echo "Next steps:"
|
||||
echo " 1. Jump start truck"
|
||||
echo " 2. Drive to store for battery replacement"
|
||||
echo " 3. Reference LAB-003-battery-disconnect-install.md for battery shopping guide"
|
||||
;;
|
||||
*)
|
||||
log "24-hour test pending"
|
||||
echo "Run this script again after 24 hours with: bash $0 verify"
|
||||
;;
|
||||
esac
|
||||
|
||||
echo ""
|
||||
log "Verification complete. Log saved to: $LOG_FILE"
|
||||
}
|
||||
|
||||
case "${1:-help}" in
|
||||
diagnose)
|
||||
diagnose
|
||||
;;
|
||||
checklist)
|
||||
checklist
|
||||
;;
|
||||
verify)
|
||||
verify
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {diagnose|checklist|verify}"
|
||||
echo ""
|
||||
echo " diagnose - Check battery voltage and parasitic drain"
|
||||
echo " checklist - Print installation checklist"
|
||||
echo " verify - Post-installation verification tests"
|
||||
echo ""
|
||||
echo "Full guide: docs/LAB-003-battery-disconnect-install.md"
|
||||
echo "Issue: $ISSUE_URL"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
127
tests/test_tower_game_energy_constraints.py
Normal file
127
tests/test_tower_game_energy_constraints.py
Normal file
@@ -0,0 +1,127 @@
|
||||
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
|
||||
@@ -203,26 +203,25 @@ 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.")
|
||||
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
|
||||
self.state["energy_collapse_event"] = {
|
||||
"character": char_name,
|
||||
"from_room": current,
|
||||
"to_room": new_room,
|
||||
}
|
||||
|
||||
# Forge fire naturally dims if not tended
|
||||
self.state["forge_fire_dying"] = random.random() < 0.1
|
||||
|
||||
# Random weather events
|
||||
@@ -671,7 +670,21 @@ 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 = {
|
||||
@@ -734,7 +747,7 @@ class GameEngine:
|
||||
if direction in connections:
|
||||
dest = connections[direction]
|
||||
self.world.characters["Timmy"]["room"] = dest
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
|
||||
scene["log"].append(f"You move {direction} to The {dest}.")
|
||||
scene["timmy_room"] = dest
|
||||
@@ -848,7 +861,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"] -= 0
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
else:
|
||||
scene["log"].append(f"{target} is not in this room.")
|
||||
|
||||
@@ -885,7 +898,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"] -= 2
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append("You tend the forge fire. The flames leap up, bright and hungry.")
|
||||
self.world.state["forge_fire_dying"] = False
|
||||
else:
|
||||
@@ -914,7 +927,7 @@ class GameEngine:
|
||||
]
|
||||
new_rule = random.choice(rules)
|
||||
self.world.rooms["Tower"]["messages"].append(new_rule)
|
||||
self.world.characters["Timmy"]["energy"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You write on the Tower whiteboard: \"{new_rule}\"")
|
||||
else:
|
||||
scene["log"].append("You are not in the Tower.")
|
||||
@@ -940,7 +953,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You carve into the railing: \"{new_carving}\"")
|
||||
else:
|
||||
scene["log"].append("You are not on the Bridge.")
|
||||
@@ -949,7 +962,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
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.")
|
||||
@@ -975,7 +988,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"] -= 1
|
||||
self.world.characters["Timmy"]["energy"] -= action_cost
|
||||
scene["log"].append(f"You help {target_name}. They look grateful.")
|
||||
|
||||
elif timmy_action.startswith("confront:"):
|
||||
@@ -1076,6 +1089,9 @@ 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