Skip to content

[P3] Add test for stale reservation cleanup dirty flag, remove redundant guard #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joryirving merged 1 commit into from
Aug 1, 2026
Merged

[P3] Add test for stale reservation cleanup dirty flag, remove redundant guard #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions scripts/main.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,8 +1831,6 @@ func persist(force := false) -> void:
state["priority_order"] = priority_order.duplicate()
state["dock_anchor"] = String(settings.get("dock_anchor", "bottom"))
state["save_version"] = GameState.SAVE_VERSION
if not state.has("reserved_resources"):
state["reserved_resources"] = {}
GameState.save_game(state)

func get_tile(pos: Vector2i) -> Dictionary:
Expand Down
49 changes: 49 additions & 0 deletions tests/test_reservations.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,3 +543,52 @@ func test_gather_reservation_balance_on_depleted_tile() -> void:
# counter clamps at zero instead of drifting negative.
sim.do_gather(sim.state.workers[0], task_a)
assert_eq(sim.get_reserved("wood"), 0, "balance: counter never goes negative")


# ──────────────────────────────────────────────────────────────────────
# Stale reservation cleanup marks dirty (#297):
# _clean_stale_reservations() modifies state.builds[].reserved but must
# call mark_dirty() so the change persists.
# ──────────────────────────────────────────────────────────────────────

func test_stale_reservation_cleanup_marks_dirty() -> void:
print("")
print("--- reservation: stale cleanup marks dirty ---")

var sim := ColonySim.new()
sim.grid_w = 5
sim.grid_h = 5
sim.stockpile_pos = Vector2i(0, 0)
sim.priority_order = ["build"] as Array[String]
var tiles: Array = []
for i in 25:
tiles.append({"kind": "ground", "amount": 0, "resource": "", "build_kind": ""})
sim.state = {
"tick": 0,
"resources": {"wood": 10, "stone": 10, "food": 10},
"harvested": {"wood": 0, "stone": 0, "food": 0},
"priority_order": ["build"],
"workers": [],
"tiles": tiles,
"builds": [
{
"id": "1",
"kind": "wall",
"pos": {"x": 2, "y": 2},
"progress": 0.5,
"reserved": {"wood": 2},
}
],
"next_build_id": 2,
"events": [],
"reserved_resources": {},
}

# Reset dirty flag so the test can verify _clean_stale_reservations()
# actually calls mark_dirty(). Without this reset, bootstrap_state()
# would leave dirty=true and the test would pass trivially.
sim.dirty = false

sim._clean_stale_reservations()

assert_true(sim.dirty, "stale reservation cleanup marks dirty")