fix: significator_reversed=polarity bug + Pattern B name-swap rendering + qualifier-aware applet faces + sticky PAID DRAW + cooldown anchor on User + stat-block polarity unification across Sig/Sea/Fan/applets
Five-thread sprint atop 53cd7af; all 1238 IT/UT green (no FTs run per [[feedback-ft-run-discipline]]).
**Thread 1 — User.significator_reversed is the POLARITY axis, not orientation.** The saved sig was rendering as a gravity reversal when the user saved a levity emanation. Root cause: `my_sign.html` JS post-save load called `_toggleOrientation()` whenever `revInput.value==='1'` (SPIN-ing a card whose flag only meant "polarity=levity"); `_applet-my-sign.html` applied `.stage-card--reversed` + `keywords_reversed` for the same flag. Fix: JS drops the `_toggleOrientation()` call (saved sigs are always upright in their polarity, never spun); the applet drops the rotation class, swaps to `my-sign-applet-card--{levity,gravity}` modifier, and always renders `keywords_upright` / "Emanation". `data-polarity` cascades correctly. Memory: [[feedback-significator-reversed-is-polarity]].
**Thread 2 — qualifier rendering on the My Sign + My Sea applets.** Both applets were rendering name only — no qualifier word. Added `TarotCard.applet_face(polarity, reversed)` (model method) + `User.sig_face` (delegator for the saved sig) returning `{title, qualifier, qualifier_first}` payload that mirrors `populateCard` in `stage-card.js`. `latest_draw_slots()` augments each slot dict w. `face`. Templates render `.fan-card-qualifier` + `.fan-card-name` in the order the payload dictates (non-Major: qualifier-above-title; Major+qualifier: title-with-trailing-comma above qualifier; polarity-split: single-line title). Typography matched to title (same bold, same size, same color via `color: inherit` w. polarity-pin at 0,3,0 specificity to beat `_card-deck.scss:376-383`'s 0,2,0 `.fan-card-face .fan-card-name` rule that out-cascades when loaded after gameboard).
**Thread 3 — My Sea cooldown bugs.** Two: (a) PAID DRAW button reverted to FREE DRAW after one navigation cycle because `my_sea_paid_draw` deleted the row at commit time — without a row, `quota_spent=False` on next render. (b) Brief's "next free draw at" was anchored to the most recent paid draw, not the original free draw. Fix: new `User.last_free_draw_at` field (set in `my_sea_lock` when a fresh row lands AND user wasn't already in cooldown — i.e., this is a tokenless free draw); paid draws NEVER touch it. New `MySeaDraw.paid_through_at` field stamped at commit time + cleared in `my_sea_lock` when the first card of the paid session lands (one-shot credit per user-spec: "each redraw needs a new token"). `my_sea_paid_draw` no longer deletes the row — clears hand+deposit, sets `paid_through_at`, redirects to `?phase=picker`. View's landing button uses `show_paid_draw` (`deposit_reserved OR paid_through_at`) so PAID DRAW persists across navigation until the paid session's first card lands. Brief reads `user.next_free_draw_at` (= `last_free_draw_at + 24h`) w. row-fallback for legacy test fixtures. 11 new ITs (`MySeaCooldownAnchoredToFreeDrawTest`, `UserFreeDrawCooldownPropertyTest`, expanded `MySeaPhasePickerQueryParamTest`, expanded `my_sea_lock` tests). Existing `test_paid_draw_deletes_active_draw_row` rewritten as `test_paid_draw_preserves_row_and_sets_paid_through_at`. 1 new FT pinning the navigation-persistence regression. Memory: [[feedback-my-sea-cooldown-design]].
**Thread 4 — Pattern B / B' Major reversal name-swap.** Card 34's My Sea applet rendered the reversal as "Animal Powers, Patrilineage" (Patrilineage treated as a qualifier). User-locked semantics: for Majors w. BOTH polarity qualifiers AND a `reversal_qualifier`, the `reversal_qualifier` field carries the NAME SWAP for the reversal face; the polarity qualifier persists across both faces. Affected cards: 2-5 (Pope/Horseman), 10-15 (Elements), 22-33 (Zodiac → Houses), 34-35 (Lunars), 41 (Asteroid Belt). Pattern B': cards 16-18 (Realms — Disco Inferno → Shame etc.) reversal face drops the qualifier entirely; new `TarotCard.reversal_drops_qualifier` BooleanField marks these (set True on 16-18 via `epic/0010_set_reversal_drops_qualifier_realms.py` data migration). `applet_face()` + `stage-card.js::populateCard` both branch on `arcana==MAJOR AND reversal_qualifier AND polarity_qualifier` → Pattern B/B' rendering. Non-Major `reversal_qualifier` semantics unchanged (middle court: "Queen of Crowns" stays as title, "Vacant" renders as the reversal-face qualifier). New data attr `data-reversal-drops-qualifier` added to `my_sign.html`, `_sig_select_overlay.html`, `_tarot_fan.html` so stage-card.js can read it via dataset. `card_dict()` extended w. the same field. 3 new UTs (`TarotCardAppletFaceTest`: Pattern B name swap, Pattern B' qualifier drop, non-Major regression pin). Old `test_reversed_uses_reversal_qualifier_with_comma_for_major` deleted (it pinned the conflated old behavior).
**Thread 5 — unified card + stat-block polarity convention across all 6 surfaces** (Sig Select, Sea Select stage modal, Game Kit fan, My Sign applet, My Sea applet, room.html). User-locked: card and adjacent stat block always carry OPPOSITE-polarity bgs (gravity card --priUser → stat block --secUser; levity card --secUser → stat block --priUser). `.is-reversed` (SPIN) is preview-only — never shifts bg. Per-card scoping (NOT page-wide) — drawn sea cards each carry their own polarity from the deck stack; `.sea-stage--{gravity,levity}` parent rules + `.tarot-fan-wrap[data-polarity=...]` parent rules cascade to their respective stat blocks. `game-kit.js` `_populateStage` + `_flipActive` mirror `_polarity` onto `.tarot-fan-wrap` so SCSS can pick it up without touching the stat block directly. Sea-stat-block was previously stuck at --priUser regardless of polarity; fan-stage-block ditto. Both inverted now. Memory: [[feedback-card-polarity-convention]].
**Bundled polish across the same surfaces** (each one a small visible item the user spotted during the sprint):
- My Sign applet card: levity polarity flips bg to --secUser + border to --priUser + ink to --quiUser (matches page stage card at `_card-deck.scss:1002-1019`). Gravity stat block flips to --secUser bg w. --quiUser label ink + --priUser keyword ink (matches `_card-deck.scss:1042-1046`).
- Qualifier + title share typography (font-size, weight, polarity-color, text-wrap). `.fan-card-face { gap: 0 }` + `line-height: 1.15` so qualifier sits directly above title at the title's own line-height. `.fan-card-arcana { margin-top }` reserves breathing room below.
- `.fan-card-qualifier:empty { display: none }` collapses polarity-split / Major-no-qualifier cards cleanly.
**Memory recorded**:
1. [[feedback-ft-run-discipline]] — re-pinned 2026-05-23 after I burned a multi-minute full-FT-suite run mid-task. Default loop is IT/UT only. FT runs must be ONE test method by full dotted path; never a whole file; never re-run an already-green FT.
2. [[feedback-significator-reversed-is-polarity]] — the flag is polarity (FLIP), not orientation (SPIN); SPIN never persisted; saved sigs always upright in their polarity.
3. [[feedback-card-polarity-convention]] — opposite-polarity stat-block bg, per-card scoping, SPIN never shifts bg, the full color table.
4. [[feedback-my-sea-cooldown-design]] — cooldown anchored to User.last_free_draw_at, paid draws never reset it, paid_through_at is a sticky one-shot credit, button state machine.
**Files** (every uncommitted file folded in — session work + pre-existing modifications):
Models / migrations:
- `apps/epic/models.py` — `applet_face()` extended w. Pattern B/B' branches; new `reversal_drops_qualifier` BooleanField.
- `apps/epic/migrations/0009_reversal_drops_qualifier.py` — schema.
- `apps/epic/migrations/0010_set_reversal_drops_qualifier_realms.py` — data migration setting flag True on cards 16-18.
- `apps/epic/utils.py` — `card_dict` carries `reversal_drops_qualifier`.
- `apps/gameboard/models.py` — `paid_through_at` field; `latest_draw_slots()` attaches `face` payload per slot; `active_draw_for` docstring refreshed.
- `apps/gameboard/migrations/0003_myseadraw_paid_through_at.py` — schema.
- `apps/lyric/models.py` — `last_free_draw_at` field; `free_draw_cooldown_active` + `next_free_draw_at` props; `sig_face` delegator.
- `apps/lyric/migrations/0013_user_last_free_draw_at.py` — schema.
Views:
- `apps/gameboard/views.py` — `my_sea` view button state machine (`show_paid_draw` / `show_gate_view` / `show_picker`); `my_sea_lock` sets `last_free_draw_at` on free-draw + clears `paid_through_at` on paid-session first card; `my_sea_paid_draw` preserves row + stamps `paid_through_at`.
JS:
- `apps/epic/static/apps/epic/stage-card.js` — `fromDataset` reads `reversal_drops_qualifier`; `populateCard` branches Pattern B / B' for the reversal face.
- `apps/gameboard/static/apps/gameboard/game-kit.js` — mirrors `_polarity` onto `.tarot-fan-wrap` so SCSS can invert the fan-stage-block bg per active card.
Templates:
- `templates/apps/billboard/my_sign.html` — JS drops `_toggleOrientation()` on saved-sig load; sig-card grid carries `data-reversal-drops-qualifier`.
- `templates/apps/billboard/_partials/_applet-my-sign.html` — drops `stage-card--reversed`, adds polarity modifier, renders qualifier via `sig_face` payload, always shows Emanation keywords + label.
- `templates/apps/gameboard/_partials/_applet-my-sea.html` — renders qualifier via `slot.face` payload (Pattern B/B' aware).
- `templates/apps/gameboard/_partials/_sig_select_overlay.html` + `_tarot_fan.html` — `data-reversal-drops-qualifier` added to sig-card grid + fan cards.
- `templates/apps/gameboard/my_sea.html` — landing button form swaps to `show_paid_draw` / `show_gate_view` flags.
SCSS:
- `static_src/scss/_billboard.scss` — My Sign applet card polarity inversion (levity bg + ink), polarity stat-block inversion (gravity → --secUser bg), qualifier+title shared typography, polarity-aware ink via `color: inherit`.
- `static_src/scss/_card-deck.scss` — sea-stat-block polarity rules (`.sea-stage--gravity/levity .sea-stat-block`), fan-stage-block polarity rules (`.tarot-fan-wrap[data-polarity] .fan-stage-block`), comments documenting fallback bgs.
- `static_src/scss/_gameboard.scss` — `.my-sea-slot--filled.--gravity/--levity` pin `color: inherit` on `.fan-card-corner`, `.fan-card-qualifier`, `.fan-card-name`, `.fan-card-arcana` (0,3,0 beats global 0,2,0). Slot label keeps original wrap-sibling placement w. `z-index: 2` to render above the dotted bottom border on empty slots.
Tests:
- `apps/billboard/tests/integrated/test_views.py` — updated `test_my_sign_applet_renders_card_when_sig_set` to assert polarity modifier + qualifier text + Emanation-only; new `test_my_sign_applet_renders_gravity_qualifier_when_not_reversed`.
- `apps/epic/tests/unit/test_models.py` — `TarotCardAppletFaceTest` (Pattern B name swap, Pattern B' qualifier drop, non-Major regression pin, polarity-split, reversal qualifier fallback).
- `apps/gameboard/tests/integrated/test_views.py` — `MySeaCooldownAnchoredToFreeDrawTest` (5 tests pinning cooldown anchor on User, sticky PAID DRAW, paid-through credit consumption); `UserFreeDrawCooldownPropertyTest` (4 tests); expanded `MySeaPhasePickerQueryParamTest` w. paid-through-shows-PAID-DRAW-btn assertion; expanded `my_sea_lock` tests (free-draw-anchors-last_free_draw_at, paid-draw-leaves-anchor-alone, first-paid-card-consumes-credit); My Sea applet qualifier IT (Major comma format end-to-end).
- `functional_tests/test_game_my_sea.py` — `test_paid_draw_commits_token_and_redirects_to_picker` updated to assert row preservation + paid_through_at stamping; new `test_paid_draw_btn_persists_after_navigation_without_card_draw` pinning the user-reported regression.
Code architected by Disco DeDisco <discodedisco@outlook.com>
Git commit message Co-Authored-By:
Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -194,8 +194,6 @@ body.page-gameboard {
|
||||
// FREE DRAW btn — centered in the hex, mirrors SCAN SIGN's 2-line
|
||||
// font sizing so "FREE/DRAW" sits cleanly inside the 4rem circle.
|
||||
#id_draw_sea_btn {
|
||||
font-size: 0.75rem;
|
||||
line-height: 1.1;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
@@ -655,17 +653,26 @@ body.page-gameboard {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
|
||||
// `gap: 0` so qualifier sits directly above the title at the
|
||||
// title's own line-height (no flex gap between them); `.fan-card-
|
||||
// arcana` carries its own margin-top to restore breathing room
|
||||
// between title block and arcana label.
|
||||
.fan-card-face {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.2rem;
|
||||
gap: 0;
|
||||
text-align: center;
|
||||
padding: 0 0.2rem;
|
||||
}
|
||||
|
||||
// Qualifier + title share the same typography (per `_card-deck.scss`
|
||||
// convention at lines 568-572 / 1821-1823) — both bold, same size,
|
||||
// same wrap, same line-height. Color inherits from the slot's
|
||||
// polarity-driven `color:` (set on `--gravity` / `--levity`).
|
||||
.fan-card-qualifier,
|
||||
.fan-card-name {
|
||||
margin: 0;
|
||||
font-size: calc(var(--slot-w) * 0.105);
|
||||
@@ -673,9 +680,10 @@ body.page-gameboard {
|
||||
line-height: 1.15;
|
||||
text-wrap: balance;
|
||||
}
|
||||
.fan-card-qualifier:empty { display: none; }
|
||||
|
||||
.fan-card-arcana {
|
||||
margin: 0;
|
||||
margin: calc(var(--slot-w) * 0.05) 0 0;
|
||||
font-size: calc(var(--slot-w) * 0.07);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.06em;
|
||||
@@ -685,35 +693,31 @@ body.page-gameboard {
|
||||
|
||||
// Filled slot polarity — mirrors `.sea-card-slot--gravity` / `--levity`
|
||||
// in `_card-deck.scss:1332-1341`. Gravity = priUser bg + quiUser text;
|
||||
// levity = inverted (secUser bg + priUser text). Explicit
|
||||
// `.fan-card-name { color: ... }` override is required: the global
|
||||
// `.fan-card-name` rule in `_card-deck.scss:569-570` hardcodes
|
||||
// --quiUser, which is invisible on the levity --secUser bg (both
|
||||
// light variants). Setting it back to --priUser here restores
|
||||
// contrast. Corner-rank + arcana inherit from the slot's `color`
|
||||
// (no global override) so they follow polarity automatically.
|
||||
// levity = inverted (secUser bg + priUser text). `.fan-card-name`,
|
||||
// `.fan-card-qualifier`, `.fan-card-corner` + `.fan-card-arcana` all
|
||||
// pin `color: inherit` so they pick up the slot's polarity color
|
||||
// uniformly — the global `.fan-card-face .fan-card-name { color:
|
||||
// --terUser }` rule in `_card-deck.scss:376-383` loads AFTER gameboard
|
||||
// (per `core.scss` import order) and otherwise wins at matching 0,2,0
|
||||
// specificity, stranding the title at --terUser while the qualifier
|
||||
// inherits the slot color. Explicit `inherit` here at 0,3,0 beats it.
|
||||
.my-sea-slot--filled.my-sea-slot--gravity {
|
||||
background: rgba(var(--priUser), 1);
|
||||
color: rgba(var(--quiUser), 1);
|
||||
border-color: rgba(var(--secUser), 0.6);
|
||||
.fan-card-corner { color: inherit; }
|
||||
.fan-card-qualifier { color: inherit; }
|
||||
.fan-card-name { color: inherit; }
|
||||
.fan-card-arcana { color: inherit; opacity: 0.6; }
|
||||
}
|
||||
.my-sea-slot--filled.my-sea-slot--levity {
|
||||
background: rgba(var(--secUser), 1);
|
||||
color: rgba(var(--priUser), 1);
|
||||
border-color: rgba(var(--priUser), 1);
|
||||
// `.fan-card-corner` carries a global `color: rgba(var(--secUser),
|
||||
// 0.75)` rule in `_card-deck.scss:312-319` that out-specifics the
|
||||
// slot's inherited color (specificity 0,1,0 wins over inheritance).
|
||||
// On the levity --secUser bg this paints the corner-rank + suit-
|
||||
// icon in the same color as the background → invisible. Same trap
|
||||
// bit my-sign + game-kit earlier — fix is an explicit override at
|
||||
// matching/higher specificity inside the polarity rule.
|
||||
// `.fan-card-name` has its own `color: --quiUser` global rule
|
||||
// (`_card-deck.scss:569-570`); `.fan-card-arcana` inherits but pin
|
||||
// explicitly so a future global tweak can't silently re-break it.
|
||||
.fan-card-corner { color: rgba(var(--priUser), 1); }
|
||||
.fan-card-name { color: rgba(var(--priUser), 1); }
|
||||
.fan-card-arcana { color: rgba(var(--priUser), 0.7); }
|
||||
.fan-card-corner { color: inherit; }
|
||||
.fan-card-qualifier { color: inherit; }
|
||||
.fan-card-name { color: inherit; }
|
||||
.fan-card-arcana { color: inherit; opacity: 0.7; }
|
||||
}
|
||||
.my-sea-slot--filled.my-sea-slot--reversed { transform: rotate(180deg); }
|
||||
|
||||
@@ -732,13 +736,15 @@ body.page-gameboard {
|
||||
border-width: 0.15rem !important;
|
||||
}
|
||||
|
||||
// Label — pulled tight against the slot's bottom border + vertically
|
||||
// stretched via `scaleY(1.2)` to match the my_sea.html picker's
|
||||
// `.sea-pos-label` typography (re-appropriated from `.sea-stack-name`
|
||||
// in `_card-deck.scss:1671-1684`). Negative margin-top crosses the
|
||||
// 0.12rem border so the label's top edge overlaps the bottom edge of
|
||||
// the slot, per the user-locked spec ("practically overlapping").
|
||||
// Label — sibling of the slot inside the wrap, sits BELOW the slot
|
||||
// box (mirrors the my_sea.html picker's `.sea-pos-label` placement).
|
||||
// `margin-top: -0.15rem` crosses the slot's bottom border so the
|
||||
// label's top edge sits flush against it; `position: relative;
|
||||
// z-index: 2` keeps the label text rendering ATOP the slot's bottom
|
||||
// border (dotted for empty slots, solid for filled).
|
||||
.my-sea-slot-label {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
margin-top: -0.15rem;
|
||||
padding: 0 0.2rem;
|
||||
font-size: 0.65rem;
|
||||
@@ -749,7 +755,7 @@ body.page-gameboard {
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
line-height: 1.1;
|
||||
transform: scaleY(1.4);
|
||||
transform: scaleY(1.3);
|
||||
transform-origin: top center;
|
||||
}
|
||||
// `.my-sea-slot-label--empty` intentionally has NO per-state recolor
|
||||
|
||||
Reference in New Issue
Block a user