diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b2278..7fe00f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] +- Cancelling an IRU, giving up your own fiber or decommissioning a POP now puts the optics on its fibers back on the spares shelf, instead of throwing them away (#229). - Big networks freeze for less on every game day and every click: working out where traffic goes skips exits whose route is already full, so a game day takes about 40% less time (#210). Traffic goes exactly where it went before. - Premium submarine terminals and Optical engineering can no longer be bought on a cable where they would change nothing (#198). The button now says so, and an upgrade that only helps together with the other one stays available. - A wave size that is sold out on a route can no longer be reached by upgrading a smaller wave on it (#201). The upgrade button says how long it is sold out, just like when buying. diff --git a/site/i18n/de.js b/site/i18n/de.js index 64a42ff..08147ce 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -2447,6 +2447,7 @@ "links.fabric_port_in_city_is_full":"Fabric-Port in {city} ist voll.", "links.fixed_what_resolved_early":"Repariert. {what} vorzeitig behoben.", "links.ix_now_runs_a_fab_fabric":"{ix} betreibt jetzt eine {fab}-Fabric.
Platz für {max} Mitglieder. Rechne mit ein paar weiteren Beitritten.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} Optik ist zurück im Ersatzteilregal","other":"{n} Optiken sind zurück im Ersatzteilregal"}, "links.name_is_called_off_the_cable":"{name} ist abgesagt.
Die Kabelfabrik nimmt das Glas zurück, das niemand braucht: {price} zurück.", "links.no_cable_available_for_that_route":"Für diese Route ist gerade kein Kabel verfügbar.", "links.no_wave_capacity_on_this_route":"Auf dieser Route gerade keine {wave}-Kapazität.
{why} Versuch eine kleinere Wave, eine andere Route oder frag in {n} Tagen nochmal.", diff --git a/site/i18n/es.js b/site/i18n/es.js index 13aeff7..a2f9bf9 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -2445,6 +2445,7 @@ "links.fabric_port_in_city_is_full":"El puerto de fabric en {city} está lleno.", "links.fixed_what_resolved_early":"Arreglado. {what} se resolvió antes.", "links.ix_now_runs_a_fab_fabric":"{ix} ahora tiene una fabric {fab}.
Hay sitio para {max} miembros. Espera que se unan algunos más.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} óptica volvió al estante de repuestos","other":"{n} ópticas volvieron al estante de repuestos"}, "links.name_is_called_off_the_cable":"{name} se cancela.
La fábrica de cables recupera el vidrio que nadie necesita: te devuelve {price}.", "links.no_cable_available_for_that_route":"Ahora mismo no hay cable disponible para esa ruta.", "links.no_wave_capacity_on_this_route":"Ahora no hay capacidad de {wave} en esta ruta.
{why} Prueba una onda menor, otra ruta, o vuelve a preguntar en {n} días.", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 93e7fa7..eba64c8 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -2445,6 +2445,7 @@ "links.fabric_port_in_city_is_full":"Le port fabric de {city} est plein.", "links.fixed_what_resolved_early":"Réparé. {what} : résolu en avance.", "links.ix_now_runs_a_fab_fabric":"{ix} tourne maintenant sur un fabric {fab}.
De la place pour {max} membres. Attends-toi à quelques nouveaux venus.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} optique est retournée sur l’étagère de rechange","other":"{n} optiques sont retournées sur l’étagère de rechange"}, "links.name_is_called_off_the_cable":"{name} est annulé.
L’usine de câbles reprend le verre dont personne n’a besoin : {price} remboursés.", "links.no_cable_available_for_that_route":"Aucun câble disponible pour cette route pour l’instant.", "links.no_wave_capacity_on_this_route":"Plus de capacité {wave} sur cette route pour l’instant.
{why} Essayez une onde plus petite, une autre route, ou redemandez dans {n} jours.", diff --git a/site/i18n/it.js b/site/i18n/it.js index 512cb33..c4a4d37 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -2445,6 +2445,7 @@ "links.fabric_port_in_city_is_full":"La porta fabric a {city} è piena.", "links.fixed_what_resolved_early":"Sistemato. {what}: risolto in anticipo.", "links.ix_now_runs_a_fab_fabric":"{ix} ora gira su un fabric {fab}.
Spazio per {max} membri. Aspettati qualche nuovo arrivo.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} ottica è tornata sullo scaffale dei ricambi","other":"{n} ottiche sono tornate sullo scaffale dei ricambi"}, "links.name_is_called_off_the_cable":"{name} è annullato.
La fabbrica di cavi si riprende il vetro che non serve a nessuno: {price} indietro.", "links.no_cable_available_for_that_route":"Al momento non c’è nessun cavo disponibile per quella tratta.", "links.no_wave_capacity_on_this_route":"Nessuna capacità {wave} su questa tratta al momento.
{why} Prova un’onda più piccola, un’altra tratta, o chiedi di nuovo tra {n} giorni.", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index ec25f9d..1511fd2 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -2445,6 +2445,7 @@ "links.fabric_port_in_city_is_full":"A porta de fabric em {city} está cheia.", "links.fixed_what_resolved_early":"Resolvido. {what}: resolvido antes da hora.", "links.ix_now_runs_a_fab_fabric":"{ix} agora roda num fabric {fab}.
Espaço para {max} membros. Espere mais alguns chegarem.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} óptico voltou para a prateleira de reservas","other":"{n} ópticos voltaram para a prateleira de reservas"}, "links.name_is_called_off_the_cable":"{name} foi cancelado.
A fábrica de cabos pega de volta o vidro que ninguém precisa: {price} de volta.", "links.no_cable_available_for_that_route":"Nenhum cabo disponível para essa rota agora.", "links.no_wave_capacity_on_this_route":"Sem capacidade de {wave} nesta rota agora.
{why} Tente uma onda menor, outra rota, ou pergunte de novo em {n} dias.", diff --git a/src/game/90-actions/60-links.js b/src/game/90-actions/60-links.js index f9b7d87..a795f32 100644 --- a/src/game/90-actions/60-links.js +++ b/src/game/90-actions/60-links.js @@ -3,7 +3,8 @@ Object.assign(ACT,{ decomOpen:({city})=>{UI.decom=new Set(city&&S.pops[city]?[city]:[]);decomModal();}, decomToggle:({city})=>{if(!S.pops[city])return;UI.decom=UI.decom||new Set();if(UI.decom.has(city))UI.decom.delete(city);else UI.decom.add(city);decomModal();}, decomGo:()=>{const sel=[...(UI.decom||[])].filter(c=>S.pops[c]);if(!sel.length||sel.length>=Object.keys(S.pops).length)return;closeModal();UI.decom=null;UI.sel=null;decommission(sel);sfx('alert');after();}, - rmLink:({id})=>{if(UI.confirm!==id){UI.confirm=id;renderPanel();return;}{const l=S.links.find(x=>x.id===id),back=cabBack(l);if(back>0){S.cash+=back;toast(tr('links.name_is_called_off_the_cable',{name:esc(l.cname||tr('common.your_cable')),price:fmt$(back)}),'good');}}S.links=S.links.filter(l=>l.id!==id);prunePairMet();UI.sel=null;UI.confirm=null;after();}, + rmLink:({id})=>{if(UI.confirm!==id){UI.confirm=id;renderPanel();return;}{const l=S.links.find(x=>x.id===id),back=cabBack(l);if(back>0){S.cash+=back;toast(tr('links.name_is_called_off_the_cable',{name:esc(l.cname||tr('common.your_cable')),price:fmt$(back)}),'good');} + const n=chBack(l?[l]:[]);if(n)toast(trn('links.n_optic_back_on_the_spares_shelf',n),'good');}S.links=S.links.filter(l=>l.id!==id);prunePairMet();UI.sel=null;UI.confirm=null;after();}, // The chaos monkey takes a banana and goes home early (no bonus). mkBanana:()=>{if(!mkOn())return;if(!spend(mkBananaCost()))return;S.stats.bananas=(S.stats.bananas||0)+1;mkLeave('banana');track('monkey_banana');after();}, fixInc:({id})=>{const i=S.inc.find(x=>x.id===id);if(!i||!(i.cost>0))return;if(i.slow&&i.rushed)return;if(!spend(i.cost))return; diff --git a/src/game/90-actions/90-action-helpers.js b/src/game/90-actions/90-action-helpers.js index c92ff51..8d4f665 100644 --- a/src/game/90-actions/90-action-helpers.js +++ b/src/game/90-actions/90-action-helpers.js @@ -12,6 +12,8 @@ function dfAllowed(a,b){if(isSub(a,b))return !!subDfCable(a,b);return cnCity(a)= /* Optics you unplug go on a spares shelf instead of in the bin (#45): the next channel of that type uses a spare for free (only the regen sites' transponders are new), or you sell it on eBuy for part of the price. */ const SPARE_RESALE=0.4,spareN=o=>(S&&S.spares&&S.spares[o])|0,spareValue=o=>Math.round(optCost(o)*SPARE_RESALE); +// A fiber given up (a cancelled IRU, a cable called off, a decommissioned POP) keeps its optics: they go on the shelf too (#229). +const chBack=links=>{let n=0;for(const l of links)for(const o of (l&&l.ch)||[])if(OPT[o]){S.spares=S.spares||{};S.spares[o]=(S.spares[o]||0)+1;n++;}return n;}; function chCost(l,o){const r=REGEN_CH*(l.regen|0);return Math.round(optCost(o)*(spareN(o)>0?r:1+r));} function optCost(o){return Math.round(OPT[o].cost*techMul(OPT[o].lvl)*hwMul('opt')*(S&&S.ev&&S.ev.tariff>S.day?1.4:1));} // Line systems upgrade in place: Rainbow → ROADMaster → C+L. Every lit pair gets the new gear. diff --git a/src/game/93-ui/60-decommission.js b/src/game/93-ui/60-decommission.js index e2db4cf..d8df5df 100644 --- a/src/game/93-ui/60-decommission.js +++ b/src/game/93-ui/60-decommission.js @@ -13,10 +13,10 @@ function decomModal(){const sel=[...(UI.decom||[])],im=decomImpact(sel),all=Obje ${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)); - S.links=S.links.filter(l=>!lids.has(l.id));prunePairMet();S.biz=S.biz.filter(b=>!bids.has(b.id));S.offers=S.offers.filter(o=>!bCities(o).some(c=>set.has(c))); + const back=chBack(im.links);S.links=S.links.filter(l=>!lids.has(l.id));prunePairMet();S.biz=S.biz.filter(b=>!bids.has(b.id));S.offers=S.offers.filter(o=>!bCities(o).some(c=>set.has(c))); S.transit=S.transit.filter(t=>!set.has(t.city));S.pni=S.pni.filter(x=>!set.has(x.city));S.caches=S.caches.filter(x=>!set.has(x.city));S.nni=(S.nni||[]).filter(x=>!set.has(x.city)); for(const c of cities){for(const x of ixIdsIn(c)){delete S.ixp[x];delete S.rs[x];if(S.ixn)delete S.ixn[x];if(S.ixSite)delete S.ixSite[x];for(const k in S.peers)if(k.endsWith('@'+x))delete S.peers[k];}delete S.myIx[c];S.scrubs=S.scrubs.filter(x=>x.city!==c);if(S.ops)delete S.ops.skip[c];delete S.pops[c];} const rem=remoteCities();for(const x in S.ixp){const c=ixCity(x);if(!S.pops[c]&&!rem.includes(c)){delete S.ixp[x];delete S.rs[x];for(const k in S.peers)if(k.endsWith('@'+x))delete S.peers[k];}} if(set.has(S.home))S.home=Object.keys(S.pops)[0]; purgeInc();S.cash-=im.fee;S.stats.decom=(S.stats.decom||0)+cities.length; - toast(trn('decommission.n_pop_decommissioned_fee_in_early',cities.length,{fee:fmt$(im.fee),m:im.biz.length}),'bad');} + toast(trn('decommission.n_pop_decommissioned_fee_in_early',cities.length,{fee:fmt$(im.fee),m:im.biz.length}),'bad');if(back)toast(trn('links.n_optic_back_on_the_spares_shelf',back),'good');} diff --git a/src/i18n/en.js b/src/i18n/en.js index ec710fd..7df4a3f 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -2446,6 +2446,7 @@ "links.fabric_port_in_city_is_full":"Fabric port in {city} is full.", "links.fixed_what_resolved_early":"Fixed. {what} resolved early.", "links.ix_now_runs_a_fab_fabric":"{ix} now runs a {fab} fabric.
Room for {max} members. Expect a few more to join.", +"links.n_optic_back_on_the_spares_shelf":{"one":"{n} optic went back on the spares shelf","other":"{n} optics went back on the spares shelf"}, "links.name_is_called_off_the_cable":"{name} is called off.
The cable factory takes back the glass nobody needs: {price} back.", "links.no_cable_available_for_that_route":"No cable available for that route right now.", "links.no_wave_capacity_on_this_route":"No {wave} capacity on this route right now.
{why} Try a smaller wave, another route, or ask again in {n} days.", diff --git a/tests/optic-counts.test.js b/tests/optic-counts.test.js index 1e85f3f..df01196 100644 --- a/tests/optic-counts.test.js +++ b/tests/optic-counts.test.js @@ -79,3 +79,25 @@ test('draft counts and quotes stay together when reopening a panel or using shor assert.equal(field().value,'','empty in-progress entry survives a tick'); }finally{dom.window.close();} }); +test('#229 giving up a fiber puts its optics on the spares shelf, and so does decommissioning its POP',()=>{ + const {ev,dom,errors}=load();try{ + setup(ev); + // a leased IRU (not your own build) with mixed optics + ev("Object.assign(S.links[0],{own:false,ch:['zr4','zr4','tp16']});S.spares={zr4:1};compute()"); + ev("ACT.rmLink({id:'fiber'})");assert.equal(ev('S.links.length'),1,'the first click only asks'); + ev("ACT.rmLink({id:'fiber'})");assert.equal(ev('S.links.length'),0,'cancelled'); + assert.equal(ev('S.spares.zr4'),3);assert.equal(ev('S.spares.tp16'),1); + assert.match(ev("S.log.map(e=>e.t).join(' | ')"),/3 optics went back on the spares shelf/); + // the next channel of that type uses a spare for free + ev("S.links.push({id:'f2',a:'fra',b:'ams',kind:'df',own:true,sys:'roadm',km:400,ch:[],ready:0,day:0,cut:0,mo:1});compute()"); + const cash=ev('S.cash');ev("ACT.setChCount({id:'f2',o:'zr4',n:3})");assert.equal(ev('S.cash'),cash,'spares are used first');assert.equal(ev('S.spares.zr4'),0); + // decommissioning a POP returns the optics of every link it takes with it + ev("S.pops.lon={...S.pops.fra};S.links.push({id:'f3',a:'lon',b:'ams',kind:'df',own:true,sys:'roadm',km:400,ch:['tp16','tp16'],ready:0,day:0,cut:0,mo:1});compute()"); + ev("decommission(['lon'])"); + assert.equal(ev("S.links.some(l=>l.id==='f3')"),false);assert.equal(ev('S.spares.tp16'),3); + // a link without optics says nothing about spares + ev("S.log=[];S.links.push({id:'f4',a:'fra',b:'ams',kind:'df',own:true,sys:'roadm',km:400,ch:[],ready:0,day:0,cut:0,mo:1});compute();ACT.rmLink({id:'f4'});ACT.rmLink({id:'f4'})"); + assert.doesNotMatch(ev("S.log.map(e=>e.t).join(' | ')"),/spares shelf/); + assert.deepEqual(errors,[]); + }finally{dom.window.close();} +});