diff --git a/CHANGELOG.md b/CHANGELOG.md index fbebed3..505c059 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- An exchange port, a transit port or a PNI can now be stepped down one size from its panel, so shrinking a port no longer means leaving and rejoining (a PNI cannot while an augment is on order). - Every capital in Africa is on the map, which puts every capital of the world in the game: 33 new cities from Porto-Novo, Bamako and Niamey to Khartoum, Juba, Mogadishu, Brazzaville, Tripoli, Rabat and Pretoria. Each country brings its real telcos, Nigeria gets its wholesale backbone up to Abuja, and the island capitals of the Comoros, São Tomé and Equatorial Guinea sit on their real cables. - Every capital in South, East and Southeast Asia and the Pacific is on the map: Thimphu, Kathmandu, Bandar Seri Begawan, Phnom Penh, Vientiane, Ulaanbaatar, Naypyidaw, Pyongyang, Dili, Hanoi and Wellington, with the island capitals Tarawa, Palikir, Yaren, Funafuti and Port Vila. Each country brings its real telcos, North Korea reaches the world only through China and Russia, and the islands hang on their real cables. - Every capital in the Middle East, the Caucasus and Central Asia is on the map, from Yerevan and Baku to Kabul, Tehran, Baghdad, Jerusalem, Amman, Kuwait City, Beirut, Damascus, Sanaa and Manama, with Ankara and Islamabad. Each country brings its real telcos, and Bahrain is an island on the Gulf's cables. diff --git a/scripts/lib/mcp-commands.js b/scripts/lib/mcp-commands.js index eac4c1d..121b015 100644 --- a/scripts/lib/mcp-commands.js +++ b/scripts/lib/mcp-commands.js @@ -111,6 +111,9 @@ function apiDomValues(dom){ } const API_CMD={ + downIx:{args:[['city','ixId']],watch:['ixp'],doc:'Step an exchange port down one size.'}, + downT:{args:[['id','entityId']],watch:['transit.#id'],doc:'Step a transit port down one size (a LAG steps down together).'}, + downP:{args:[['id','entityId']],watch:['pni.#id'],doc:'Step a PNI down one size. Not while an augment is on order.'}, /* ---------- footprint: buildings, routers, POPs ---------- */ buildPop:{args:[['city','cityId']], quote:a=>({setup:popCost(a.city),blocked:cnCity(a.city)&&!cnOk()?[tr('pops_transit_ix.you_need_a_license_first_foreign')]:[]}), diff --git a/site/i18n/de.js b/site/i18n/de.js index d0b6739..99ef84a 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -2552,6 +2552,9 @@ "interface.tubecoin_moved_down_p_on_the":"TubeCoin ist auf dem Weg zu deinem Konto um {p} % gefallen.", "interface.tubecoin_moved_up_p_on_the":"TubeCoin ist auf dem Weg zu deinem Konto um {p} % gestiegen.", "interface.you_bought_out_bank_they_flew":"Du hast {bank} ausbezahlt.
Sie sind weitergeflogen, um ein anderes Startup zu finden.", +"ix_downgrade.pni_downgraded":"Das PNI mit {net} in {city} ist jetzt {port}.", +"ix_downgrade.port_downgraded_at_ix":"Der Port bei {ix} ist jetzt {port}.", +"ix_downgrade.transit_downgraded":"{net}-Transit in {city} ist jetzt {port}.", "keys.close_a_window_or_deselect":"Fenster schließen oder Stadt bzw. Link abwählen", "keys.esc":"Esc", "keys.game_speed":"Spielgeschwindigkeit: ½×, 1×, 2×, 4×, 8×", @@ -2637,6 +2640,7 @@ "link_panels.dark_fiber_kind_km_km":"Dark Fiber · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"Personalisierte DE-KICKS-Preise: {p} % von dem, was ein normaler IX verlangen würde (Aktion, noch {n} Tage).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"Personalisierte DE-KICKS-Preise: {p} % von dem, was ein normaler IX verlangen würde.", +"link_panels.downgrade_port_price":"{port} downgraden {price}", "link_panels.each_channel_is_a_pair_of":"Jeder Kanal ist ein Paar Optiken, eine pro Ende. ZR+-Optiken stecken direkt in deinen Routern. Transponder sitzen in einem Shelf.", "link_panels.enters_your_network_at":"Kommt in dein Netz bei", "link_panels.every_pop_carries_net_s_traffic":"Jeder POP leitet den Verkehr zu {net} durch dein Netz bis zu diesem Port.", diff --git a/site/i18n/es.js b/site/i18n/es.js index 4fb7607..f880db3 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -2550,6 +2550,9 @@ "interface.tubecoin_moved_down_p_on_the":"TubeCoin bajó un {p} % de camino a tu cuenta.", "interface.tubecoin_moved_up_p_on_the":"TubeCoin subió un {p} % de camino a tu cuenta.", "interface.you_bought_out_bank_they_flew":"Compraste {bank}.
Se fueron volando a buscar otra startup.", +"ix_downgrade.pni_downgraded":"El PNI con {net} en {city} ahora es {port}.", +"ix_downgrade.port_downgraded_at_ix":"El puerto en {ix} es ahora de {port}.", +"ix_downgrade.transit_downgraded":"El tránsito de {net} en {city} ahora es {port}.", "keys.close_a_window_or_deselect":"Cerrar una ventana, o deseleccionar una ciudad o un enlace", "keys.esc":"Esc", "keys.game_speed":"Velocidad del juego: ½×, 1×, 2×, 4×, 8×", @@ -2635,6 +2638,7 @@ "link_panels.dark_fiber_kind_km_km":"Fibra oscura · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"Precio personalizado de DE-KICKS: {p} % de lo que cobraría un IX normal (promo, quedan {n} días).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"Precio personalizado de DE-KICKS: {p} % de lo que cobraría un IX normal.", +"link_panels.downgrade_port_price":"Reducir {port} {price}", "link_panels.each_channel_is_a_pair_of":"Cada canal es un par de ópticas, una por extremo. Las ópticas ZR+ se enchufan directo a tus routers. Los transpondedores van en un estante.", "link_panels.enters_your_network_at":"Entra en tu red por", "link_panels.every_pop_carries_net_s_traffic":"Cada POP lleva el tráfico de {net} por tu red hasta este puerto.", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 1c1d4b2..a78afb5 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -2550,6 +2550,9 @@ "interface.tubecoin_moved_down_p_on_the":"Le TubeCoin a perdu {p} % en route vers ton compte.", "interface.tubecoin_moved_up_p_on_the":"Le TubeCoin a pris {p} % en route vers ton compte.", "interface.you_bought_out_bank_they_flew":"Tu as racheté la part de {bank}.
Ils se sont envolés à la recherche d’une autre startup.", +"ix_downgrade.pni_downgraded":"Le PNI avec {net} à {city} est maintenant en {port}.", +"ix_downgrade.port_downgraded_at_ix":"Le port chez {ix} est maintenant en {port}.", +"ix_downgrade.transit_downgraded":"Le transit {net} à {city} est maintenant en {port}.", "keys.close_a_window_or_deselect":"Fermer une fenêtre, ou désélectionner une ville ou un lien", "keys.esc":"Échap", "keys.game_speed":"Vitesse du jeu : ½×, 1×, 2×, 4×, 8×", @@ -2635,6 +2638,7 @@ "link_panels.dark_fiber_kind_km_km":"Fibre noire · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"Tarif personnalisé DE-KICKS : {p} % de ce que facturerait un IX normal (promo, encore {n} jours).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"Tarif personnalisé DE-KICKS : {p} % de ce que facturerait un IX normal.", +"link_panels.downgrade_port_price":"Rétrograder en {port} {price}", "link_panels.each_channel_is_a_pair_of":"Chaque canal, c’est une paire d’optiques, une à chaque bout. Les optiques ZR+ se branchent directement dans tes routeurs. Les transpondeurs vivent sur une étagère.", "link_panels.enters_your_network_at":"Entre dans ton réseau à", "link_panels.every_pop_carries_net_s_traffic":"Chaque POP achemine le trafic de {net} à travers ton réseau jusqu’à ce port.", diff --git a/site/i18n/it.js b/site/i18n/it.js index 9b802e3..d2610b9 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -2550,6 +2550,9 @@ "interface.tubecoin_moved_down_p_on_the":"TubeCoin è sceso del {p}% mentre arrivava sul tuo conto.", "interface.tubecoin_moved_up_p_on_the":"TubeCoin è salito del {p}% mentre arrivava sul tuo conto.", "interface.you_bought_out_bank_they_flew":"Hai liquidato {bank}.
Sono volati via in cerca di un’altra startup.", +"ix_downgrade.pni_downgraded":"Il PNI con {net} a {city} ora è {port}.", +"ix_downgrade.port_downgraded_at_ix":"La porta su {ix} ora è da {port}.", +"ix_downgrade.transit_downgraded":"Il transito {net} a {city} ora è {port}.", "keys.close_a_window_or_deselect":"Chiudi una finestra, o deseleziona una città o un link", "keys.esc":"Esc", "keys.game_speed":"Velocità di gioco: ½×, 1×, 2×, 4×, 8×", @@ -2635,6 +2638,7 @@ "link_panels.dark_fiber_kind_km_km":"Dark fiber · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"Prezzi personalizzati DE-KICKS: {p}% di quanto chiederebbe un IX normale (promo, ancora {n} giorni).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"Prezzi personalizzati DE-KICKS: {p}% di quanto chiederebbe un IX normale.", +"link_panels.downgrade_port_price":"Riduci a {port} {price}", "link_panels.each_channel_is_a_pair_of":"Ogni canale è una coppia di ottiche, una per estremità. Le ottiche ZR+ si infilano direttamente nei tuoi router. I transponder stanno su uno scaffale.", "link_panels.enters_your_network_at":"Entra nella tua rete a", "link_panels.every_pop_carries_net_s_traffic":"Ogni POP instrada il traffico di {net} attraverso la tua rete fino a questa porta.", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 42ca139..1d923e8 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -2550,6 +2550,9 @@ "interface.tubecoin_moved_down_p_on_the":"A TubeCoin caiu {p}% no caminho até sua conta.", "interface.tubecoin_moved_up_p_on_the":"A TubeCoin subiu {p}% no caminho até sua conta.", "interface.you_bought_out_bank_they_flew":"Você comprou a parte de {bank}.
Eles voaram em busca de outra startup.", +"ix_downgrade.pni_downgraded":"O PNI com {net} em {city} agora é {port}.", +"ix_downgrade.port_downgraded_at_ix":"A porta em {ix} agora é de {port}.", +"ix_downgrade.transit_downgraded":"O trânsito de {net} em {city} agora é {port}.", "keys.close_a_window_or_deselect":"Fechar uma janela, ou desmarcar uma cidade ou link", "keys.esc":"Esc", "keys.game_speed":"Velocidade do jogo: ½×, 1×, 2×, 4×, 8×", @@ -2635,6 +2638,7 @@ "link_panels.dark_fiber_kind_km_km":"Dark fiber · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"Preço personalizado DE-KICKS: {p}% do que um IX normal cobraria (promo, faltam {n} dias).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"Preço personalizado DE-KICKS: {p}% do que um IX normal cobraria.", +"link_panels.downgrade_port_price":"Downgrade para {port} {price}", "link_panels.each_channel_is_a_pair_of":"Cada canal é um par de ópticas, uma em cada ponta. Ópticas ZR+ encaixam direto nos seus routers. Transponders ficam numa prateleira.", "link_panels.enters_your_network_at":"Entra na sua rede em", "link_panels.every_pop_carries_net_s_traffic":"Cada POP leva o tráfego de {net} pela sua rede até esta porta.", diff --git a/src/game/90-actions/21-ix-downgrade.js b/src/game/90-actions/21-ix-downgrade.js new file mode 100644 index 0000000..d65cd23 --- /dev/null +++ b/src/game/90-actions/21-ix-downgrade.js @@ -0,0 +1,9 @@ +/* Step a port down one size: exchange ports, transit ports and PNIs. Upgrading was possible, downsizing meant leaving and rejoining. */ +Object.assign(ACT,{ + downIx:({city})=>{const had=S.ixp[city];if(had===undefined||S.myIx[city]||!(had>0))return; + S.ixp[city]=had-1;toast(tr('ix_downgrade.port_downgraded_at_ix',{port:PORT[had-1].n,ix:esc(ixName(city))}),'good');sfx('click');after();}, + downT:({id})=>{const t=S.transit.find(x=>x.id===id);if(!t||!(t.tier>0))return;t.tier--; + toast(tr('ix_downgrade.transit_downgraded',{net:esc(NET[t.net].name),city:CITY[t.city].name,port:lagName(t.tier,t.n)}),'good');sfx('click');after();}, + downP:({id})=>{const p=S.pni.find(x=>x.id===id);if(!p||!pniOn(p)||p.up||p.g1||!(p.tier>0))return;p.tier--; + toast(tr('ix_downgrade.pni_downgraded',{net:esc(NET[p.net].name),city:CITY[p.city].name,port:pniPN(p)}),'good');sfx('click');after();}, +}); diff --git a/src/game/93-ui/50-city-panel.js b/src/game/93-ui/50-city-panel.js index 045d7ba..b12a20b 100644 --- a/src/game/93-ui/50-city-panel.js +++ b/src/game/93-ui/50-city-panel.js @@ -48,7 +48,7 @@ function cityPanel(c){ 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))})}
-
${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.cash1?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')}
`;} +
${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+=`
`;} h+=``; diff --git a/src/game/93-ui/52-pni-list.js b/src/game/93-ui/52-pni-list.js index cad97f4..381c9fa 100644 --- a/src/game/93-ui/52-pni-list.js +++ b/src/game/93-ui/52-pni-list.js @@ -11,7 +11,7 @@ function pniValLine(n,c,v){ return `
${tr('pni_list.n_here',{g:fmtG(v.want)})}: ${via} → ${tr('pni_list.with_port',{port:PORT[v.tier].n,val})}
`;} function pniRow(c,n,pn,v,chk){let h=`
${logo(n)}
${esc(n.name)} ${n.pol}${v&&v.worth?` ⭐ ${tr('pni_list.worth_it')}`:''}
${pniChip(n.id,c)}
${v?pniValLine(n,c,v):''}`; if(pn&&!pniOn(pn))h+=pniWait(pn,c); - else if(pn){const u=R.usePni[pn.id]||0,cap=lagCap(pniG(pn),pn.n);h+=`
${(pn.n||1)>1?`${pn.n}×${pniPN(pn)} LAG`:pniPN(pn)} PNI${fmtG(u)}
${pn.up?`
${tr('city_panel.augment_on_order_port_about_n',{port:(pn.up.n>1?pn.up.n+'×':'')+(pn.up.g1?'1G':PORT[pn.up.tier].n),n:Math.max(0,pn.up.ready-S.day)})} ${btn(tr('common.chase_it'),'pniChase',{id:pn.id},'ghost sm')}
`:''}
${prefCtl('p',pn.id,pn.pref)}${siteCtl('p',pn.id,c,pn.up&&pn.up.site==='ab'?'ab':pn.site)}
${PORT.map((P2,i)=>!pn.up&&!msfNope(n.id,c)&&(i>pn.tier||(pn.g1&&i===0))?btn((a=>(pn.n||1)>1?tr('common.upgrade_all_to_port_cost_mo',a):tr('common.upgrade_port_cost_mo_mo',a))({port:P2.n,cost:fmt$((1500+P2.setup/2)*(pn.n||1)),mo:fmt$(P2.pni*(pn.n||1))}),'pni',{city:c,net:n.id,tier:i},'sm',!portOk(c,i)||S.cash<(1500+P2.setup/2)*(pn.n||1)):'').join('')}${(pn.n||1)1?btn(tr('common.member'),'lagP',{id:pn.id,d:-1},'ghost sm'):''}${NET[n.id].cn?btn(pn.sacrif?tr('common.sacrificial_choke'):tr('city_panel.make_sacrificial_contains_floods_1_2'),'sacrif',{id:pn.id},pn.sacrif?'green sm':'sm'):''}${btn(UI.confirm===pn.id?tr('common.really_remove'):tr('common.remove'),'cancelPni',{id:pn.id},'ghost sm')}
`;} + else if(pn){const u=R.usePni[pn.id]||0,cap=lagCap(pniG(pn),pn.n);h+=`
${(pn.n||1)>1?`${pn.n}×${pniPN(pn)} LAG`:pniPN(pn)} PNI${fmtG(u)}
${pn.up?`
${tr('city_panel.augment_on_order_port_about_n',{port:(pn.up.n>1?pn.up.n+'×':'')+(pn.up.g1?'1G':PORT[pn.up.tier].n),n:Math.max(0,pn.up.ready-S.day)})} ${btn(tr('common.chase_it'),'pniChase',{id:pn.id},'ghost sm')}
`:''}
${prefCtl('p',pn.id,pn.pref)}${siteCtl('p',pn.id,c,pn.up&&pn.up.site==='ab'?'ab':pn.site)}
${PORT.map((P2,i)=>!pn.up&&!msfNope(n.id,c)&&(i>pn.tier||(pn.g1&&i===0))?btn((a=>(pn.n||1)>1?tr('common.upgrade_all_to_port_cost_mo',a):tr('common.upgrade_port_cost_mo_mo',a))({port:P2.n,cost:fmt$((1500+P2.setup/2)*(pn.n||1)),mo:fmt$(P2.pni*(pn.n||1))}),'pni',{city:c,net:n.id,tier:i},'sm',!portOk(c,i)||S.cash<(1500+P2.setup/2)*(pn.n||1)):'').join('')}${!pn.up&&!pn.g1&&pn.tier>0&&!msfNope(n.id,c)?btn(tr('link_panels.downgrade_port_price',{port:PORT[pn.tier-1].n,price:portMo(PORT[pn.tier-1].pni*(pn.n||1))}),'downP',{id:pn.id},'ghost sm'):''}${(pn.n||1)1?btn(tr('common.member'),'lagP',{id:pn.id,d:-1},'ghost sm'):''}${NET[n.id].cn?btn(pn.sacrif?tr('common.sacrificial_choke'):tr('city_panel.make_sacrificial_contains_floods_1_2'),'sacrif',{id:pn.id},pn.sacrif?'green sm':'sm'):''}${btn(UI.confirm===pn.id?tr('common.really_remove'):tr('common.remove'),'cancelPni',{id:pn.id},'ghost sm')}
`;} else{h+=chk.ok?`
${pniG1(n.id)?btn(tr('city_panel.port_cost_mo_mo',{port:'1G',cost:fmt$(PNI_G1_COST),mo:fmt$(Math.round(PORT[0].pni/2))}),'pni',{city:c,net:n.id,tier:-1},'sm',S.cashportShown(i)&&i>=pniMin(n.id)?btn(tr('city_panel.port_cost_mo_mo',{port:P2.n,cost:fmt$(1500+P2.setup/2),mo:fmt$(P2.pni)}),'pni',{city:c,net:n.id,tier:i},'sm',S.cash<1500+P2.setup/2||!portOk(c,i)):'').join('')}
${pniEta(n.id)}${pniMin(n.id)?' · '+tr('city_panel.no_10g_net_starts_at_100g',{net:esc(n.name)}):pniG1(n.id)?' · '+tr('city_panel.sells_pnis_down_to_1g'):''}
${chk.fee?`
${tr('city_panel.paid_peering_price_mo_on_top',{price:fmt$(chk.fee)})}
`:''}`:`
${esc(chk.why)}
`;} return h+`
`;} function pniListHtml(c){const f=UI.pniF||'all',az=UI.pniSort==='az',open=UI.pniOpen||{}; diff --git a/src/game/93-ui/70-link-panels.js b/src/game/93-ui/70-link-panels.js index fae644b..f588fbb 100644 --- a/src/game/93-ui/70-link-panels.js +++ b/src/game/93-ui/70-link-panels.js @@ -13,7 +13,7 @@ function ixBlock(c,multi){const city=ixCity(c),C=CITY[city],ix=ixName(c),X=XIXM[ 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)}

`; if(mine){const f=S.myIx[c].fab|0,N=MYIX_FAB[f+1];h+=`
${tr('link_panels.members_paying_you')}${tr('link_panels.n_of_up_to_max_price',{n:S.myIx[c].members.length,max:myFab(c).max,price:fmt$(S.myIx[c].members.length*MYIX_FEE)})}
${N?`
${btn(N.lvl>lvl()?tr('link_panels.name_fabric_level_lv',{name:N.n,lv:N.lvl}):tr('link_panels.upgrade_fabric_to_name_cost_mo',{name:N.n,cost:fmt$(N.cost),mo:fmt$(N.mo)}),'myIxUp',{city:c},'pink sm',N.lvl>lvl()||S.cash

${tr('link_panels.a_bigger_fabric_carries_more_traffic')}

`:'

'+tr('link_panels.biggest_fabric_money_can_buy')+'

'}`;} - else h+=`
${PORT.map((P2,i)=>i>S.ixp[c]&&portShown(i)?btn(tr('common.upgrade_port_price',{port:P2.n,price:portMo(ixPortMo(c,i)*((S.ixn||{})[c]||1))}),'buyIx',{city:c,tier:i},'sm',(!!S.pops[city]&&!portOk(city,i))||(!S.pops[city]&&i>1)):'').join('')}${S.pops[city]&&((S.ixn||{})[c]||1)1?btn(tr('common.member'),'lagIx',{city:c,d:-1},'ghost sm'):''}${btn(S.rs[c]?tr('link_panels.leave_route_server'):tr('link_panels.join_route_server'),'rs',{city:c},S.rs[c]?'ghost sm':'pink sm')}${S.rs[c]&&ppol()!=='open'?`${tr('link_panels.off_while_your_peering_policy_is',{pol:tr(PPOL_N[ppol()])})}`:''}${btn(UI.confirm==='ix'+c?tr('common.really_leave'):tr('common.leave_ix'),'cancelIx',{city:c},'ghost sm')}
`; + else h+=`
${PORT.map((P2,i)=>i>S.ixp[c]&&portShown(i)?btn(tr('common.upgrade_port_price',{port:P2.n,price:portMo(ixPortMo(c,i)*((S.ixn||{})[c]||1))}),'buyIx',{city:c,tier:i},'sm',(!!S.pops[city]&&!portOk(city,i))||(!S.pops[city]&&i>1)):'').join('')}${S.pops[city]&&((S.ixn||{})[c]||1)1?btn(tr('common.member'),'lagIx',{city:c,d:-1},'ghost sm'):''}${S.ixp[c]>0?btn(tr('link_panels.downgrade_port_price',{port:PORT[S.ixp[c]-1].n,price:portMo(ixPortMo(c,S.ixp[c]-1)*((S.ixn||{})[c]||1))}),'downIx',{city:c},'ghost sm'):''}${btn(S.rs[c]?tr('link_panels.leave_route_server'):tr('link_panels.join_route_server'),'rs',{city:c},S.rs[c]?'ghost sm':'pink sm')}${S.rs[c]&&ppol()!=='open'?`${tr('link_panels.off_while_your_peering_policy_is',{pol:tr(PPOL_N[ppol()])})}`:''}${btn(UI.confirm==='ix'+c?tr('common.really_leave'):tr('common.leave_ix'),'cancelIx',{city:c},'ghost sm')}
`; h+=`
`; {const elig=mine?[]:ixMembers(c).filter(id=>!set.has(id)&&peerOk(id,'ix',c).ok);if(elig.length>1)h+=`
${btn(tr('link_panels.request_all_n_willing_peers',{n:elig.length}),'peerAll',{city:c},'pink sm')}
`;} for(const id of ixMembers(c).sort((a,b)=>NSH[b]-NSH[a])){const n=NET[id],on=set.has(id),viaRs=on&&!S.peers[id+'@'+c]&&!mine,chk=peerOk(id,'ix',c); diff --git a/src/i18n/en.js b/src/i18n/en.js index 695bb87..f39d131 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -2551,6 +2551,9 @@ "interface.tubecoin_moved_down_p_on_the":"TubeCoin moved down {p}% on the way to your account.", "interface.tubecoin_moved_up_p_on_the":"TubeCoin moved up {p}% on the way to your account.", "interface.you_bought_out_bank_they_flew":"You bought out {bank}.
They flew off to find another startup.", +"ix_downgrade.pni_downgraded":"The PNI with {net} in {city} is now {port}.", +"ix_downgrade.port_downgraded_at_ix":"Port at {ix} is now {port}.", +"ix_downgrade.transit_downgraded":"{net} transit in {city} is now {port}.", "keys.close_a_window_or_deselect":"Close a window, or deselect a city or link", "keys.esc":"Esc", "keys.game_speed":"Game speed: ½×, 1×, 2×, 4×, 8×", @@ -2636,6 +2639,7 @@ "link_panels.dark_fiber_kind_km_km":"Dark fiber · {kind} · {km} km", "link_panels.de_kicks_personalised_pricing_p_of":"DE-KICKS personalised pricing: {p}% of what a normal IX would charge (promo, {n} days left).", "link_panels.de_kicks_personalised_pricing_p_of_3d4f":"DE-KICKS personalised pricing: {p}% of what a normal IX would charge.", +"link_panels.downgrade_port_price":"Downgrade {port} {price}", "link_panels.each_channel_is_a_pair_of":"Each channel is a pair of optics, one per end. ZR+ optics plug straight into your routers. Transponders sit on a shelf.", "link_panels.enters_your_network_at":"Enters your network at", "link_panels.every_pop_carries_net_s_traffic":"Every POP carries {net}'s traffic across your network to this port.", diff --git a/tests/ix-downgrade.test.js b/tests/ix-downgrade.test.js new file mode 100644 index 0000000..524a6fd --- /dev/null +++ b/tests/ix-downgrade.test.js @@ -0,0 +1,60 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const { load } = require('./harness'); + +const start = "ACT.start({});S.cash=1e8;S.nextFail=1e9;S.nextEvent=1e9;for(const g of GOALS)S.done[g.id]=0;ACT.launchBB({city:'fra'});ACT.buyTransit({city:'fra',net:'cog',tier:1})"; + +test('an exchange port steps down one size at a time, and stops at the smallest', () => { + const { ev, errors } = load(); + ev(start); + ev("ACT.buyIx({city:'fra',tier:1,signed:1})"); + assert.equal(ev("S.ixp.fra"), 1, 'joined at 100G'); + assert.ok(ev("ixPortMo('fra',0)") < ev("ixPortMo('fra',1)")); + assert.match(ev("ixSection('fra')"), /Downgrade 10G/, 'one button, naming the next size down'); + const cash = ev("S.cash"); + ev("ACT.downIx({city:'fra'})"); + assert.equal(ev("S.ixp.fra"), 0, 'down to 10G'); + assert.ok(ev("S.cash") >= cash - 1e6, 'a downgrade costs nothing up front'); + assert.doesNotMatch(ev("ixSection('fra')"), /Downgrade/, 'nothing below the smallest port'); + ev("ACT.downIx({city:'fra'})"); + assert.equal(ev("S.ixp.fra"), 0, 'the smallest port stays'); + ev("ACT.downIx({city:'ams'})"); + assert.equal(ev("S.ixp.ams"), undefined, 'a port you do not have stays that way'); + ev("compute()"); + assert.ok(ev("ixCap('fra')") <= 10 * ev("(S.ixn||{}).fra||1"), 'capacity follows the smaller port'); + assert.deepEqual(errors, []); +}); + +test('a transit port steps down one size at a time, with a button naming the next size down', () => { + const { ev, errors } = load(); + ev(start); + ev("S.pops.fra.rgen=3;ACT.buyTransit({city:'fra',net:'cog',tier:2})"); + const id = ev("S.transit.find(t=>t.net==='cog'&&t.city==='fra').id"); + assert.equal(ev("S.transit.find(t=>t.id==='" + id + "').tier"), 2); + ev("UI.tab='up'"); + assert.match(ev("cityPanel('fra')"), /Downgrade 100G/, 'one button, naming the next size down'); + ev(`ACT.downT({id:'${id}'})`); + assert.equal(ev(`S.transit.find(t=>t.id==='${id}').tier`), 1, 'down one size'); + ev(`ACT.downT({id:'${id}'})`); + assert.equal(ev(`S.transit.find(t=>t.id==='${id}').tier`), 0, 'and one more'); + ev(`ACT.downT({id:'${id}'})`); + assert.equal(ev(`S.transit.find(t=>t.id==='${id}').tier`), 0, 'the smallest port stays'); + ev("ACT.downT({id:'nope'})"); + assert.deepEqual(errors, []); +}); + +test('a PNI steps down one size at a time, but not while an augment is on order', () => { + const { ev, errors } = load(); + ev(start); + ev("S.pops.fra.rgen=3;S.pni.push({id:'pt1',net:'cog',city:'fra',tier:2});UI.tab='peer';compute()"); + assert.match(ev("cityPanel('fra')"), /Downgrade 100G/, 'one button, naming the next size down'); + ev("ACT.downP({id:'pt1'})"); + assert.equal(ev("S.pni.find(p=>p.id==='pt1').tier"), 1, 'down one size'); + ev("S.pni.find(p=>p.id==='pt1').up={tier:1,n:2,ready:S.day+30};ACT.downP({id:'pt1'})"); + assert.equal(ev("S.pni.find(p=>p.id==='pt1').tier"), 1, 'an augment on order blocks it'); + ev("S.pni.find(p=>p.id==='pt1').up=null;S.pni.find(p=>p.id==='pt1').tier=0;ACT.downP({id:'pt1'})"); + assert.equal(ev("S.pni.find(p=>p.id==='pt1').tier"), 0, 'the smallest port stays'); + ev("S.pni.find(p=>p.id==='pt1').tier=1;S.pni.find(p=>p.id==='pt1').ready=S.day+9;ACT.downP({id:'pt1'})"); + assert.equal(ev("S.pni.find(p=>p.id==='pt1').tier"), 1, 'a PNI that is not up yet stays'); + assert.deepEqual(errors, []); +});