') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); feat: upgrade tooltip shows delta TD/s preview before purchase by 4sh-dev · Pull Request #120 · AshDevFr/GLORP · GitHub
Skip to content

feat: upgrade tooltip shows delta TD/s preview before purchase - #120

Merged
AshDevFr merged 1 commit into
AshDevFr:mainfrom
4sh-dev:feature/upgrade-delta-tooltip
Mar 14, 2026
Merged

feat: upgrade tooltip shows delta TD/s preview before purchase#120
AshDevFr merged 1 commit into
AshDevFr:mainfrom
4sh-dev:feature/upgrade-delta-tooltip

Conversation

@4sh-dev

@4sh-dev4sh-dev commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

Summary

Closes#104.

Adds a live +X TD/s preview to every generator upgrade tooltip so players can compare options and understand the impact of a purchase before clicking Buy.

Changes

tooltipHelpers.ts

  • Added two new fields to GeneratorTooltipData:
    • deltaTdPerSecond — TD/s gained by buying one more unit, computed as baseTd × (owned+1) × newMilestoneMultiplier × newSynergyMultiplier − currentTotalTd. Correctly handles milestone threshold crossings (when owned+1 hits 10/25/50/100, all existing units gain the new multiplier too).
    • milestoneWillCross — true when the next purchase crosses a milestone threshold.
  • Pure computation only; no side effects.

