From 27ffa33d7c93dc98e5f369d9d07dcfccce44093a Mon Sep 17 00:00:00 2001 From: jvanvik Date: Mon, 9 Nov 2026 22:48:09 +0100 Subject: [PATCH] Dark mode: red text and the market's heat tags read on the dark panels (#80) Red warning text used var(--bad), 3.8 to 4.8:1 on the dark cards and tints. Every text use now takes var(--tx-red,var(--bad)): light mode keeps --bad, dark gets #FF8E9B (5.65:1 or better on paper, soft and every tint). --bad stays the fill under white letters (buttons, counters, bars). Lambda Bazaar's Hot and Cool tags kept their light pastel chips at night. They now use the dark tints (--tint-o, --tint-b) with --tx-amber and a new --tx-blue, keeping the same colours by day. The dark-mode test checks the tags, the text tokens on every dark card, that no tag keeps a bare pastel fill, and that no red text in --bad is left in the styles or the game's markup. --- CHANGELOG.md | 1 + src/game/60-features/37-customer-paths.js | 4 +- src/game/60-features/99-pie-subsidies.js | 8 ++-- src/game/70-rules/50-peering-policy.js | 2 +- src/game/80-simulation/60-requirements.js | 2 +- .../80-simulation/75-customer-lifecycle.js | 2 +- .../80-simulation/90-sites-and-service.js | 2 +- src/game/90-actions/91-slots.js | 2 +- src/game/93-ui/40-hud-and-panels.js | 4 +- src/game/93-ui/50-city-panel.js | 12 ++--- src/game/93-ui/60-decommission.js | 2 +- src/game/93-ui/70-link-panels.js | 10 ++--- src/game/93-ui/72-express.js | 2 +- src/game/94-dashboard/10-progress.js | 2 +- src/game/94-dashboard/30-customers.js | 4 +- src/game/94-dashboard/50-lease-swaps.js | 2 +- src/game/94-dashboard/55-market.js | 2 +- src/game/94-dashboard/60-dashboard.js | 2 +- src/game/94-dashboard/70-bank.js | 6 +-- src/game/94-dashboard/72-address-space.js | 2 +- src/styles/05-theme.css | 5 ++- src/styles/10-hud.css | 2 +- src/styles/38-pie-globe.css | 2 +- src/styles/40-modal.css | 6 +-- src/styles/70-puzzles.css | 8 ++-- src/styles/71-architect.css | 2 +- tests/dark-mode.test.js | 44 ++++++++++++++++++- 27 files changed, 93 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf6cc92..b7481d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- In dark mode, red warning text is now a lighter red that reads well on the dark panels, and the capacity market's Hot and Cool tags take the night colours instead of staying bright pastel chips (#80). - The NOC dashboard's connections list no longer breaks when one of your fabric ports is already at 400G, the biggest a fabric port gets: it offers a LAG member instead of an upgrade. - Broadband cities can now go IPv6-only with 464XLAT, a second way to save IPv4 next to CGNAT. Start it from a city's Home broadband, which also says what it does to your monthly IPv4 bill: its home routers are swapped over a month or more, paid as each one goes in (new homes there get one too, at the same price), and the homes then need no IPv4 address of their own, only a share of a NAT64 pool at up to 256 homes per address, with fewer refunds than CGNAT at the same ratio. The bank's Address space section shows your homes as public, behind CGNAT and IPv6-only, with the NAT64 ratio next to the CGNAT one, and says which of the two to stretch when space runs out. - CGNAT gets a little cheaper every year: the world moves to IPv6 about two points a year, so less of your homes' traffic needs IPv4 and the CGNAT and NAT64 boxes carry less of it. diff --git a/src/game/60-features/37-customer-paths.js b/src/game/60-features/37-customer-paths.js index 670fe66..032457f 100644 --- a/src/game/60-features/37-customer-paths.js +++ b/src/game/60-features/37-customer-paths.js @@ -56,7 +56,7 @@ function circuitTargets(b){const G=pathEdges(),now=pathNow(b,G);if(!now)return { function pinRoute(p,edges){const path=[];for(let i=1;iCIDX[x]),share:1};} // Under a customer in the panels. function pathCtl(b){if(!pathKind(b))return ''; - const pin=b.pin?`
${tr('customer_paths.pinned_to_path',{path:esc(pathStr(b.pin))})}${pinUp(b)?'':` · ${tr('customer_paths.that_path_is_down')}`}
`:''; + const pin=b.pin?`
${tr('customer_paths.pinned_to_path',{path:esc(pathStr(b.pin))})}${pinUp(b)?'':` · ${tr('customer_paths.that_path_is_down')}`}
`:''; return `${pin}
${btn(tr('customer_paths.move_to_another_path'),'pathOpen',{id:b.id},'ghost sm')}
`;} function pathModal(b){const a=pathCity(b.city),z=pathCity(b.city2),k=pathKind(b);let h=`

${tr('customer_paths.move_name',{name:esc(b.name)})}

`; const row=(nm,meta,tag,button)=>`
${nm}${tag?` ${tag}`:''}
${meta?`
${meta}
`:''}
${button}
`; @@ -70,6 +70,6 @@ function pathModal(b){const a=pathCity(b.city),z=pathCity(b.city2),k=pathKind(b) if(now)h+=`
${tr('customer_paths.now_on')}${esc(pathStr(now))}
`; if(b.pin)h+=`
${btn(tr('customer_paths.let_routing_choose_again'),'pathAuto',{id:b.id},'ghost sm')}
`; if(!alts.length)h+=`

${tr('customer_paths.no_other_path',{a,b:z})}

`; - for(const t of alts){const warn=[t.room${tr('customer_paths.fits_only_g_of_bw',{g:fmtG(t.room),bw:fmtG(b.bw)})}`:'',b.latMax&&t.lat>b.latMax?`${tr('customer_paths.over_the_ms_budget',{ms:b.latMax})}`:''].filter(Boolean).join(' · '); + for(const t of alts){const warn=[t.room${tr('customer_paths.fits_only_g_of_bw',{g:fmtG(t.room),bw:fmtG(b.bw)})}`:'',b.latMax&&t.lat>b.latMax?`${tr('customer_paths.over_the_ms_budget',{ms:b.latMax})}`:''].filter(Boolean).join(' · '); h+=row(esc(pathStr(t.p)),tr('customer_paths.path_facts',{km:Math.round(t.km).toLocaleString(),ms:t.lat.toFixed(1)})+(warn?' · '+warn:''),t.shared?trn('customer_paths.shares_n_spans',t.shared):tr('customer_paths.fully_diverse'),btn(tr('customer_paths.move'),'pathPin',{id:b.id,via:t.p.join()},'sm'));}} openModal(h);} diff --git a/src/game/60-features/99-pie-subsidies.js b/src/game/60-features/99-pie-subsidies.js index 703a46b..21949af 100644 --- a/src/game/60-features/99-pie-subsidies.js +++ b/src/game/60-features/99-pie-subsidies.js @@ -106,13 +106,13 @@ function pieGovHtml(){const P=S.pie,G=P.gov,can=pieCanBuild();let h=`
${PIE_RDF_BIDS.map(f=>btn(tr('pie_gov.ask',{mo:fmt$(Math.round(a.ask*f))}),'pieBid',{id:a.id,f},a.bid===f?'pink sm':'ghost sm',!can)).join('')}
`; if(!G.auc.length)h+=`

${tr('pie_gov.no_auction')}

`; for(const w of G.aw){const s=pieRdfSrv(w.city),ok=s>=PIE_RDF_NEED; - h+=`
${esc(CITY[w.city].name)} · ${tr('common.price_mo',{price:fmt$(w.mo)})}${tr('pie_gov.served',{p:pct(s)})}
-
${S.day'+tr('pie_gov.warned')+'':''}
`;} + h+=`
${esc(CITY[w.city].name)} · ${tr('common.price_mo',{price:fmt$(w.mo)})}${tr('pie_gov.served',{p:pct(s)})}
+
${S.day'+tr('pie_gov.warned')+'':''}
`;} h+=`
🇵🇳 ${tr('pie_gov.pitcairn')}

${tr('pie_gov.pitcairn_note',{mo:fmt$(GRANT_MO),sky:fmt$(GRANT_SKY_MO)})}

${grantFact('pcn')}
`; const l=pieEximLoan(),o=G.ex;h+=`
🏦 ${tr('pie_gov.exim')}
`; if(l){const q=l.pie;h+=`
${tr('common.still_owed')}${fmt$(l.bal)}
${loanLine(l)}
-
${pieEximLaunchOk(l)?'✓':'✗'} ${esc(covLabel('pielaunch',l))}
-
${pieEximDishOk(l)?'✓':'✗'} ${esc(covLabel('piedish',l))}
`;} +
${pieEximLaunchOk(l)?'✓':'✗'} ${esc(covLabel('pielaunch',l))}
+
${pieEximDishOk(l)?'✓':'✗'} ${esc(covLabel('piedish',l))}
`;} else if(o){const pay=Math.round(annuity(o.amt,o.apr,o.term));h+=`

${tr('pie_gov.exim_offer',{amt:fmt$(o.amt),apr:(o.apr*100).toFixed(1),n:o.term,pay:fmt$(pay)})}

• ${tr('pie_gov.cov_launch',{n:o.n,d:dateStr(S.day+PIE_EXIM_BY)})}
• ${tr('pie_gov.cov_dish',{a:esc(pieLicCountry(o.cc))})}

${tr('pie_gov.exim_breach',{apr:(PIE_EXIM_PEN*100).toFixed(0)})}

${btn(tr('bank.take_the_money'),'pieExim',{},'pink sm',!can)}
`;} diff --git a/src/game/70-rules/50-peering-policy.js b/src/game/70-rules/50-peering-policy.js index 93e1913..c11b02a 100644 --- a/src/game/70-rules/50-peering-policy.js +++ b/src/game/70-rules/50-peering-policy.js @@ -16,7 +16,7 @@ function snub(id,c){ /* Remote peering: offered, but discouraged. A reseller marks up the port, oversubscribes it, and many selective networks refuse members who are not physically in the building. */ const REMOTE_FEE=1.5,REMOTE_CAP=0.8; -const REMOTE_WARN=`

${tr('peering_policy.remote_peering_is_a_last_resort')}

`; +const REMOTE_WARN=`

${tr('peering_policy.remote_peering_is_a_last_resort')}

`; const REMOTE_WHY=[tr('peering_policy.policy_no_remote_peers_be_in'),tr('peering_policy.saw_your_session_come_in_over'),tr('peering_policy.only_peers_with_members_they_can'),tr('peering_policy.their_pearingdb_entry_says_remote'),tr('peering_policy.tried_a_remote_peer_once_it')]; function isRemote(c){return S.ixp[c]!==undefined&&!S.pops[ixCity(c)]&&!S.myIx[c];} function noRemote(id){const n=NET[id];if(!n||n.pol!=='selective')return false;return hstr(id+'|remote')%100<(n.share>=0.03?60:30);} diff --git a/src/game/80-simulation/60-requirements.js b/src/game/80-simulation/60-requirements.js index 1da5793..978bdb3 100644 --- a/src/game/80-simulation/60-requirements.js +++ b/src/game/80-simulation/60-requirements.js @@ -32,7 +32,7 @@ function terrestrialPath(a,b){if(TERR&&TERR.S===S){if(TERR.gen!==RW.gen||!TERR.m const reqOk=b=>(b.reqs||[]).every(k=>REQS[k]&&REQS[k].ok(b)); // Some requirements only make sense for some customers: nobody can reach another continent without getting wet. const reqCan=(k,b)=>!REQS[k].can||REQS[k].can(b); -function reqList(o){return (o.reqs||[]).map(k=>{const ok=REQS[k].ok(o),lab=typeof REQS[k].l==='function'?REQS[k].l(o):REQS[k].l;return `
${ok?'✓':'✗'} ${esc(lab)}
`;}).join('');} +function reqList(o){return (o.reqs||[]).map(k=>{const ok=REQS[k].ok(o),lab=typeof REQS[k].l==='function'?REQS[k].l(o):REQS[k].l;return `
${ok?'✓':'✗'} ${esc(lab)}
`;}).join('');} /* diversePaths(): a shortest path by hops over the live links (and VXCs to remote cities), then another one that shares none of its risks. divGraph() numbers the cities and the risks and lists each city's links once, in list order, as disjointOn() reads them; divOn() asks it, so many pairs on one network (spots0(), opsDecomSafe()) share one graph. The diff --git a/src/game/80-simulation/75-customer-lifecycle.js b/src/game/80-simulation/75-customer-lifecycle.js index 8e5aab6..8add751 100644 --- a/src/game/80-simulation/75-customer-lifecycle.js +++ b/src/game/80-simulation/75-customer-lifecycle.js @@ -129,7 +129,7 @@ function clPanel(){const C=S.cl||{mo:[]},mo=C.mo.slice(-12);const soon=S.biz.fil const sum=k=>mo.reduce((a,e)=>a+(k==='lost'?Object.values(e.lost).reduce((x,y)=>x+y,0):e[k]||0),0),why={};for(const e of mo)for(const k in e.lost)why[k]=(why[k]||0)+e.lost[k]; let h=`

${tr('lifecycle.won_and_lost')}

${tr('lifecycle.won_and_lost_note')}

${tr('lifecycle.won')}
${sum('won')}
${tr('lifecycle.last_12_months')}
-
${tr('lifecycle.lost')}
${sum('lost')}
${trn('lifecycle.n_grew',sum('grew'))}
+
${tr('lifecycle.lost')}
${sum('lost')}
${trn('lifecycle.n_grew',sum('grew'))}
${tr('lifecycle.renewals_soon')}
${soon}
${tr('lifecycle.next_30_days')}
${tr('lifecycle.bandwidth_market')}
${Math.round(mkt()*100)}
${mktTxt()}
`; if(mo.length){const max=Math.max(1,...mo.map(e=>Math.max(e.won,Object.values(e.lost).reduce((x,y)=>x+y,0)))),W=600,H=120,mid=H/2,bw=W/12; diff --git a/src/game/80-simulation/90-sites-and-service.js b/src/game/80-simulation/90-sites-and-service.js index 9b1fea6..5e73eab 100644 --- a/src/game/80-simulation/90-sites-and-service.js +++ b/src/game/80-simulation/90-sites-and-service.js @@ -16,7 +16,7 @@ function waveOk(a,b,i){return [a,b].every(c=>i<=RG[S.pops[c]?(S.pops[c].rgen||0) function waveNeed(i){const g=RG.find(r=>r.maxLT>=i);return g?tr('sites_and_service.pn_routers',{pn:g.pn}):'?';} function routerModels(c){const p=S.pops[c],g=p.rgen||0,rt=p.routers||1; return `
${RG.map((M,i)=>{if(i===g)return '';const why=modelFits(c,i),lk=!techOk('rg',i,M.lvl); - return `
${esc(M.n)} ${M.pn} · ${tr('sites_and_service.n_ports',{n:M.ports})} · ${fmtG(M.cap)} · ${tr('sites_and_service.boots_in_n_min',{n:M.boot})}${M.flaky?' · '+tr('common.crashes_more'):''}
${esc(M.blurb)}
${coreMeta(i)}${coreOn()&&coreRun()>0&&!rgCore(i,coreRun())?' · '+tr('core.can_t_run_your_lv',{lv:tr(CORE_LV[coreRun()])})+'':''}
${why?`
${esc(why)}
`:''}
${lk?demoBtn('rg',i,M.lvl,tr('sites_and_service.level_n',{n:M.lvl}),'sm'):btn(tr('sites_and_service.swap_cost_mo_mo',{cost:fmt$(swapCost(c,i)),mo:fmt$(M.mo*rt)}),'upRouter',{city:c,g:i},'sm',!!why||S.cash`;}).join('')}
`;} + return `
${esc(M.n)} ${M.pn} · ${tr('sites_and_service.n_ports',{n:M.ports})} · ${fmtG(M.cap)} · ${tr('sites_and_service.boots_in_n_min',{n:M.boot})}${M.flaky?' · '+tr('common.crashes_more'):''}
${esc(M.blurb)}
${coreMeta(i)}${coreOn()&&coreRun()>0&&!rgCore(i,coreRun())?' · '+tr('core.can_t_run_your_lv',{lv:tr(CORE_LV[coreRun()])})+'':''}
${why?`
${esc(why)}
`:''}
${lk?demoBtn('rg',i,M.lvl,tr('sites_and_service.level_n',{n:M.lvl}),'sm'):btn(tr('sites_and_service.swap_cost_mo_mo',{cost:fmt$(swapCost(c,i)),mo:fmt$(M.mo*rt)}),'upRouter',{city:c,g:i},'sm',!!why||S.cash`;}).join('')}
`;} function portNote(c){const p=S.pops[c];if(!p)return '';const g=p.rgen||0;return RG[g].maxP${tr('sites_and_service.your_model_here_tops_out_at',{model:esc(RG[g].n),pn:RG[g].pn})}

`:'';} // Service: what you deliver, times how it feels. Traffic backhauled far to transit is slow, and users notice. const latSlow=c=>!!(R&&R.latF&&R.latF[c]<0.97&&R.latFar[c]); diff --git a/src/game/90-actions/91-slots.js b/src/game/90-actions/91-slots.js index 3aeca48..17aab37 100644 --- a/src/game/90-actions/91-slots.js +++ b/src/game/90-actions/91-slots.js @@ -11,7 +11,7 @@ Object.assign(ACT,{ slotMenu:({id})=>{const h=slotMenuHtml(id);if(h)openModal(h);}, slotExport:({id})=>exportSlot(id), slotDel:({id,back})=>{const e=slotIdx().find(x=>x.id===id);if(!e)return; - openModal(`

${tr('slots.delete_name',{name:esc(e.name||tr('common.unnamed_network'))})}

${tr('game_and_settings.name_and_everything_it_owns_will',{name:esc(e.name||tr('common.unnamed_network'))})}

${slotBusy(id)?`

${tr('slots.it_is_open_in_another_window')}

`:''}
${btn(tr('slots.delete_forever'),'slotDelGo',{id,back},'red big')}${btn(tr('slots.keep_it'),back==='space'?'slotSpace':'slotBack',{},'ghost big')}
`);}, + openModal(`

${tr('slots.delete_name',{name:esc(e.name||tr('common.unnamed_network'))})}

${tr('game_and_settings.name_and_everything_it_owns_will',{name:esc(e.name||tr('common.unnamed_network'))})}

${slotBusy(id)?`

${tr('slots.it_is_open_in_another_window')}

`:''}
${btn(tr('slots.delete_forever'),'slotDelGo',{id,back},'red big')}${btn(tr('slots.keep_it'),back==='space'?'slotSpace':'slotBack',{},'ghost big')}
`);}, slotDelGo:({id,back})=>{if(!slotIdx().some(e=>e.id===id))return; if(id===UI.slot){ACT.newgame();return;} slotDrop(id);try{BC&&BC.postMessage({t:'gone',id});}catch(e){}sfx('click'); diff --git a/src/game/93-ui/40-hud-and-panels.js b/src/game/93-ui/40-hud-and-panels.js index 43b4c16..59db7bc 100644 --- a/src/game/93-ui/40-hud-and-panels.js +++ b/src/game/93-ui/40-hud-and-panels.js @@ -11,12 +11,12 @@ function renderHUD(){ if(pzOn()){$('hName').textContent=pzName(pzDef(S.pz.id)||S.pz);$('hAsn').textContent=tr('puzzles.puzzle');renderTabbar();return;} {const rt=ruleTag(),ha=$('hAsn');ha.title=rt?tr('rules.rules_are_locked_for_this_network',{rules:rt}):'';} $('hName').textContent=S.name;$('hAsn').textContent='AS'+S.asn+(S.mode==='sandbox'||ruleTag()&&!S.scn?' · '+ruleTag():S.scn?' · '+(scnName())+(S.scn.done||S.scn.failed?'':` · ${tr('ui.n_d_left',{n:Math.max(0,S.scn.days-S.day)})}`):''); - $('hCash').textContent=fmt$(S.cash);$('hCash').style.color=S.cash<0?'var(--bad)':''; + $('hCash').textContent=fmt$(S.cash);$('hCash').style.color=S.cash<0?'var(--tx-red,var(--bad))':''; const net=R.revMo-R.costMo;$('hRate').innerHTML=`${net>=0?'▲':'▼'} ${tr('common.price_mo',{price:fmt$(Math.abs(net))})}`; $('hTraffic').textContent=`${fmtG(R.served)}`; $('hTrafBar').style.width=(R.demand?R.served/R.demand*100:0)+'%'; $('hTrafBar').style.background=R.demand&&R.served/R.demand<0.9?'var(--bad)':'var(--ok)'; - $('hReach').textContent=reachPct(R.reach);$('hReach').style.color=R.reach<0.99?'var(--bad)':'var(--eye)'; + $('hReach').textContent=reachPct(R.reach);$('hReach').style.color=R.reach<0.99?'var(--tx-red,var(--bad))':'var(--eye)'; $('hTier').textContent=tierLabel()+' · '+tr('hud_and_panels.lv_n',{n:S.lvl||1}); {const P=scnProg(),hs=$('hScn');hs.hidden=!P;if(P){const sc=S.scn;$('hScnVal').textContent=sc.done?tr('common.done'):sc.failed?tr('common.time_s_up'):`${Math.round(P.f*100)}% · ${tr('ui.n_d_left',{n:Math.max(0,sc.days-S.day)})}`;}} $('hDate').textContent=dateStr(S.day); diff --git a/src/game/93-ui/50-city-panel.js b/src/game/93-ui/50-city-panel.js index 7d164aa..44708c2 100644 --- a/src/game/93-ui/50-city-panel.js +++ b/src/game/93-ui/50-city-panel.js @@ -22,14 +22,14 @@ function cityPanel(c){ h+=`
`; if(C.cn&&UI.tab==='cust')h+=chinaSection(c); const sf=sfOf(R,c),dem=R.cityDem[c]||0; - if(down){const i=S.inc.filter(x=>x.ref===c&&POPDOWN.includes(x.type)).sort((a,b)=>b.until-a.until)[0];h+=`

${tr('city_panel.this_pop_is_down')}

${i?esc(i.msg):''} ${tr('city_panel.customers_here_get_nothing_until_it')}

${i&&i.cost?btn(`${esc(i.fix||tr('common.rush_repair'))} ${fmt$(i.cost)}`,'fixInc',{id:i.id},'red'):''}
`;} + if(down){const i=S.inc.filter(x=>x.ref===c&&POPDOWN.includes(x.type)).sort((a,b)=>b.until-a.until)[0];h+=`

${tr('city_panel.this_pop_is_down')}

${i?esc(i.msg):''} ${tr('city_panel.customers_here_get_nothing_until_it')}

${i&&i.cost?btn(`${esc(i.fix||tr('common.rush_repair'))} ${fmt$(i.cost)}`,'fixInc',{id:i.id},'red'):''}
`;} if(UI.tab==='cust'){ - {const nl=R.nodeLoad[c]||0,nc=R.nodeCap[c]||1;if(nl>=nc*0.95)h+=`

${tr('city_panel.router_maxed_out')}

${tr('city_panel.your_routers_here_are_forwarding',{load:fmtG(nl),cap:fmtG(nc)})}

${btn(tr('common.open_infra'),'tab',{t:'links'},'pink sm')}
`;} + {const nl=R.nodeLoad[c]||0,nc=R.nodeCap[c]||1;if(nl>=nc*0.95)h+=`

${tr('city_panel.router_maxed_out')}

${tr('city_panel.your_routers_here_are_forwarding',{load:fmtG(nl),cap:fmtG(nc)})}

${btn(tr('common.open_infra'),'tab',{t:'links'},'pink sm')}
`;} h+=`

${tr('common.home_broadband')}

`; if(!p.bb){const s=bbStart(c);h+=`

${tr('city_panel.sell_internet_to_homes_here_starts',{start:fmtG(s),max:fmtG(eyeP(c)),rate:fmt$(EYE_RATE*arpuOf(c))})}${C.au?` ${scnRule('levy')?tr('city_panel.it_runs_on_your_own_fibre',{pct:pct(AU_LEVY)}):tr('city_panel.the_nearly_broadband_network_keeps',{pct:pct(AU_WHOLESALE)})}`:''}

${btn(tr('city_panel.launch_broadband_cost',{cost:fmt$(bbCost(c))}),'launchBB',{city:c},'pink big',S.cash${tr('common.eyeball_demand')}${tr('city_panel.a_of_b',{a:fmtG(eye),b:fmtG(eyeP(c))})}
-
${tr('city_panel.served_in_city',{city:C.name})}${pct(sf)}
+
${tr('city_panel.served_in_city',{city:C.name})}${pct(sf)}
${tr('common.revenue')}${tr('common.price_mo',{price:fmt$(eye*sf*EYE_RATE*arpuOf(c))})}
${tr('city_panel.network_wide_peering_ratio')}${pct(R.peerShare||0)}

${tr('city_panel.more_traffic_over_peering_pnis_and')}

${sf<0.9?`

${tr('city_panel.customers_are_unhappy_and_leaving')}

`:''} @@ -37,7 +37,7 @@ function cityPanel(c){ h+=`

${tr('common.business_customers')}

`; const bz=S.biz.filter(b=>bCities(b).includes(c)); if(!bz.length)h+=`

${tr('city_panel.no_businesses_yet_offers_pop_up')}

`; - for(const b of bz)h+=`
${esc(b.name)}
${esc(BIZ_T[b.type].l)}${b.city2?` ${CITY[b.city].name} ⇄ ${CITY[b.city2].name}`:''} · ${bTerms(b)}${clTermTxt(b)?' · '+clTermTxt(b):''}${BIZ_T[b.type].l2?` · ${b.sites?tr('city_panel.carrying_g_per_site',{g:fmtG(R.l2[b.id]||0)}):tr('city_panel.carrying_g',{g:fmtG(R.l2[b.id]||0)})}`:''}${BIZ_T[b.type].fiber&&!fiberOk(b)?' · '+tr('city_panel.fiber_is_down')+'':''}${BIZ_T[b.type].event&&eventLive(b)?` · ${tr('city_panel.serving_v',{v:pct(sfOf(R,b.city))})}`:''}${b.type==='scrub'&&!hasScrub()?' · '+tr('common.needs_a_scrubbing_center')+'':''}${S.day-(b.since||0)<15?` · ${tr('common.provisioning_n_d_grace',{n:15-(S.day-(b.since||0))})}`:''}
${bRisk(b)}${reqList(b)}${BIZ_T[b.type].l2?routeCtl(b):''}${pathCtl(b)}
${tr('common.happiness_p',{p:Math.round(b.mood)})}
${btn(UI.confirm===b.id?tr('common.really_drop'):tr('common.drop'),'dropBiz',{id:b.id},'ghost sm')}
`; + for(const b of bz)h+=`
${esc(b.name)}
${esc(BIZ_T[b.type].l)}${b.city2?` ${CITY[b.city].name} ⇄ ${CITY[b.city2].name}`:''} · ${bTerms(b)}${clTermTxt(b)?' · '+clTermTxt(b):''}${BIZ_T[b.type].l2?` · ${b.sites?tr('city_panel.carrying_g_per_site',{g:fmtG(R.l2[b.id]||0)}):tr('city_panel.carrying_g',{g:fmtG(R.l2[b.id]||0)})}`:''}${BIZ_T[b.type].fiber&&!fiberOk(b)?' · '+tr('city_panel.fiber_is_down')+'':''}${BIZ_T[b.type].event&&eventLive(b)?` · ${tr('city_panel.serving_v',{v:pct(sfOf(R,b.city))})}`:''}${b.type==='scrub'&&!hasScrub()?' · '+tr('common.needs_a_scrubbing_center')+'':''}${S.day-(b.since||0)<15?` · ${tr('common.provisioning_n_d_grace',{n:15-(S.day-(b.since||0))})}`:''}
${bRisk(b)}${reqList(b)}${BIZ_T[b.type].l2?routeCtl(b):''}${pathCtl(b)}
${tr('common.happiness_p',{p:Math.round(b.mood)})}
${btn(UI.confirm===b.id?tr('common.really_drop'):tr('common.drop'),'dropBiz',{id:b.id},'ghost sm')}
`; h+=`
`+offersHere(c); }else if(UI.tab==='up'){ h+=portNote(c)+latNote(c); @@ -47,7 +47,7 @@ function cityPanel(c){ for(const n of prov){const t=S.transit.find(x=>x.city===c&&x.net===n.id);const pr=transitPerG(n,c,premOnlyAt(n,c)||!!(t&&premOn(t)))*S.priceMul; h+=`
${logo(n)}
${esc(n.name)} ${TYPE_L[n.type]}
${tr('city_panel.price_per_gbps_month_billed_on',{price:pr.toFixed(2)})}
${premOnlyAt(n,c)&&!t?`
${tr('city_panel.only_the_cn_too_premium_crossing')}
`:''}`; if(t){const u=R.useT[t.id]||0,cap=lagCap(PORT[t.tier].g,t.n),tdown=t.down>S.day; - h+=`
${lagName(t.tier,t.n)}${tdown?' · '+tr('common.outage')+'':''}${fmtG(u)}
${prefCtl('t',t.id,t.pref)}${carryCtl(t)}${siteCtl('t',t.id,c,t.site)}${premOnlyAt(n,c)?`

${tr('city_panel.only_the_cn_too_premium_crossing')}

`:premCity(n,c)?`
${btn(t.premium?tr('city_panel.cn_too_premium_on'):tr('city_panel.switch_to_cn_too_premium_x',{x:n.premium}),'togglePrem',{id:t.id},t.premium?'green sm':'sm')}
`:''}${(()=>{const top=transitTop([t.id],4);return top.length?`
${tr('city_panel.top_destinations_on_this_port')}
${top.map(([id,v])=>`
${esc(NET[id].name)} · ${fmtG(v)} · ${esc(offTransitHint(id,c))}
`).join('')}
`:'';})()}
${tr('city_panel.95th_pct_p95_commit_commit_bill',{p95:fmtG(R.p95[t.id]||0),commit:fmtG(cap*.2),bill:fmt$(Math.max(R.p95[t.id]||0,PORT[t.tier].g*(t.n||1)*.2)*pr+PORT[t.tier].tmo*(t.n||1))})}
+ h+=`
${lagName(t.tier,t.n)}${tdown?' · '+tr('common.outage')+'':''}${fmtG(u)}
${prefCtl('t',t.id,t.pref)}${carryCtl(t)}${siteCtl('t',t.id,c,t.site)}${premOnlyAt(n,c)?`

${tr('city_panel.only_the_cn_too_premium_crossing')}

`:premCity(n,c)?`
${btn(t.premium?tr('city_panel.cn_too_premium_on'):tr('city_panel.switch_to_cn_too_premium_x',{x:n.premium}),'togglePrem',{id:t.id},t.premium?'green sm':'sm')}
`:''}${(()=>{const top=transitTop([t.id],4);return top.length?`
${tr('city_panel.top_destinations_on_this_port')}
${top.map(([id,v])=>`
${esc(NET[id].name)} · ${fmtG(v)} · ${esc(offTransitHint(id,c))}
`).join('')}
`:'';})()}
${tr('city_panel.95th_pct_p95_commit_commit_bill',{p95:fmtG(R.p95[t.id]||0),commit:fmtG(cap*.2),bill:fmt$(Math.max(R.p95[t.id]||0,PORT[t.tier].g*(t.n||1)*.2)*pr+PORT[t.tier].tmo*(t.n||1))})}
${PORT.map((P2,i)=>i>t.tier&&portShown(i)?btn((t.n||1)>1?tr('common.upgrade_all_to_port_cost_mo',{port:P2.n,cost:fmt$(P2.setup*(t.n||1)),mo:fmt$(P2.tmo*(t.n||1))}):tr('common.upgrade_port_cost_mo_mo',{port:P2.n,cost:fmt$(P2.setup*(t.n||1)),mo:fmt$(P2.tmo*(t.n||1))}),'buyTransit',{city:c,net:n.id,tier:i},'sm',S.cash0?btn(tr('link_panels.downgrade_port_price',{port:PORT[t.tier-1].n,price:portMo(PORT[t.tier-1].tmo*(t.n||1))}),'downT',{id:t.id},'ghost sm'):''}${(t.n||1)1?btn(tr('common.member'),'lagT',{id:t.id,d:-1},'ghost sm'):''}${btn(t.clean?tr('city_panel.clean_pipe_on'):tr('city_panel.clean_pipe_mo_mo_scrubs_ddos',{mo:fmt$(cleanMo(t))}),'cleanPipe',{id:t.id},t.clean?'green sm':'sm')}${btn(UI.confirm===t.id?tr('common.really_cancel'):tr('common.cancel'),'cancelTransit',{id:t.id},'ghost sm')}
`;} else h+=`
${PORT.map((P2,i)=>portShown(i)?btn(tr('city_panel.port_cost_mo_mo',{port:P2.n,cost:fmt$(P2.setup),mo:fmt$(P2.tmo)}),'buyTransit',{city:c,net:n.id,tier:i},'sm',S.cash`; h+=`
`;} @@ -69,7 +69,7 @@ function cityPanel(c){ h+=`

${tr('common.routers')}

${tr('city_panel.the_model_sets_your_fastest')}

${rt} × ${esc(G.n)}
${tr('city_panel.up_to_pn_interfaces_ports_ports',{pn:G.pn,ports:G.ports,cap:fmtG(G.cap)})} · ${esc(G.blurb)}
${coreMeta(g)}
${coreOn()&&coreRun()>0&&!inCore(c)?`
${tr('core.this_router_can_t_run_your',{lv:tr(CORE_LV[coreRun()])})}
`:''}
${tr('common.router_ports')}${tr('city_panel.used_max_in_use',{used:fmtPorts(pu),max:pm})}
${pu>=pm?`

${tr('city_panel.every_port_is_taken_add_a')}

`:''} -
${tr('common.forwarding_chip')}${esc(G.chip)}
${tr('common.boot_time')}${slowBoot(c)?`${tr('city_panel.n_min_a_slow_one',{n:bootMin(c)})}`:tr('city_panel.n_min',{n:bootMin(c)})}
${slowBoot(c)?`

${tr('city_panel.this_chassis_takes_forever_to_boot')}

`:''} +
${tr('common.forwarding_chip')}${esc(G.chip)}
${tr('common.boot_time')}${slowBoot(c)?`${tr('city_panel.n_min_a_slow_one',{n:bootMin(c)})}`:tr('city_panel.n_min',{n:bootMin(c)})}
${slowBoot(c)?`

${tr('city_panel.this_chassis_takes_forever_to_boot')}

`:''} ${(()=>{const fc=G.fsN||0,u=(R.fsUse&&R.fsUse[c])?R.fsUse[c].used:0;return `
${tr('ddos.fs_rules')}${fc?tr('ddos.fs_used',{used:u,cap:fc}):tr('ddos.fs_no_tcam')}
${fc?`
`:''}`;})()}
${tr('common.forwarding_load')}${fmtG(nl)} / ${fmtG(nc)}
${nl>=nc*0.95?`

${tr('city_panel.maxed_out_traffic_here_is_being')}

`:''} diff --git a/src/game/93-ui/60-decommission.js b/src/game/93-ui/60-decommission.js index 6b3024a..80040be 100644 --- a/src/game/93-ui/60-decommission.js +++ b/src/game/93-ui/60-decommission.js @@ -10,7 +10,7 @@ function decomModal(){const sel=[...(UI.decom||[])],im=decomImpact(sel),all=Obje const rows=all.map(c=>``).join(''); openModal(`

${tr('common.decommission_pops')}

${tr('decommission.pick_the_pops_to_shut_down')}

${rows} - ${sel.length?`
${tr('common.links_removed')}${im.links.length}
${tr('decommission.eyeballs_you_stop_serving')}${fmtG(im.eye)}
${trn('decommission.n_customer_let_go',im.biz.length)}${fmt$(im.fee)}
${im.biz.length?`

${im.biz.map(b=>esc(b.name)+' '+fmt$(im.pen(b))).join(' · ')}

`:''}`:''} + ${sel.length?`
${tr('common.links_removed')}${im.links.length}
${tr('decommission.eyeballs_you_stop_serving')}${fmtG(im.eye)}
${trn('decommission.n_customer_let_go',im.biz.length)}${fmt$(im.fee)}
${im.biz.length?`

${im.biz.map(b=>esc(b.name)+' '+fmt$(im.pen(b))).join(' · ')}

`:''}`:''} ${left<1?`

${tr('decommission.keep_at_least_one_pop')}

`:''}
${btn(sel.length?trn('decommission.decommission_n_pop_pay_fee',sel.length,{fee:fmt$(im.fee)}):tr('decommission.pick_a_pop'),'decomGo',{},'red',!sel.length||left<1)}${btn(tr('common.keep_them'),'closeModal',{},'ghost')}
`);} function decommission(cities){const set=new Set(cities),im=decomImpact(cities),lids=new Set(im.links.map(l=>l.id)),bids=new Set(im.biz.map(b=>b.id)); diff --git a/src/game/93-ui/70-link-panels.js b/src/game/93-ui/70-link-panels.js index 25e6954..9927359 100644 --- a/src/game/93-ui/70-link-panels.js +++ b/src/game/93-ui/70-link-panels.js @@ -8,7 +8,7 @@ function ixBlock(c,multi){const city=ixCity(c),C=CITY[city],ix=ixName(c),X=XIXM[ else if(!ix){h+=`

${tr('link_panels.there_s_no_ix_in_city',{city:C.name})}

${S.pops[city]?btn(tr('link_panels.found_your_own_ix_cost_mo',{cost:fmt$(MYIX_COST),mo:fmt$(MYIX_MO)}),'foundIx',{city:c},'pink',S.cash'+tr('link_panels.build_a_pop_here_first')+'

'}`;} else if(S.ixp[c]===undefined){h+=`

${tr('link_panels.ix_is_a_shared_switch_one',{ix:esc(ix),list:(()=>{const m=ixMembers(c),big=m.filter(id=>!NET[id].tail),t=m.length-big.length;return (big.map(id=>esc(NET[id].name)).join(', ')||tr('common.nobody_yet'))+(t?trn('link_panels.plus_n_small_network',t):'');})()})}

${S.pops[city]?'':REMOTE_WARN}${X?`

${esc(X.blurb)} ${X.freeTo!==undefined?tr('link_panels.ports_up_to_port_are_free',{port:PORT[X.freeTo].n}):tr('link_panels.ports_at_p_of_the_usual',{p:Math.round(ixMul(c)*100)})}

`:''}${CITY[city].ixCheap?`

${tr('link_panels.run_by_a_nonprofit_public_prices')}

`:''}${isDk(c)?`

${tr('link_panels.run_by_de_kicks_group_no')}

`:''}
${PORT.map((P2,i)=>btn(isDk(c)?tr('link_panels.port_port_price_on_request',{port:P2.n}):tr('link_panels.port_port_price',{port:P2.n,price:portMo(ixPortMo(c,i))}),'buyIx',{city:c,tier:i},'',(!isDk(c)&&S.cash1))).join('')}
`;} else{const mine=!!S.myIx[c],u=R.useIx[c]||0,cap=ixCap(c),set=ixSessions(c),xdown=S.ev.ixdown&&S.ev.ixdown[c]>S.day; - h+=`
${mine?tr('link_panels.your_own_fabric_name',{name:myFab(c).n}):lagName(S.ixp[c],(S.ixn||{})[c])}${xdown?' · FABRIC DOWN':''}${fmtG(u)}
${prefCtl('ix',c,S.ixPref&&S.ixPref[c])}${S.pops[city]?siteCtl('ix',c,city,(S.ixSite||{})[c]):''}`; + h+=`
${mine?tr('link_panels.your_own_fabric_name',{name:myFab(c).n}):lagName(S.ixp[c],(S.ixn||{})[c])}${xdown?' · FABRIC DOWN':''}${fmtG(u)}
${prefCtl('ix',c,S.ixPref&&S.ixPref[c])}${S.pops[city]?siteCtl('ix',c,city,(S.ixSite||{})[c]):''}`; if(isDk(c)&&S.dk){const ad=S.dk.add[c]||[],rt=S.dk.ret[c];h+=`

${rt&&rt>S.day?tr('link_panels.de_kicks_personalised_pricing_p_of',{p:Math.round(dkMult(c)*100),n:rt-S.day}):tr('link_panels.de_kicks_personalised_pricing_p_of_3d4f',{p:Math.round(dkMult(c)*100)})}

`; for(const x of ad)h+=`
${esc(x.n)}
${esc(x.blurb)} · ${tr('common.price_mo',{price:fmt$(x.mo)})}
${btn(UI.confirm==='dk'+c+x.n?tr('link_panels.lose_exclusive_benefits'):tr('common.opt_out'),'dkOptOut',{city:c,n:x.n},'ghost sm')}
`;} if(isRemote(c))h+=`

${trn('link_panels.remote_port_via_a_reseller_1',ixMembers(c).filter(noRemote).length)}

`; @@ -25,7 +25,7 @@ function ixBlock(c,multi){const city=ixCity(c),C=CITY[city],ix=ixName(c),X=XIXM[ function vxcPanel(l){ const load=R.load[l.id]||0,cap=VXC[l.vt].g,u=load/cap,down=linkDown(l),f=FAB[l.prov]; let h=`
${tr('link_panels.virtual_circuit_name_km_km',{name:esc(f.name),km:l.km.toLocaleString()})}

${CITY[l.a].name} ⇄ ${CITY[l.b].name}

`; - if(down)h+=`

${tr('common.fabric_outage')}

${tr('link_panels.name_is_down_nothing_you_can',{name:esc(f.name)})}

`; + if(down)h+=`

${tr('common.fabric_outage')}

${tr('link_panels.name_is_down_nothing_you_can',{name:esc(f.name)})}

`; h+=`

${tr('common.capacity')}

${tr('link_panels.name_circuit',{name:VXC[l.vt].n})}${fmtG(load)} / ${fmtG(cap)}
${tr('common.monthly')}${tr('common.price_mo',{price:fmt$(l.mo)})}
${!S.pops[l.b]?`

${tr('link_panels.remote_peering_leg_into_ix',{ix:esc(CITY[l.b].ix)})}

`:''}
${VXC.map((V,t)=>t>l.vt?btn(`${V.n} ${tr('common.price_mo',{price:fmt$(vxcMo(l.km,l.sub,t))})}`,'upVxc',{id:l.id,t},'sm'):'').join('')}
@@ -93,7 +93,7 @@ function chinaSection(c){const st=S.cnLic?S.cnLic.state:'none',loss=S.ev.gfw>S.d if(st==='none')h+=`

${tr('link_panels.foreign_networks_need_a_local_joint')}

${btn(tr('link_panels.apply_for_a_license_price_mo_n_days',{price:fmt$(CN_LIC),mo:fmt$(CN_JV_MO),n:leadDays(45)}),'applyCn',{},'pink',S.cash${tr('link_panels.license_paperwork_in_progress_n_days',{n:Math.max(0,S.cnLic.ready-S.day)})}

`; else h+=`

${tr('link_panels.your_joint_venture_holds_an')}

`; - if(R.gfwCross>0.5)h+=`
${tr('link_panels.your_traffic_crossing_the_border')}${fmtG(R.gfwCross)}
${tr('link_panels.lost_on_the_way')}${fmtG(R.gfwLost)}
`; + if(R.gfwCross>0.5)h+=`
${tr('link_panels.your_traffic_crossing_the_border')}${fmtG(R.gfwCross)}
${tr('link_panels.lost_on_the_way')}${fmtG(R.gfwLost)}
`; return h+`
`;} function subUpgradePanel(l){return `

${tr('common.submarine_transmission')}

${tr('common.better_terminals_and_optical_tuning')}

`+Object.entries(SUB_UPGRADES).map(([k,U])=>{ const at=l['sub'+k],done=subUpgradeReady(l,k),cost=subUpgradeCost(l,k),preview={...l,['sub'+k]:S.day},use=at!==undefined||subHelps(l.km,k,l['sub'+subOther(k)]!==undefined); @@ -116,7 +116,7 @@ function dfPanel(l){ let h=`
${tr('link_panels.dark_fiber_kind_km_km',{kind:l.own?tr('link_panels.your_own_build'):tr('common.leased_iru'),km:l.km.toLocaleString()})}

${A} ⇄ ${B}

`; if(bld){const tot=Math.max(1,l.ready-l.day),done=clamp((S.day-l.day)/tot,0,1); h+=`

${l.own?tr('common.under_construction'):tr('common.being_spliced')}

${l.own?tr('link_panels.permits_trenching_splicing'):tr('common.iru_handover')}${tr('common.n_days_left',{n:l.ready-S.day})}
${l.own&&l.sub?layPanel(l):l.own?`
${btn(tr('link_panels.hire_extra_crews_price_30_days',{price:fmt$(crewCost(l))}),'crews',{id:l.id},'sm',!crewSteps(l)||S.cash${!crewSteps(l)&&l.ready>S.day+1?`

${tr('link_panels.crews_can_halve_a_build_at_most')}

`:''}`:''}

${tr('link_panels.you_can_pre_install_optics_now')}

`;} - else if(inc&&linkDown(l))h+=`

${tr('common.dark_6bf5')}

${esc(inc.msg)}

${shipNote(inc)}${inc.cost?btn(`${esc(inc.fix||tr('common.rush_repair'))} ${fmt$(inc.cost)}`,'fixInc',{id:inc.id},'red',S.cash`; + else if(inc&&linkDown(l))h+=`

${tr('common.dark_6bf5')}

${esc(inc.msg)}

${shipNote(inc)}${inc.cost?btn(`${esc(inc.fix||tr('common.rush_repair'))} ${fmt$(inc.cost)}`,'fixInc',{id:inc.id},'red',S.cash`; h+=`

${tr('common.capacity')}

${tr('link_panels.n_of_max_channels_lit',{n:(l.ch||[]).length,max:chMax(l)})}${soldSlots(l)?` · ${tr('link_panels.n_sold_as_alien_waves',{n:soldSlots(l)})}`:''}${mwG(l)?` · ${tr('market.g_sold_as_managed',{g:fmtCap(mwG(l))})}`:''}${xpSlots(l)?` · ${trn('express.n_carry_expresses',xpSlots(l))}`:''}${fmtG(load)} / ${fmtG(cap)}
${seatPanel(l)}${l.own&&l.sub?`
${tr('common.cable_design')}${tr((SEA_DESIGNS[l.seaDesign]||SEA_DESIGNS.standard).n)}
`:''}
${tr('common.latency')}${tr('common.ms_ms_one_way',{ms:linkLat(l).toFixed(1)})}
${l.own?tr('link_panels.right_of_way_upkeep'):tr('common.iru_lease')}${tr('common.price_mo',{price:fmt$(l.mo)})}
${tr('link_panels.n_amp_huts',{n:amps})}${tr('common.price_mo',{price:fmt$(amps*AMP_MO)})}
${!bld&&!(l.ch||[]).length?`

${tr('link_panels.this_fiber_is_dark_add_optics')}

`:''}
`; @@ -151,7 +151,7 @@ function linkPanel(id){ if(l.kind==='xp')return xpPanel(l); const load=R.load[l.id]||0,cap=LT[l.tier].g,u=load/cap,cut=l.cut>S.day,trk=l.trench||l.id,inc=S.inc.find(i=>(LINKCUT_TR.includes(i.type)&&i.ref===trk)||((i.type==='fatwave'||i.type==='label'||i.type==='mtu')&&i.ref===l.id)),sib=pairLinks(l.a,l.b).filter(x=>x!==l&&x.kind!=='vxc'),mates=sib.filter(x=>(x.trench||x.id)===trk); let h=`
${l.cable?esc(CAB[l.cable].name):l.sub?tr('common.subsea_cable'):tr('common.terrestrial_fiber')} · ${l.km.toLocaleString()} km

${CITY[l.a].name} ⇄ ${CITY[l.b].name}

`; - if(cut)h+=`

${tr('common.cut_2e50')}

${inc?esc(inc.msg):''} ${inc&&shipSea(inc)?'':tr('link_panels.back_in_n_days',{n:l.cut-S.day})}

${shipNote(inc)}${inc&&inc.cost?btn(`${esc(inc.fix||tr('common.rush_repair'))} ${fmt$(inc.cost)}`,'fixInc',{id:inc.id},'red',S.cash`; + if(cut)h+=`

${tr('common.cut_2e50')}

${inc?esc(inc.msg):''} ${inc&&shipSea(inc)?'':tr('link_panels.back_in_n_days',{n:l.cut-S.day})}

${shipNote(inc)}${inc&&inc.cost?btn(`${esc(inc.fix||tr('common.rush_repair'))} ${fmt$(inc.cost)}`,'fixInc',{id:inc.id},'red',S.cash`; h+=`

${tr('common.capacity')}

${tr('link_panels.name_wave',{name:LT[l.tier].n})}${fmtG(load)} / ${fmtG(cap)}
${tr('common.latency')}${tr('common.ms_ms_one_way',{ms:linkLat(l).toFixed(1)})}
${l.cable?`
${tr('common.cable_system')}${esc(CAB[l.cable].name)}
`:''}
${tr('common.wave_lease')}${tr('common.price_mo',{price:fmt$(l.mo)})}
${u>=0.9?`

${tr('link_panels.congested_upgrade_it_or_add_a')}

`:''} diff --git a/src/game/93-ui/72-express.js b/src/game/93-ui/72-express.js index 86633fd..0eff6b5 100644 --- a/src/game/93-ui/72-express.js +++ b/src/game/93-ui/72-express.js @@ -11,7 +11,7 @@ const xpSpanMeta=s=>`${s.own?tr('common.own_dark_fiber'):tr('common.leased_iru') const xpModes=(o,run)=>OPT[o].modes.map(([g,r])=>tr('link_panels.g_to_km_km',{g:fmtG(g),km:r.toLocaleString()})).join(' · ')+` · ${xpOptG(o,run)?tr('express.runs_at',{g:fmtG(xpOptG(o,run))}):tr('express.out_of_reach')}`; function xpPanel(l){const sp=xpSpans(l),load=R.load[l.id]||0,cap=capOf(l),u=cap?load/cap:0,down=linkDown(l),A=CITY[l.a].name,B=CITY[l.b].name,run=sp?xpRunKm(sp):0,ch=l.ch||[]; let h=`
${tr('express.eyebrow',{km:Math.round(l.km).toLocaleString()})}

${A} ⇄ ${B}

`; - if(down)h+=`

${tr('common.dark_6bf5')}

${xpDarkWhy(l).map(t=>`

${t}

`).join('')}
`; + if(down)h+=`

${tr('common.dark_6bf5')}

${xpDarkWhy(l).map(t=>`

${t}

`).join('')}
`; h+=`

${tr('common.capacity')}

${trn('express.n_channels',ch.length)}${fmtG(load)} / ${fmtG(cap)}
${tr('common.latency')}${tr('common.ms_ms_one_way',{ms:linkLat(l).toFixed(1)})}
${tr('express.optical_run')}${run.toLocaleString()} km

${tr('express.passes',{via:esc(xpVia(l))})}

`; diff --git a/src/game/94-dashboard/10-progress.js b/src/game/94-dashboard/10-progress.js index 41ca684..7a31dd2 100644 --- a/src/game/94-dashboard/10-progress.js +++ b/src/game/94-dashboard/10-progress.js @@ -21,7 +21,7 @@ function scnProg(){const sc=S&&S.scn;if(!sc)return null; const meas=items.filter(x=>x.max),f=sc.done?1:meas.length?meas.reduce((a,x)=>a+Math.min(1,x.v/x.max),0)/meas.length:0;return {goal:def.goal,items,f};} const pRow=x=>`
${esc(x.l)}${esc(x.txt)}
${x.max?`
`:''}`; function scnCard(){const sc=S.scn,P=scnProg();if(!sc||!P)return '';const left=Math.max(0,sc.days-S.day); - const st=sc.done?`${tr('progress.done_in_d_days',{d:sc.done})}`:sc.failed?`${tr('common.time_s_up')}`:tr('common.n_days_left',{n:left}); + const st=sc.done?`${tr('progress.done_in_d_days',{d:sc.done})}`:sc.failed?`${tr('common.time_s_up')}`:tr('common.n_days_left',{n:left}); return `
${tr('common.scenario')} · ${Math.round(P.f*100)}%
${esc(sc.name)}
🎯 ${esc(P.goal)}
${P.items.map(pRow).join('')}
${tr('common.time')}${st}
`;} function lvlItems(){const lv=S.lvl||1,pk=S.stats.peak||0,pops=Object.keys(S.pops).length,G=(l,v,max,txt)=>({l,v,max,txt}),q=LV_REQ[lv];if(!q)return []; const out=[G(tr('common.peak_traffic'),pk,q.pk,`${fmtG(pk)} / ${fmtG(q.pk)}`),G(tr('common.pops'),pops,q.pops,`${pops} / ${q.pops}`)],rg=lvReg(lv);if(rg)out.push(G(tr('common.continents'),regionsCount(),rg,`${regionsCount()} / ${rg}`));return out;} diff --git a/src/game/94-dashboard/30-customers.js b/src/game/94-dashboard/30-customers.js index 600820a..e0f1fe3 100644 --- a/src/game/94-dashboard/30-customers.js +++ b/src/game/94-dashboard/30-customers.js @@ -19,7 +19,7 @@ function custSection(){const F=UI.kf||{};let h=`
${tr('customers.no_customers_yet_offers_show_up')}

`; const st=custStats(); h+=`

${tr('customers.everyone_who_pays_you_happiest_last')}

`; - h+=`
${tr('common.happiness')}
${Math.round(st.avg)}%
${tr('customers.weighted_by_what_they_pay')}
${tr('common.unhappy')}
${st.unhappy}
${trn('customers.n_furious',st.furious)}
${tr('common.at_risk')}
${tr('common.price_mo',{price:fmt$(st.risk)})}
${tr('customers.from_unhappy_customers')}
`; + h+=`
${tr('common.happiness')}
${Math.round(st.avg)}%
${tr('customers.weighted_by_what_they_pay')}
${tr('common.unhappy')}
${st.unhappy}
${trn('customers.n_furious',st.furious)}
${tr('common.at_risk')}
${tr('common.price_mo',{price:fmt$(st.risk)})}
${tr('customers.from_unhappy_customers')}
`; const cities=[...new Set(S.biz.map(b=>b.city))].sort((a,b)=>CITY[a].name.localeCompare(CITY[b].name)); h+=`
${btn(tr('dashboard.all_n',{n:S.biz.length}),'custF',{v:''},!F.f?'pink sm':'ghost sm')}${btn(tr('customers.unhappy_n',{n:S.biz.filter(b=>b.mood<60).length}),'custF',{v:'sad'},F.f==='sad'?'pink sm':'ghost sm')}
`; const rows=S.biz.filter(b=>(!F.f||b.mood<60)&&(!F.city||b.city===F.city||b.city2===F.city||(b.sites||[]).includes(F.city))); @@ -27,7 +27,7 @@ function custSection(){const F=UI.kf||{};let h=`
{const A=val(a),B=val(b);return (AB?1:0)*dir||a.mood-b.mood;}); if(!rows.length)return h+`

${F.f?tr('customers.nobody_is_unhappy_enjoy_it_while'):tr('customers.no_customers_here')}

`; const where=b=>b.sites?b.sites.map(c=>CITY[c].name).join(', '):b.city2?`${CITY[b.city].name} ⇄ ${CITY[b.city2].name}`:CITY[b.city].name; - const trend=b=>b.pm===undefined||Math.abs(b.mood-b.pm)<0.05?'':b.mood>b.pm?' ▲':' ▼'; + const trend=b=>b.pm===undefined||Math.abs(b.mood-b.pm)<0.05?'':b.mood>b.pm?' ▲':' ▼'; const sorts=[['mood',tr('common.happiness')],['mo',tr('common.per_month')],['name',tr('common.name')],['city',tr('common.where')]]; h+=`
${sorts.map(([k,l])=>btn(l+(sk===k?(dir>0?' ▲':' ▼'):''),'custSort',{k},sk===k?'pink sm':'ghost sm')).join('')}
`; h+=rows.slice(0,listN('cust')).map(b=>{const why=bizWhy(b),grace=S.day-(b.since||0)<15;return `
${esc(b.name)} ${esc(BIZ_T[b.type].l)}
${esc(where(b))} · ${BIZ_T[b.type].event?esc(bTerms(b)):tr('common.price_mo',{price:fmt$(bizMo(b))})}${grace?` · ${tr('common.provisioning_n_d_grace',{n:15-(S.day-(b.since||0))})}`:''}${clTermTxt(b)?' · '+clTermTxt(b):''}
${bRisk(b)}${why.length?`
${why.map(esc).join(' · ')}
`:''}
${tr('common.happiness_p',{p:Math.round(b.mood)})}${trend(b)}
${btn(tr('common.open'),'custGo',{id:b.id},'ghost sm')}
`;}).join(''); diff --git a/src/game/94-dashboard/50-lease-swaps.js b/src/game/94-dashboard/50-lease-swaps.js index c16c81f..19b26c4 100644 --- a/src/game/94-dashboard/50-lease-swaps.js +++ b/src/game/94-dashboard/50-lease-swaps.js @@ -29,7 +29,7 @@ function leaseSwaps(){const by={}; .sort((p,q)=>((p.best===undefined)-(q.best===undefined))||(q.best||0)-(p.best||0)||q.mo-p.mo);} function leaseTab(){const xs=leaseSwaps(),tot=xs.reduce((s,x)=>s+x.mo,0); const kind=l=>l.kind==='vxc'?tr('lease_swaps.cap_fabric_circuit',{cap:capName(l)}):l.kind==='df'?tr('lease_swaps.cap_on_a_dark_fiber_iru',{cap:capName(l)}):tr('lease_swaps.cap_wave',{cap:capName(l)}); - const line=(x,o)=>{const a={up:fmt$(o.up),mo:fmt$(o.omo),n:o.days};return `
${o.k==='iru'?tr('lease_swaps.lease_dark_fiber_up_up_front',a):o.k==='cab'?tr('lease_swaps.your_own_cable_up_up_front',a):tr('lease_swaps.your_own_fiber_up_up_front',a)} ${o.save>0?tr('lease_swaps.saves_price_mo_pays_for_itself',{price:fmt$(o.save),n:o.pay}):tr('lease_swaps.costs_more_than_leasing_at_this')}
`;}; + const line=(x,o)=>{const a={up:fmt$(o.up),mo:fmt$(o.omo),n:o.days};return `
${o.k==='iru'?tr('lease_swaps.lease_dark_fiber_up_up_front',a):o.k==='cab'?tr('lease_swaps.your_own_cable_up_up_front',a):tr('lease_swaps.your_own_fiber_up_up_front',a)} ${o.save>0?tr('lease_swaps.saves_price_mo_pays_for_itself',{price:fmt$(o.save),n:o.pay}):tr('lease_swaps.costs_more_than_leasing_at_this')}
`;}; const plan=(x,o)=>btn(o.k==='iru'?tr('lease_swaps.plan_dark_fiber'):o.k==='cab'?tr('lease_swaps.plan_a_cable'):tr('lease_swaps.plan_your_own_fiber'),'leaseSwap',{a:x.a,b:x.b,src:o.k==='iru'?'lease':o.k==='cab'?'cable':'build'},o.save>0&&o.save===x.best?'pink sm':'ghost sm'); return `

${tr('common.leased_lines')}

${tr('lease_swaps.every_wave_fabric_circuit_and_dark')}

${xs.length?`
${tr('lease_swaps.you_pay_for_leases')}${tr('common.price_mo',{price:fmt$(tot)})}
`+xs.map(x=>`
${CITY[x.a].name} ⇄ ${CITY[x.b].name} ${x.sub?tr('common.subsea'):tr('common.land')}
${Object.entries(x.ls.reduce((m,l)=>(m[kind(l)]=(m[kind(l)]||0)+1,m),{})).map(([k,n])=>n>1?`${n} × ${k}`:k).join(', ')} · ${tr('common.price_mo',{price:fmt$(x.mo)})}
diff --git a/src/game/94-dashboard/55-market.js b/src/game/94-dashboard/55-market.js index a25f7d3..844b97a 100644 --- a/src/game/94-dashboard/55-market.js +++ b/src/game/94-dashboard/55-market.js @@ -15,7 +15,7 @@ const cmSeg=(vals,cur,act,args,f)=>`
${vals.map(v=>btn(f(v),act, function cmHeatTag(r){const H=cmHeat(r,'spec',S.day);return H>=1.15?`${tr('market.hot',{x:H.toFixed(1)})}`:H<=0.85?`${tr('market.cool',{x:H.toFixed(1)})}`:`${tr('market.steady')}`;} function cmProdLine(r,p,s,L,fc){const C=S.cm.p[p],D=cmDem(r,p,S.day),i=cmIdx(r,p,s,0,S.day),pc=Math.round(i*100),m=mkt()*cmCut(); const price=p==='iru'?tr('market.price_pair',{up:fmt$(Math.round(cmUpList(r)*i*m)),price:fmt$(Math.round(cmList(r,p)*m)),pct:pc}):tr('market.price',{price:fmt$(Math.round(cmList(r,p)*i*m)),pct:pc}); - return `
${tr(CM_NAME[p])} · ${tr('market.row',{want:cmN(D),sold:s,listed:L})} · ${price}${C.on&&pc${tr('market.below_floor')}`:C.on&&!L&&D>=C.min&&p!=='iru'&&!S.cm.off[r.k]?` ${CM_G[p]&&!r.ls.some(l=>cmOptG(l)>=CM_G[p])?tr('market.needs_optic',{g:fmtCap(CM_G[p])}):tr('market.no_room')}`:''}
+ return `
${tr(CM_NAME[p])} · ${tr('market.row',{want:cmN(D),sold:s,listed:L})} · ${price}${C.on&&pc${tr('market.below_floor')}`:C.on&&!L&&D>=C.min&&p!=='iru'&&!S.cm.off[r.k]?` ${CM_G[p]&&!r.ls.some(l=>cmOptG(l)>=CM_G[p])?tr('market.needs_optic',{g:fmtCap(CM_G[p])}):tr('market.no_room')}`:''}
${cmBar(D,s,C.on?C.min:0)}${fc?`
${tr('market.forecast',{a:cmN(cmFc(r,p,30)),b:cmN(cmFc(r,p,90))})}
`:''}
`;} function marketTab(){const C=S.cm,rs=[...cmRoutes().values()].sort((x,y)=>brMarket(y.a,y.b)-brMarket(x.a,x.b)),sold=cmSold(new Map(rs.map(r=>[r.k,r]))),bk=broker(); const mo=S.biz.reduce((a,b)=>a+(['wwave','mwave','dfpair'].includes(b.type)?bizMo(b):0),0),ago=n=>S.day-n.d<1?tr('market.today'):trn('market.days_ago',S.day-n.d); diff --git a/src/game/94-dashboard/60-dashboard.js b/src/game/94-dashboard/60-dashboard.js index 1349afd..855b393 100644 --- a/src/game/94-dashboard/60-dashboard.js +++ b/src/game/94-dashboard/60-dashboard.js @@ -6,7 +6,7 @@ function renderDash(){checkLayer(); const net=R.revMo-R.costMo,tot=Object.values(R.egT).reduce((a,b)=>a+b,0)||1; const tile=(l,v,sub)=>`
${l}
${v}
${sub?`
${sub}
`:''}
`; let h=`
AS${S.asn} · ${esc(S.name)} · ${tierLabel()}

${tr('common.noc_dashboard')}

`+dashTabs();const DT=UI.dtab||'overview';if(DT==='overview')h+=` -
${tile(tr('common.traffic_now'),fmtG(R.served),tr('dashboard.of_g_wanted',{g:fmtG(R.demand)}))}${tile(tr('common.peak'),fmtG(S.stats.peak))}${tile(tr('dashboard.carried'),fmtVol(S.vol||0),tr('dashboard.carried_sub'))}${tile(tr('dashboard.delivered_30_days'),(up*100).toFixed(1)+'%',up>=0.999?tr('dashboard.five_nines_ish'):up>=0.99?tr('dashboard.two_nines_and_change'):tr('dashboard.customers_are_upset'))}${tile(tr('common.peering_ratio'),pct(R.peerShare||0),tr('dashboard.caches_pnis_and_ix'))}${tile(tr('dashboard.monthly_p_l'),`${net>=0?'+':''}${fmt$(net)}`,tr('dashboard.in_in_out_out',{in:fmt$(R.revMo),out:fmt$(R.costMo)}))}${tile(tr('common.incidents'),S.stats.incidents,tr('dashboard.n_shrugged_off',{n:S.stats.survived}))}
+
${tile(tr('common.traffic_now'),fmtG(R.served),tr('dashboard.of_g_wanted',{g:fmtG(R.demand)}))}${tile(tr('common.peak'),fmtG(S.stats.peak))}${tile(tr('dashboard.carried'),fmtVol(S.vol||0),tr('dashboard.carried_sub'))}${tile(tr('dashboard.delivered_30_days'),(up*100).toFixed(1)+'%',up>=0.999?tr('dashboard.five_nines_ish'):up>=0.99?tr('dashboard.two_nines_and_change'):tr('dashboard.customers_are_upset'))}${tile(tr('common.peering_ratio'),pct(R.peerShare||0),tr('dashboard.caches_pnis_and_ix'))}${tile(tr('dashboard.monthly_p_l'),`${net>=0?'+':''}${fmt$(net)}`,tr('dashboard.in_in_out_out',{in:fmt$(R.revMo),out:fmt$(R.costMo)}))}${tile(tr('common.incidents'),S.stats.incidents,tr('dashboard.n_shrugged_off',{n:S.stats.survived}))}

${tr('dashboard.traffic_by_way_out')}

${svgChart(rows,['c','p','ix','t','l2'],[{k:'dem',col:'var(--text)',dash:true}],v=>fmtCap(Math.round(v)),'traffic')}${chartLegend('traffic',k=>k==='dem'?'':' '+pct((R.egT[k]||0)/tot))}

${tr('dashboard.money_per_month')}

${svgChart(rows,[],[{k:'rev',col:'#16A866'},{k:'cost',col:'#FF4D5E'}],v=>fmt$(v),'money')}${chartLegend('money')}

${tr('dashboard.where_the_money_goes')}

${Object.entries(R.cost).filter(([k,v])=>v>0).sort((a,b)=>b[1]-a[1]).map(([k,v])=>`
${{pops:tr('dashboard.pops_and_routers'),links:tr('dashboard.waves_and_fiber'),transit:tr('common.transit'),ix:tr('common.ix_ports'),pni:tr('common.pnis'),caches:tr('common.cache_power'),nni:tr('common.fabric_ports'),optical:tr('dashboard.amp_huts_and_spares'),loans:tr('common.loan_repayments'),revshare:tr('dashboard.investor_revenue_share'),extras:tr('dashboard.licenses_and_scrubbing'),wholesale:tr('dashboard.nearly_broadband_network_wholesale'),levy:tr('dashboard.regional_broadband_levy'),pie:tr('pie.costs_row'),ip4:tr('ip4.leases_cgnat_nat64'),sat:tr('satellites.costs_row')}[k]||k}${tr('common.price_mo',{price:fmt$(v)})}
`).join('')}
`; diff --git a/src/game/94-dashboard/70-bank.js b/src/game/94-dashboard/70-bank.js index ee218dd..b106934 100644 --- a/src/game/94-dashboard/70-bank.js +++ b/src/game/94-dashboard/70-bank.js @@ -10,10 +10,10 @@ function renderBank(){ if(o.model==='balloon')return `${tr('bank.nothing_to_pay_until_the_end_2a38')}${tr('bank.apr_apr',{apr:(o.apr*100).toFixed(1)})}${tr('bank.n_months',{n:o.term})}${tr('bank.then_about_price_at_once',{price:fmt$(o.amount*Math.pow(1+o.apr/12,o.term))})}${sh}`; const extra=o.model==='storm'?`${tr('bank.2_per_open_incident')}`:o.model==='astro'?`${tr('bank.rate_set_by_the_stars_each')}`:''; return (B.equity?`${tr('common.no_repayments')}${tr('bank.pct_of_revenue_forever',{pct:pct(o.share)})}${tr('bank.buy_out_price',{price:fmt$(o.amount*3)})}`:`${tr('bank.apr_apr',{apr:(o.apr*100).toFixed(1)})}${tr('bank.n_months',{n:o.term})}${tr('common.price_mo',{price:fmt$(o.pay)})}${B.crypto?''+tr('bank.paid_in_tubecoin')+'':''}`)+extra+sh;}; - const covList=(l)=>l.covs.length?l.covs.map(c=>{const ok=COVS[c].ok(l);return `
${ok?'✓':'✗'} ${esc(covLabel(c,l))}
`;}).join(''):'
'+tr('bank.no_conditions_that_is_the_scary')+'
'; + const covList=(l)=>l.covs.length?l.covs.map(c=>{const ok=COVS[c].ok(l);return `
${ok?'✓':'✗'} ${esc(covLabel(c,l))}
`;}).join(''):'
'+tr('bank.no_conditions_that_is_the_scary')+'
'; let h=`
AS${S.asn} · ${esc(S.name)}

${tr('common.bank')}

-
${tr('common.cash')}
${fmt$(S.cash)}
${S.cash<0?tr('bank.bankrupt_at_100k'):tr('bank.in_the_vault')}
-
${tr('dashboard.monthly_p_l')}
${net>=0?'+':''}${fmt$(net)}
${tr('bank.after_loan_payments')}
+
${tr('common.cash')}
${fmt$(S.cash)}
${S.cash<0?tr('bank.bankrupt_at_100k'):tr('bank.in_the_vault')}
+
${tr('dashboard.monthly_p_l')}
${net>=0?'+':''}${fmt$(net)}
${tr('bank.after_loan_payments')}
${tr('common.credit_rating')}
${rt}
${rIdx(rt)>=5?tr('bank.bankers_return_your_calls'):rIdx(rt)>=3?tr('bank.bankers_return_your_emails'):tr('bank.bankers_pretend_to_be_out')}
${tr('common.debt')}
${fmt$(loanDebt())}
${trn('bank.n_loan',S.loans.length)}
`; const CT=CALL_TERMS[rt]; diff --git a/src/game/94-dashboard/72-address-space.js b/src/game/94-dashboard/72-address-space.js index d90d78e..3a9a8d1 100644 --- a/src/game/94-dashboard/72-address-space.js +++ b/src/game/94-dashboard/72-address-space.js @@ -3,7 +3,7 @@ width, the dropdowns stack and every button row wraps. */ const ip4Pc=x=>(x*100).toFixed(1).replace(/\.0$/,'')+'%'; function ip4Bank(){if(!S||!ip4On())return '';const I=S.ip4,B=ip4Bill((R.rev&&R.rev.eyeballs)||0),u=B.u,len=ip4LenOk(UI.ip4Len)?UI.ip4Len:IP4_MAX,px=ip4Px(),full=ip4Full(); - const kv=(l,v,bad)=>`
${l}${v}
`,mo=v=>tr('common.price_mo',{price:fmt$(v)}); + const kv=(l,v,bad)=>`
${l}${v}
`,mo=v=>tr('common.price_mo',{price:fmt$(v)}); let h=`

🔢 ${tr('ip4.section')}

${tr('ip4.note')}

`; h+=`
${kv(tr('ip4.yours'),ip4N(u.T))}${kv(tr('ip4.business'),ip4N(u.B))}`; // Public, behind CGNAT, IPv6-only: the three groups once there is a third. diff --git a/src/styles/05-theme.css b/src/styles/05-theme.css index dce9763..05df6de 100644 --- a/src/styles/05-theme.css +++ b/src/styles/05-theme.css @@ -1,12 +1,13 @@ /* Dark (#80): , set by the page's from Settings › Theme (93-ui/15-theme.js). The panels take the night colours of the NOC window: dark paper, light text, the stickers' outlines darker still. Light tints (a goal to work on, a toast, a pick) are written where they are used as var(--tint-…, light colour): only this look sets them. - Text on bright fills (yellow buttons, warning tags) stays dark ink in both looks. */ + Text on bright fills (yellow buttons, warning tags) stays dark ink in both looks. Red text is var(--tx-red,var(--bad)): + --bad stays the fill under white letters, and as text on these cards it falls below AA. */ :root[data-theme="dark"]{ color-scheme:dark; --sea:#0E2A44; --ink:#070B16; --ink2:#A9B7D8; --text:#E9EFFB; --paper:#1A2340; --soft:#232E50; --line:#364470; --eye:#2BC987; --tint-y:#3B3418; --tint-g:#173B2C; --tint-r:#45212B; --tint-p:#43213D; --tint-b:#17324F; --tint-v:#2C2752; --tint-o:#42301A; - --tint-n:#252F4C; --tint-nl:var(--line); --tx-red:#FF8E9B; --tx-amber:#FFB65C; + --tint-n:#252F4C; --tint-nl:var(--line); --tx-red:#FF8E9B; --tx-amber:#FFB65C; --tx-blue:#7FD3F5; scrollbar-color:#4A5B8E transparent; } /* The green of good news is lighter as text on dark paper; a tag keeps the deeper green under its white letters. */ diff --git a/src/styles/10-hud.css b/src/styles/10-hud.css index 2362dd3..ff7d700 100644 --- a/src/styles/10-hud.css +++ b/src/styles/10-hud.css @@ -9,7 +9,7 @@ .brand .val{font-size:20px} .brand .lbl{color:#FFE0EE} .tube{width:30px;height:30px;flex:none} -.up{color:var(--ok)} .down{color:var(--bad)} +.up{color:var(--ok)} .down{color:var(--tx-red,var(--bad))} .note{align-items:flex-start}.note .ndot{width:9px;height:9px;border-radius:50%;margin-top:6px;flex:none;background:var(--ink2);border:2px solid var(--ink)} .note.bad .ndot{background:var(--bad)}.note.good .ndot{background:var(--ok)}.note.goal .ndot{background:#FFD23F} .note .nbody{display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden} diff --git a/src/styles/38-pie-globe.css b/src/styles/38-pie-globe.css index 83ec44c..3f692f5 100644 --- a/src/styles/38-pie-globe.css +++ b/src/styles/38-pie-globe.css @@ -20,4 +20,4 @@ .pft-ck li{display:flex;gap:8px;align-items:flex-start;min-height:32px;margin:4px 0} .pft-ck li span:last-child{display:flex;flex-direction:column;min-width:0} .pft-ck small{font-size:12px;color:var(--ink2);overflow-wrap:anywhere} -.pft-st{color:var(--bad);font-weight:800} +.pft-st{color:var(--tx-red,var(--bad));font-weight:800} diff --git a/src/styles/40-modal.css b/src/styles/40-modal.css index 55d7a0f..db8b720 100644 --- a/src/styles/40-modal.css +++ b/src/styles/40-modal.css @@ -101,7 +101,7 @@ label.f+select.pick{width:100%} .mix{display:flex;height:10px;width:100px;border:1.5px solid var(--ink);border-radius:5px;overflow:hidden;background:var(--paper)} .mix i{display:block;height:100%} /* The NOC's traffic table has a row per network: classes, not inline styles, keep its hundreds of rows cheap to parse. */ -.nmc{display:inline-flex;align-items:center;gap:6px}.dlost{color:var(--bad)}.b.pall{display:block;margin-top:5px} +.nmc{display:inline-flex;align-items:center;gap:6px}.dlost{color:var(--tx-red,var(--bad))}.b.pall{display:block;margin-top:5px} .tscroll{overflow-x:auto} #modal{position:fixed;inset:0;background:rgba(30,38,64,.45);display:grid;place-items:center;z-index:20;padding:16px max(16px,env(safe-area-inset-right,0px)) 16px max(16px,env(safe-area-inset-left,0px))} #modal .card{width:min(560px,100%);max-height:calc(100% - 20px);overflow:auto;padding:20px 22px} @@ -229,5 +229,5 @@ h2 .rn{font-size:18px;vertical-align:middle;padding:2px 4px} .cmbar b{position:absolute;top:-4px;bottom:-4px;width:3px;margin-left:-1.5px;background:var(--ink);border-radius:2px} .cmbar u{position:absolute;top:-5px;bottom:-5px;width:0;margin-left:-1px;border-left:3px dotted var(--me)} .cmroute{align-items:flex-start} -.tag.cmhot{background:#FFE1D6;color:#B43A12} -.tag.cmcool{background:#DDF1FB;color:#1E6A8C} +.tag.cmhot{background:var(--tint-o,#FFE1D6);color:var(--tx-amber,#B43A12)} +.tag.cmcool{background:var(--tint-b,#DDF1FB);color:var(--tx-blue,#1E6A8C)} diff --git a/src/styles/70-puzzles.css b/src/styles/70-puzzles.css index 16ae092..930475b 100644 --- a/src/styles/70-puzzles.css +++ b/src/styles/70-puzzles.css @@ -10,11 +10,11 @@ body.pz #hud .chip:not(.brand):not(.speed),body.pz #hud .speed button:not(#muteB .pzc.s1{background:var(--tint-p,#FFE3F0)}.pzc.s2{background:var(--ok);color:#fff} .pzsrc{font-size:12px;font-weight:800;color:var(--ink2);margin:4px 0} .pzfl{margin:4px 0 6px}.pzf{margin:4px 0;padding:3px 6px;border:2px solid var(--line);border-radius:10px}.pzf.ok{border-color:var(--ok)} -.pzf .kv{font-size:12px;gap:6px}.pzf .bar{margin:2px 0}.pzf .meta .bad{color:var(--bad);font-weight:900}.pzf .seg.pzrt{margin-top:3px} +.pzf .kv{font-size:12px;gap:6px}.pzf .bar{margin:2px 0}.pzf .meta .bad{color:var(--tx-red,var(--bad));font-weight:900}.pzf .seg.pzrt{margin-top:3px} .pzpair{border-top:2px dashed var(--line);padding-top:4px;margin-top:4px}.pzhave{font-size:13px;font-weight:800;margin:6px 0;padding:4px 8px;border-radius:10px;background:var(--tint-y,#FFF4D6)} .pznote{font-weight:800;font-size:13.5px;margin:8px 0;padding:8px 10px;border:2.5px solid var(--ink);border-radius:12px;background:var(--tint-y,#FFF3C4)} .row.on{background:var(--tint-p,#FFE3F0);border-radius:10px} -.pztw{font-size:12.5px;font-weight:800;color:var(--bad);margin:3px 0}.pztw.ok{color:var(--eye)}.pztw.rule{color:var(--ink2)} +.pztw{font-size:12.5px;font-weight:800;color:var(--tx-red,var(--bad));margin:3px 0}.pztw.ok{color:var(--eye)}.pztw.rule{color:var(--ink2)} .pzbud{margin:6px 0}.pzbud .kv{font-size:12.5px} .pzn1{font-size:12.5px;font-weight:800;margin:6px 0;padding:4px 8px;border:2px solid var(--line);border-radius:10px;color:var(--ink2)} .pzn1.on{border-color:var(--ok);background:var(--tint-g,#DFFBEA);color:var(--text);animation:pzglow 1.6s ease-in-out infinite}.pzn1.bad{border-color:var(--warn);background:var(--tint-y,#FFF4D6);color:var(--text)} @@ -62,7 +62,7 @@ body.pz #hud .chip:not(.brand):not(.speed),body.pz #hud .speed button:not(#muteB .pzd-stars{display:flex;gap:2px;flex:none} .pzd-st{display:inline-grid;place-items:center;width:22px;height:22px;border:2px solid var(--line);border-radius:50%;font:900 11px var(--body);color:var(--ink2);box-sizing:border-box} .pzd-st.on{border:0;font-size:17px}.pzd-st.cur{border-color:var(--warn);background:var(--tint-y,#FFF4D6);color:var(--text)} - .pzd-bud{flex:none;font-weight:900;font-size:12.5px;font-variant-numeric:tabular-nums;white-space:nowrap}.pzd-bud.bad{color:var(--bad)} + .pzd-bud{flex:none;font-weight:900;font-size:12.5px;font-variant-numeric:tabular-nums;white-space:nowrap}.pzd-bud.bad{color:var(--tx-red,var(--bad))} #pzBox.dock .pzd-bar .b.sm{min-width:36px;min-height:36px;padding:2px 8px;font-size:16px} .pzd-goal{display:flex;align-items:center;gap:8px;margin-top:6px;padding:5px 8px;background:var(--tint-y,#FFF4D6);border:2px solid var(--warn);border-radius:12px} .pzd-goal.done{background:var(--tint-g,#DFFBEA);border-color:var(--ok)}.pzd-goal.bad{background:var(--tint-r,#FFE6E9);border-color:var(--bad)} @@ -73,7 +73,7 @@ body.pz #hud .chip:not(.brand):not(.speed),body.pz #hud .speed button:not(#muteB .pzd-ga{flex:none;display:flex;flex-direction:column;gap:4px}#pzBox.dock .pzd-ga{margin-left:auto}#pzBox.dock .pzd-ga .b{min-height:32px;padding:2px 10px;font-size:13px;white-space:nowrap} .pzd-chips{display:flex;flex-wrap:wrap;gap:4px;margin-top:6px} .pzd-chip{font:800 12px/1.2 var(--body);color:var(--text);background:var(--paper);border:2px solid var(--line);border-radius:999px;padding:3px 8px;white-space:nowrap;max-width:100%;overflow:hidden;text-overflow:ellipsis;cursor:pointer} - .pzd-chip b{font-weight:900;font-variant-numeric:tabular-nums}.pzd-chip .bad{color:var(--bad)} + .pzd-chip b{font-weight:900;font-variant-numeric:tabular-nums}.pzd-chip .bad{color:var(--tx-red,var(--bad))} .pzd-chip.ok{border-color:var(--ok);background:var(--tint-g,#DFFBEA)}.pzd-chip.part{border-color:var(--warn);background:var(--tint-y,#FFF4D6)}.pzd-chip.none{border-color:var(--bad);background:var(--tint-r,#FFE6E9)} .pzd-chip.rule{cursor:default;color:var(--ink2)} /* The card: as tall as its tab, under the bar at most; tabs keep each part short enough to need no scrolling. */ diff --git a/src/styles/71-architect.css b/src/styles/71-architect.css index 627673c..dab5131 100644 --- a/src/styles/71-architect.css +++ b/src/styles/71-architect.css @@ -5,7 +5,7 @@ .arsites{display:flex;flex-wrap:wrap;gap:5px;margin:4px 0 6px} .arsite{font-weight:900;font-size:12px;border:2px solid var(--line);border-radius:999px;padding:1px 8px;background:var(--paper);color:var(--ink2)} .arsite.ok{border-color:var(--ok);color:var(--text)}.arsite.gold{border-color:#E5484D;background:var(--tint-r,#FFE8E8)} -.arline{font-size:12.5px;font-weight:800;margin:3px 0;color:var(--ink2)}.arline.ok{color:var(--text)}.arline.bad{color:var(--bad)} +.arline{font-size:12.5px;font-weight:800;margin:3px 0;color:var(--ink2)}.arline.ok{color:var(--text)}.arline.bad{color:var(--tx-red,var(--bad))} .arshape{font-size:12.5px;font-weight:900;margin:4px 0} .arrev{font-size:12.5px;font-weight:800;margin:6px 0;padding:5px 8px;border:2px solid var(--line);border-radius:10px;color:var(--ink2)} .arrev.on{border-color:#FF8A3D;background:var(--tint-o,#FFF0E3);color:var(--text)}.arrev.ok{border-color:var(--ok);background:var(--tint-g,#DFFBEA);color:var(--text)} diff --git a/tests/dark-mode.test.js b/tests/dark-mode.test.js index 34e965a..ec82029 100644 --- a/tests/dark-mode.test.js +++ b/tests/dark-mode.test.js @@ -349,7 +349,8 @@ test('the dark look defines every token it is used with, and its text reads (AA) for (const m of css.matchAll(/var\(--([a-z0-9-]+)\)/g)) if (!/^(tabbar|app-h|c|rc|d|x|t|r|dl|pzdock)$/.test(m[1])) assert.ok(val(light, m[1]), `--${m[1]} is defined`); const bgs = ['paper', 'soft', 'tint-y', 'tint-g', 'tint-r', 'tint-p', 'tint-b', 'tint-v', 'tint-o', 'tint-n'].map((k) => [k, val(dark, k)]); for (const t of ['text', 'ink2', 'eye']) for (const [k, b] of bgs) assert.ok(cr(val(dark, t), b) >= 4.5, `--${t} on --${k}: ${cr(val(dark, t), b).toFixed(2)}`); - for (const t of ['tx-red', 'tx-amber']) assert.ok(cr(val(dark, t), val(dark, 'paper')) >= 4.5, `--${t} on the dark paper`); + // The text colours of warnings and tags read on every card and tint they sit on, not only on the paper. + for (const t of ['tx-red', 'tx-amber', 'tx-blue']) for (const [k, b] of bgs) assert.ok(cr(val(dark, t), b) >= 4.5, `--${t} on --${k}: ${cr(val(dark, t), b).toFixed(2)}`); // The outline stays dark in both looks, so text on bright fills (yellow buttons, warning tags) keeps reading. assert.ok(cr(val(dark, 'ink'), '#FFD23F') >= 7, 'dark ink on the yellow buttons'); // Badge labels (10px, so 4.5:1) on their night cards: each variant's gradient, and the dimmed card of one not earned now. @@ -366,6 +367,47 @@ test('the dark look defines every token it is used with, and its text reads (AA) assert.ok(cr(val(dark, 'text'), val(dark, 'paper')) >= 3, 'at night the key\'s outline shows on the card'); }); +// Two things that kept their day colours at night: the capacity market's Hot and Cool tags (bright pastel chips on the +// dark dashboard), and red warning text in var(--bad), 3.8 to 4.8:1 on the dark cards. --bad stays the fill under white +// letters (buttons, counters, bars); text takes var(--tx-red,var(--bad)), which by day is --bad as before. +test('at night the market\'s Hot and Cool tags take the dark tints, and red text reads (AA) on every card', () => { + const html = assemble().html, css = html.slice(html.indexOf('')).replace(/\/\*[\s\S]*?\*\//g, ''); + const block = (sel) => { const i = css.indexOf(sel + '{'); return css.slice(i, css.indexOf('}', i)); }; + const dark = block(':root[data-theme="dark"]'), light = block(':root'); + const val = (b, k) => { const m = new RegExp(`--${k}:\\s*([^;\\n]+);`).exec(b); return m && m[1].trim(); }; + const rules = css.split('}').map((r) => { const i = r.indexOf('{'); return i < 0 ? null : { sel: r.slice(0, i).split(',').map((x) => x.trim()), body: r.slice(i + 1) }; }).filter(Boolean); + const decl = (sel, prop) => { let v = null; for (const r of rules) if (r.sel.includes(sel)) { const m = new RegExp(`(?:^|;)\\s*${prop}\\s*:\\s*([^;]+)`).exec(r.body); if (m) v = m[1].trim(); } return v; }; + // var(--token,fallback) as each look paints it: the dark value, or the fallback (the light look never sets the tint). + const paint = (v, look) => { const m = /^var\(--([a-z-]+),\s*(#[0-9A-Fa-f]{6})\)$/.exec(v); assert.ok(m, `a themed colour: ${v}`); return look === 'dark' ? val(dark, m[1]) : (assert.equal(val(light, m[1]), null, `--${m[1]} is dark-only`), m[2]); }; + for (const [tag, bg, fg, was] of [['cmhot', 'tint-o', 'tx-amber', ['#FFE1D6', '#B43A12']], ['cmcool', 'tint-b', 'tx-blue', ['#DDF1FB', '#1E6A8C']]]) { + const b = decl(`.tag.${tag}`, 'background'), c = decl(`.tag.${tag}`, 'color'); + assert.ok(b.startsWith(`var(--${bg},`) && c.startsWith(`var(--${fg},`), `.tag.${tag}: ${b} / ${c}`); + assert.deepEqual([paint(b, 'light'), paint(c, 'light')], was, `.tag.${tag} looks as it did by day`); + const r = cr(paint(c, 'dark'), paint(b, 'dark')); + assert.ok(r >= 4.5, `.tag.${tag} at night: ${r.toFixed(2)}`); + } + // No tag keeps a bare pastel fill: it would be a bright patch on the dark panels. + const pale = (h) => lum(h) > 0.5; + for (const r of rules) if (!r.sel.some((s) => s.startsWith(':root')) && r.sel.some((s) => /\.tag\b/.test(s))) { + const m = /(?:^|;)\s*background\s*:\s*(#[0-9A-Fa-f]{6})\b/.exec(r.body); + assert.ok(!(m && pale(m[1])), `${r.sel.join(',')} has a bare pastel background ${m && m[1]}`); + } + // Red as text takes the dark-aware colour everywhere, in the styles and in the game's own markup and HUD (the test + // above checks --tx-red on every card and tint). `color:var(--bad)`, `color:${x?'var(--bad)':…}`, `.style.color=…'var(--bad)'`. + const RED = /(? m[0]); + assert.deepEqual(cssLeft, [], 'red text in the styles in --bad'); + const dir = path.join(__dirname, '..', 'src', 'game'), left = []; + for (const f of fs.readdirSync(dir, { recursive: true }).filter((f) => f.endsWith('.js'))) { + const s = fs.readFileSync(path.join(dir, f), 'utf8'); + for (const m of s.matchAll(RED)) left.push(`${f}: ${m[0].slice(-60)}`); + } + assert.deepEqual(left, [], 'red text in the game\'s markup in --bad'); + // The fills keep --bad (white letters on it): a button, a counter, a bar. + assert.equal(decl('.b.red', 'background'), 'var(--bad)'); + assert.equal(decl('.b.red', 'color'), '#fff'); +}); + test('the dashboard\'s Demand key matches its dashed line, by night too', () => { const { dom, ev, errors } = load({ storage: { 'sot-theme': 'dark' } }); ev(started + "for(let i=0;i<3;i++)dayTick();ACT.dash({});");