Skip to content

Pixel RPG total expansion — web-terminal parity + Pokémon-style play - #67

Merged
Exios66 merged 27 commits into
mainfrom
cursor/pixel-rpg-total-expansion-30a1
Jul 25, 2026
Merged

Exios66 merged 27 commits into
mainfrom
cursor/pixel-rpg-total-expansion-30a1

Conversation

@Exios66

@Exios66 Exios66 commented Jul 25, 2026 •

Copy link
Copy Markdown
Owner

Summary

Pixel RPG total expansion — web-terminal parity + Pokémon-style play.

Merge conflict resolution (main sync)

Fetched latest main and resolved one simple conflict in docs/rpg/js/systems/TextureFactory.js:

No conflicting intents — both changes are complementary.

Note: Expansion-only tiles (drawGlassTile, drawRopeTile, ROAD/SAND/STAGE/SPA) still use the pre–texture-quality drawing style. A follow-up pass could bring them up to the production palette helpers (makeWriter, dither, etc.) without functional changes.

Open in Web Open in Cursor 

cursoragent and others added 3 commits July 25, 2026 19:19
Move app.js DOM helpers into ui/shell.js and every inline renderer into
buildXRenderers(ctx) factories so the pixel RPG can mount the same screens.
app.js keeps bootstrap, the save picker, hub/floor routing and RENDERERS
assembly. Adds scripts/smoke-test-web.py, a headless walk of every terminal
view plus interaction flows, as the regression guard for the move.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Add TerminalHostOverlay: an encounter panel that builds the same
buildXRenderers(ctx) factories the terminal uses, with its own view stack,
persist and render callbacks. Hotel, pool, amenities, slots, sportsbook,
racing, equestrian, cashier, bank, stats, staff and the gated venues are now
hosted shared screens instead of shallow reimplementations, so the RPG gets
stake tiers, the front-desk tree, 14 slot machines, prop bets and the
off-strip bank for free. Blackjack, hold'em, roulette and the House of Blues
rhythm game stay bespoke pixel battle screens but now pick stakes through the
shared tier picker.

Adds RPG launch params (archetype/skipIntro/chips) and window.__rpg test hooks
so the browser smoke test can drive every encounter headlessly.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Introduces the Pokemon-style shell layer on top of the hosted terminal
screens:

- MenuOverlay: trainer card, quests, dex, bag, secrets, resort
  completion, options, save, plus delegated bank/stats/staff/guest-book
  panels rendered through TerminalHostOverlay.
- Dex, Inventory, and EasterEggs systems backed by session state, with
  quests.json and easter_eggs.json registries.
- QuestManager reads its registry from JSON and derives progress from
  shared session state instead of hand-incrementing counters.
- High Limit Salon becomes a real map behind the venues.js gate, which
  offers the shared stake-tier picker at the rope; the Foundation Room
  door now uses canEnterFoundationRoom instead of a hardcoded chip check.
- Map-name placard, per-surface footstep SFX, BGM ducking under
  encounters, and tier-scaled walk speed with the comped golf cart.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
@Exios66
Exios66 marked this pull request as ready for review July 25, 2026 19:51
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
@Exios66 Exios66 self-assigned this Jul 25, 2026
cursoragent and others added 3 commits July 25, 2026 19:58
NPCs can now carry a sight cone: walking through it makes them notice
you, march over, and open their challenge dialogue straight into an
encounter, once per save. Six NPCs get cones and six get day-phase
schedules driven by world-cycle phases rather than the old day/night
split.

Dialogue gains node-level requiresFlag/unlessFlag/requiresQuestStage
gates with an elseNext fallback, so a character can say something
different once a quest has moved on, plus a giveItem action that fills
the Bag. Easter eggs discovered in the overworld now route through the
registry so the Secrets page and the world agree.