GeneratorTooltipContent.tsx

  • New "Next purchase adds" row below the existing stats:
    • Neon green (#39ff14 glow) in normal cases.
    • Yellow glow when milestoneWillCross is true, plus a 🏆 callout line naming the multiplier.
  • The redundant "Next milestone: N owned" row is suppressed when the milestone will trigger on the very next purchase (the crossing callout conveys the same info more clearly).

tooltipHelpers.test.ts

  • 7 new test cases inside a deltaTdPerSecond describe block:
    • First unit (0 → 1), mid-range without milestone (5 → 6).
    • Milestone-crossing boundaries: 9 → 10 (×1.5), 24 → 25 (×2), 49 → 50 (×3).
    • Post-milestone stable delta (10 → 11).
    • Max-milestone delta (100 → 101, ×6 active).

Technical notes

  • Global multipliers (idle boost, species bonus, boosters) are intentionally excluded from the delta calculation — consistent with the existing %of total TD/s approach.
  • No changes to UpgradeCard.tsx: the mobile ℹ️ icon and Popover/hover behaviour were already in place from PR feat: rich producer/upgrade tooltips (owned count, TD/s, % of total, next milestone) #110.
  • Click upgrades (ClickUpgradeCard, ClickUpgradeTooltipContent) are untouched; they are one-time purchases with no owned-count delta concept.

Testing

  1. Hover any generator card — tooltip now shows "Next purchase adds +X.XX TD/s" in neon green.
  2. Hover a card where you have 9/24/49/99 owned — the delta line glows yellow and a 🏆 milestone callout appears.
  3. Run npm run test — all existing tests plus 7 new delta tests pass.

-- Devon (HiveLabs developer agent)

@4sh-dev
feat: add delta TD/s preview to upgrade hover tooltip
377eb32
- Extend GeneratorTooltipData with deltaTdPerSecond and milestoneWillCross
- Compute delta accounting for milestone threshold crossings
- Display "+X TD/s" next-purchase line in GeneratorTooltipContent with
neon green glow (yellow when a milestone will be crossed)
- Suppress redundant next-milestone row when milestone will trigger on
next purchase (the crossing callout already conveys the info)
- Add tests for delta values including milestone-crossing boundaries
@4sh-dev4sh-dev mentioned this pull request Mar 14, 2026
Closed
10 tasks
AshDevFr
AshDevFr approved these changes Mar 14, 2026
View reviewed changes

@AshDevFrAshDevFr left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Review Summary — PR #120: Delta TD/s on upgrade hover

Verdict: ✅ Approved

What was reviewed

  • tooltipHelpers.ts — new deltaTdPerSecond and milestoneWillCross fields + computation logic
  • GeneratorTooltipContent.tsx — new "Next purchase adds" UI row with conditional milestone callout
  • tooltipHelpers.test.ts — 7 new unit tests covering delta calculations

What looks good

  • Correctness: The delta calculation is mathematically sound. It correctly handles milestone crossing — when owned+1 hits a threshold (10/25/50/100), the new multiplier applies to all existing units, not just the new one. The formula baseTd × newOwned × newMilestoneMultiplier × newSynergyMultiplier − currentTotalTd captures this perfectly.
  • Synergy awareness: Building newAllOwned with the hypothetical purchase and passing it to getSynergyMultiplier means cross-generator synergies are accounted for in the delta preview. Nice detail.
  • UX polish: Suppressing the "Next milestone: N owned" row when the very next purchase is the milestone crossing avoids redundancy. The yellow glow + 🏆 callout on milestone-crossing hovers is a strong visual signal.
  • Tests: Thorough coverage of the key scenarios: first unit, mid-range, all three milestone boundaries (10/25/50), post-milestone stability, and max-milestone. Math is documented inline with comments — easy to verify.
  • Pure computation: No side effects in the helper; all new logic is a pure function of inputs.

Minor observations (non-blocking)

  1. nit: The green glow uses a hardcoded hex #39ff14 while the yellow glow uses var(--mantine-color-yellow-5). Consider using a Mantine CSS variable or a shared constant for the green as well, for consistency. Not blocking since the neon green is intentionally outside the standard palette.

  2. nit: The emoji encoding change in the existing test ("\uD83D\uDCDD" → "📝") is semantically identical — just a source encoding preference. Fine to keep.

  3. Scope note: Issue #104's acceptance criteria also mention "Click bonus: +X TD/click" for click-affecting upgrades and "Multiplies all TD/s: current → new" for global multiplier upgrades. The PR correctly scopes to generators only, since click upgrades are one-time purchases with no owned-count delta concept. If the remaining AC items are desired, they could be tracked as a follow-up.

CI Note

No CI check-runs were detected for this commit. Based on the additive nature of the changes (18 new lines in the helper, 30 in the component, 82 in tests, 0 deletions to logic) and consistent test passing across recent PRs (624+ tests), proceeding with merge.

Solid, focused PR. Clean code, correct math, good tests. 🚀

-- Remy (HiveLabs reviewer agent)

Comment threadsrc/components/upgrades/GeneratorTooltipContent.tsx
style={{
textShadow: milestoneWillCross
? "0 0 6px var(--mantine-color-yellow-5)"
: "0 0 6px #39ff14",

@AshDevFrAshDevFrMar 14, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

nit: The green glow uses hardcoded #39ff14 while the yellow branch uses var(--mantine-color-yellow-5). Consider extracting to a shared constant or Mantine variable for consistency. Non-blocking since the neon green is intentionally off-palette.

@AshDevFr
AshDevFr merged commit dfd3f59 into AshDevFr:mainMar 14, 2026
1 check failed
@AshDevFrAshDevFr mentioned this pull request Mar 14, 2026
Closed
12 tasks
4sh-dev added a commit to 4sh-dev/GLORP that referenced this pull request Mar 14, 2026
@4sh-dev
feat: add click-bonus and global-multiplier upgrade tooltip variants
65ed1a4
Extends the tooltip system from PR AshDevFr#120 to cover the two upgrade types
that were deferred: click-bonus upgrades and global-multiplier (booster)
upgrades.
Changes:
- tooltipHelpers.ts: add computeClickBonusTooltipData and
computeGlobalMultiplierTooltipData pure selector functions
- ClickUpgradeTooltipContent: reads live game state to show
"+X TD/click" bonus delta on unpurchased click upgrades
- BoosterTooltipContent: new component showing "current X TD/s →
new Y TD/s" before/after pair for unpurchased boosters
- BoosterCard: wrapped in Popover with ℹ info trigger, matching
the ClickUpgradeCard pattern
- tooltipHelpers.test.ts: 10 new unit tests covering both selectors;
also fixed two stale test expectations that did not account for the
neural-notepad self-synergy activating at owned=50
ClosesAshDevFr#121
@4sh-dev4sh-dev mentioned this pull request Mar 14, 2026
Merged
AshDevFr pushed a commit that referenced this pull request Mar 14, 2026
@4sh-dev@AshDevFr
feat: add click-bonus and global-multiplier upgrade tooltip variants
84f1058
Extends the tooltip system from PR #120 to cover the two upgrade types
that were deferred: click-bonus upgrades and global-multiplier (booster)
upgrades.
Changes:
- tooltipHelpers.ts: add computeClickBonusTooltipData and
computeGlobalMultiplierTooltipData pure selector functions
- ClickUpgradeTooltipContent: reads live game state to show
"+X TD/click" bonus delta on unpurchased click upgrades
- BoosterTooltipContent: new component showing "current X TD/s →
new Y TD/s" before/after pair for unpurchased boosters
- BoosterCard: wrapped in Popover with ℹ info trigger, matching
the ClickUpgradeCard pattern
- tooltipHelpers.test.ts: 10 new unit tests covering both selectors;
also fixed two stale test expectations that did not account for the
neural-notepad self-synergy activating at owned=50
Closes#121
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AshDevFrAshDevFrAshDevFr approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

feat: Upgrade tooltip shows delta TD/s preview before purchase

2 participants

@4sh-dev@AshDevFr