Timmy_Foundation/the-beacon
15
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

burn: fix offline progress to award rescues, ops, trust, creativity, harmony #37

Closed
Timmy wants to merge 1 commits from burn/20260410-0355-35-fix-offline-progress into main
pull from: burn/20260410-0355-35-fix-offline-progress
merge into: Timmy_Foundation:main
Conversation 6 Commits 1 Files Changed 1 +25 -1
Timmy commented 2026-04-10 07:55:57 +00:00
Owner
Copy Link

Closes #35

Changes

  • Added offline accumulation for rescues, ops, trust, creativity, and harmony (previously only code/compute/knowledge/users/impact were calculated)
  • Harmony stays clamped to 0-100 during offline calc
  • totalRescues properly tracked during offline periods
  • Welcome-back message now only shows resources with positive rates (less noise)
  • Syntax validated with node --check
Closes #35 ## Changes - Added offline accumulation for rescues, ops, trust, creativity, and harmony (previously only code/compute/knowledge/users/impact were calculated) - Harmony stays clamped to 0-100 during offline calc - totalRescues properly tracked during offline periods - Welcome-back message now only shows resources with positive rates (less noise) - Syntax validated with node --check
Timmy added 1 commit 2026-04-10 07:55:57 +00:00
burn: fix offline progress to award rescues, ops, trust, creativity, harmony (closes #35) c6c963858b
Timmy commented 2026-04-10 09:39:20 +00:00
Author
Owner
Copy Link

Merge conflicts — needs rebase against main.

Merge conflicts — needs rebase against main.
Timmy commented 2026-04-10 11:49:23 +00:00
Author
Owner
Copy Link

⚠️ Blocked: Merge conflict. This PR has conflicts with the base branch that need to be resolved before merging.

⚠️ **Blocked: Merge conflict.** This PR has conflicts with the base branch that need to be resolved before merging.
Timmy commented 2026-04-10 19:03:28 +00:00
Author
Owner
Copy Link

🚫 Auto-review: Cannot merge. merge conflicts with base. The branch needs to be rebased onto the current base before this PR can be merged. Please resolve conflicts and update the PR.

🚫 **Auto-review: Cannot merge.** merge conflicts with base. The branch needs to be rebased onto the current base before this PR can be merged. Please resolve conflicts and update the PR.
Timmy commented 2026-04-10 21:03:17 +00:00
Author
Owner
Copy Link

🤖 Auto-triage: PR is unmergeable. Needs conflict resolution before merge.

🤖 Auto-triage: PR is unmergeable. Needs conflict resolution before merge.
Rockachopa commented 2026-04-10 21:52:01 +00:00
Owner
Copy Link

🤖 Timmy PR Review Bot

Cannot merge: has conflicts. Part of stacked PR series on the-beacon.

🤖 **Timmy PR Review Bot** Cannot merge: has conflicts. Part of stacked PR series on the-beacon.
bezalel was assigned by Timmy 2026-04-10 23:38:55 +00:00
Timmy commented 2026-04-10 23:40:36 +00:00
Author
Owner
Copy Link

Closing — Superseded by #46/#48

Closing — Superseded by #46/#48
Timmy closed this pull request 2026-04-10 23:40:36 +00:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
P1
P2
P3
architecture
devops
documentation
education
endgame
gameplay
mechanics
narrative
polish
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Rockachopa Timmy allegro antigravity bezalel claude codex-agent ezra gemini google grok hermes kimi manus perplexity
No Assignees bezalel
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Timmy_Foundation/the-beacon#37
Delete Branch "burn/20260410-0355-35-fix-offline-progress"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?