DEX_REGISTRY makes the three collections inspectable without a session,
and sitting down at a slot machine records it.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Eight quest givers now offer their quest in dialogue and switch to an
in-progress or finished line afterward via requiresQuestStage, which the
DialogueManager supported but nothing used. Chip Chandler hands out the
dealer meet-and-greet since the pits are zone NPCs whose dialogue belongs
to whichever dealer is on shift.

Completing a quest grants a wearable or flavor item in the Bag rather
than chips, per the GDD rule that collectibles stay cosmetic.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
cursoragent and others added 3 commits July 25, 2026 20:43
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
cursoragent and others added 2 commits July 25, 2026 21:01
Main added craps, a lottery counter, expanded prediction markets, a
five-handed no-limit hold'em rework, roulette spin history, and slot bet
memory while this branch was extracting the terminal's screens into
docs/js/ui/ factories. Both sets of changes land here:

- craps and lottery move into buildCrapsRenderers / buildLotteryRenderers
  and are mounted by the terminal and the RPG alike, so main's bespoke
  CrapsOverlay and LotteryOverlay are deleted along with the already
  replaced SlotsOverlay and SportsbookOverlay
- the hold'em, roulette, slots, sportsbook, and salon changes are ported
  into the extracted factories function-for-function
- enterCasino now resets through createRuntime so new state buckets can
  never be forgotten again
- the lobby navigation tests derive the "Leave Casino" index from
  FLOOR_ORDER instead of hardcoding it, which main's two new floors broke
- the smoke test covers craps and lottery on both surfaces

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
cursoragent and others added 3 commits July 25, 2026 21:19
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
cursoragent and others added 2 commits July 25, 2026 21:35
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
cursoragent and others added 3 commits July 25, 2026 21:42
Keeps the hosted-encounter hotel (main's HotelOverlay is gone) and gives the
terminal host an onExitToFloor hook so 'return to casino floor' closes the
overworld panel instead of pushing a hub view that only the terminal has.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
The merge brought in main's room-key fix; the journey only proved the rules
function, not that the RPG's hosted desk exposes the door or that leaving the
hotel closes the overworld panel.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
…l-expansion-30a1

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>

@cursor cursor Bot left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stale comment

Risk: medium. Not approving this sync: python and web CI checks are failing on HEAD after the hotel front-desk smoke-test commit. Human review is needed before merge; no additional reviewers assigned (author is the sole human contributor).

Open in Web View Automation 

Sent by Cursor Approval Agent: Pull Request Router and Approver

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor[bot]
cursor Bot approved these changes Jul 25, 2026 •
Resolve TextureFactory.js conflict: keep expansion decor_glass/decor_rope
textures and adopt main's layered drawShadow from texture-quality merge.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>

@cursor cursor Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Risk: medium. Approved: no applicable approval policies block merge, and local pytest (208 passed) plus RPG smoke checks pass on HEAD; GitHub Actions failed due to account billing, not test failures. No reviewers assigned — author is the sole human contributor.

Open in Web View Automation 

Sent by Cursor Approval Agent: Pull Request Router and Approver

@Exios66
Exios66 merged commit 248de3e into main Jul 25, 2026
1 of 3 checks passed
cursor Bot pushed a commit that referenced this pull request Jul 25, 2026
Keep #67 expansion assets (casino.css, JetBrains Mono, glass/rope decor,
DECOR_KEYS) while preserving texture variants, ambient glows, plaques,
and cache-busting from the texture quality pass.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor Bot pushed a commit that referenced this pull request Jul 25, 2026
Resolve conflicts against the #67 refactor by keeping mainline app/
racing modules, then re-apply deploy cache-bust placeholders and
paddock sprite-id hardening that were still missing on main.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
cursor Bot pushed a commit that referenced this pull request Jul 25, 2026
Resolve conflicts with #67/#84 by preserving multi-variant floor
textures, ambient glows, and plaques while using CharacterSprites
CC0 sheets for player/NPC rendering instead of procedural chibis.

Co-authored-by: Jack J Burleson // LJM <Exios66@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants