diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cae84a..b9f3408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ All notable changes to this project are documented here. The project follows
## [Unreleased]
- The chaos monkey's notice in the NOC no longer has an Open button that did nothing; the monkey's own card is right above it (#226).
+- The puzzle list counts each section's own stars: architect runs show theirs next to their title, and the pack total now sits right above the packs, the stars that unlock the next one (#231).
+- The intern's notes now name the exchanges it peered at: a city's first exchange showed as the city, so "Apfelwein-IX, London" really meant Apfelwein-IX and LYNX (#228).
+- 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..5c5ce83 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.",
@@ -3147,6 +3148,7 @@
"puzzles.small_networks_real_traffic":"Kleine Netze, echter Traffic",
"puzzles.spent_x":"Ausgegeben {x}",
"puzzles.spent_x_of_y":"Ausgegeben {x} / {y}",
+"puzzles.stars_from_the_packs":"Sterne aus den Paketen",
"puzzles.stepping_stone_optional":"Trittstein (optional)",
"puzzles.suez_you_later":"Suez bald",
"puzzles.survive_any_single_cut_with_the":"Überleb jeden einzelnen Schnitt, und der Traffic fließt weiter. Verbunden sein reicht nicht.",
@@ -3172,7 +3174,6 @@
"puzzles.with_the_pop_price":"mit POP: {price}",
"puzzles.your_pop":"Dein POP",
"puzzles.your_routers_pick_the_path":"Deine Router wählen den Weg. Sag ihnen welchen: Metriken, niedrigste Latenz, Best Effort.",
-"puzzles.your_stars":"Deine Sterne",
"puzzles.your_stars_so_far":"Deine Sterne bisher",
"puzzles_weekly.detour":"Umleitung",
"puzzles_weekly.island_hopping":"Inselhüpfen",
diff --git a/site/i18n/es.js b/site/i18n/es.js
index 13aeff7..ba283a5 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.",
@@ -3145,6 +3146,7 @@
"puzzles.small_networks_real_traffic":"Redes pequeñas, tráfico de verdad",
"puzzles.spent_x":"Gastado {x}",
"puzzles.spent_x_of_y":"Gastado {x} / {y}",
+"puzzles.stars_from_the_packs":"Estrellas de los packs",
"puzzles.stepping_stone_optional":"Escala (opcional)",
"puzzles.suez_you_later":"Suez luego",
"puzzles.survive_any_single_cut_with_the":"Sobrevive a cualquier corte, con el tráfico todavía fluyendo. Estar conectado no basta.",
@@ -3170,7 +3172,6 @@
"puzzles.with_the_pop_price":"con el POP: {price}",
"puzzles.your_pop":"Tu POP",
"puzzles.your_routers_pick_the_path":"Tus routers eligen el camino. Diles cuál: métricas, menor latencia, best effort.",
-"puzzles.your_stars":"Tus estrellas",
"puzzles.your_stars_so_far":"Tus estrellas hasta ahora",
"puzzles_weekly.detour":"Desvío",
"puzzles_weekly.island_hopping":"De isla en isla",
diff --git a/site/i18n/fr.js b/site/i18n/fr.js
index 93e7fa7..5e14e71 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.",
@@ -3145,6 +3146,7 @@
"puzzles.small_networks_real_traffic":"Petits réseaux, vrai trafic",
"puzzles.spent_x":"Dépensé {x}",
"puzzles.spent_x_of_y":"Dépensé {x} / {y}",
+"puzzles.stars_from_the_packs":"Étoiles des packs",
"puzzles.stepping_stone_optional":"Escale (facultative)",
"puzzles.suez_you_later":"Suez la prochaine",
"puzzles.survive_any_single_cut_with_the":"Survis à n'importe quelle coupure, avec le trafic qui passe toujours. Être connecté ne suffit pas.",
@@ -3170,7 +3172,6 @@
"puzzles.with_the_pop_price":"avec le POP : {price}",
"puzzles.your_pop":"Ton POP",
"puzzles.your_routers_pick_the_path":"Tes routeurs choisissent le chemin. Dis-leur lequel : métriques, latence minimale, best effort.",
-"puzzles.your_stars":"Tes étoiles",
"puzzles.your_stars_so_far":"Tes étoiles pour l'instant",
"puzzles_weekly.detour":"Détour",
"puzzles_weekly.island_hopping":"Saut d’île en île",
diff --git a/site/i18n/it.js b/site/i18n/it.js
index 512cb33..522c4ac 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.",
@@ -3145,6 +3146,7 @@
"puzzles.small_networks_real_traffic":"Reti piccole, traffico vero",
"puzzles.spent_x":"Speso {x}",
"puzzles.spent_x_of_y":"Speso {x} / {y}",
+"puzzles.stars_from_the_packs":"Stelle dai pacchetti",
"puzzles.stepping_stone_optional":"Tappa (facoltativa)",
"puzzles.suez_you_later":"Suez la prossima",
"puzzles.survive_any_single_cut_with_the":"Sopravvivi a qualsiasi taglio, con il traffico che scorre ancora. Essere collegati non basta.",
@@ -3170,7 +3172,6 @@
"puzzles.with_the_pop_price":"con il POP: {price}",
"puzzles.your_pop":"Il tuo POP",
"puzzles.your_routers_pick_the_path":"I tuoi router scelgono il percorso. Digli quale: metriche, latenza minima, best effort.",
-"puzzles.your_stars":"Le tue stelle",
"puzzles.your_stars_so_far":"Le tue stelle finora",
"puzzles_weekly.detour":"Deviazione",
"puzzles_weekly.island_hopping":"Di isola in isola",
diff --git a/site/i18n/pt.js b/site/i18n/pt.js
index ec25f9d..e2f10fc 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.",
@@ -3145,6 +3146,7 @@
"puzzles.small_networks_real_traffic":"Redes pequenas, tráfego de verdade",
"puzzles.spent_x":"Gasto {x}",
"puzzles.spent_x_of_y":"Gasto {x} / {y}",
+"puzzles.stars_from_the_packs":"Estrelas dos pacotes",
"puzzles.stepping_stone_optional":"Escala (opcional)",
"puzzles.suez_you_later":"Suez mais tarde",
"puzzles.survive_any_single_cut_with_the":"Sobreviva a qualquer corte, com o tráfego ainda fluindo. Estar conectado não basta.",
@@ -3170,7 +3172,6 @@
"puzzles.with_the_pop_price":"com o POP: {price}",
"puzzles.your_pop":"Seu POP",
"puzzles.your_routers_pick_the_path":"Seus routers escolhem o caminho. Diga qual: métricas, menor latência, best effort.",
-"puzzles.your_stars":"Suas estrelas",
"puzzles.your_stars_so_far":"Suas estrelas até agora",
"puzzles_weekly.detour":"Desvio",
"puzzles_weekly.island_hopping":"De ilha em ilha",
diff --git a/src/game/60-features/95-standing-orders.js b/src/game/60-features/95-standing-orders.js
index c226964..51e953a 100644
--- a/src/game/60-features/95-standing-orders.js
+++ b/src/game/60-features/95-standing-orders.js
@@ -68,7 +68,7 @@ const opsWkNew=w=>({w,i:S.ops.intern,n:{},wh:{},up:0,mo:0,rev:0,ff:0});
const opsWkAny=x=>!!x&&(Object.keys(x.n).length>0||x.ff>0);
// "Kevin's week: signed 3 customers (+$41k/mo), topped up transit 2 times (Frankfurt +1×100G), declined 17 tiny offers. Week total: …"
function opsWeekLine(x){const I=INTERNS[x.i],name=I?tr(I.s):'',ks=Object.keys(x.n).sort((a,b)=>(a==='sales'?-1:b==='sales'?1:0)||(a==='broke')-(b==='broke'));
- const parts=ks.map(k=>k==='sales'?trn('ops.w_sales',x.n[k],{rev:opsMo$(x.rev)}):trn(OPS_SAY[k],x.n[k],{where:(x.wh[k]||[]).map(opsWhere).join(', ')}));
+ const parts=ks.map(k=>k==='sales'?trn('ops.w_sales',x.n[k],{rev:opsMo$(x.rev)}):trn(OPS_SAY[k],x.n[k],{where:(x.wh[k]||[]).map(w=>opsWhere(w,k)).join(', ')}));
if(x.ff)parts.push(trn('ops.w_oops',x.ff));
return tr('ops.w_line',{name,list:parts.join(', ')})+(x.up||x.mo?' '+tr('ops.w_money',{cost:fmt$(x.up),mo:opsMo$(x.mo)}):'');}
// The intern's mood, from what the week has been like. No dice: the same day always reads the same.
@@ -77,8 +77,9 @@ function opsMood(){const O=S.ops,x=O.wk&&O.wk.w===Math.floor(S.day/7)?O.wk:null,
return tr({new:N_('ops.mood_new'),oops:N_('ops.mood_oops'),snag:N_('ops.mood_snag'),outage:N_('ops.mood_outage'),sales:N_('ops.mood_sales'),broke:N_('ops.mood_broke'),busy:N_('ops.mood_busy'),quiet:N_('ops.mood_quiet'),
annie:N_('ops.mood_annie'),kevin:N_('ops.mood_kevin'),tracy:N_('ops.mood_tracy')}[k],{name:opsName()});}
// "fra +1×100G", "fra|ams", "ams~3", "transit" (an order, for the budget line) or "ggl" (a network).
-function opsWhere(w){const [a,x]=w.split(' '),nm=a.split('|').map(p=>own(OPSK,p)?tr(OPSK[p].t):isCity(p)?CITY[p].name:isNet(p)?NET[p].name:ixName(p)).join('–');return x?nm+' '+(isNet(x)?NET[x].name:x):nm;}
-function opsLine(e){const I=INTERNS[e.i],name=I?tr(I.s):'',parts=e.r.map(([k,n,w])=>trn(OPS_SAY[k],n,{where:w.map(opsWhere).join(', ')}));
+// Peering is always at an exchange, and a city's first exchange has the city's id ("lon" is LYNX): name the exchange (#228).
+function opsWhere(w,k){if(k==='peer'&&isIx(w)&&ixName(w))return ixName(w);const [a,x]=w.split(' '),nm=a.split('|').map(p=>own(OPSK,p)?tr(OPSK[p].t):isCity(p)?CITY[p].name:isNet(p)?NET[p].name:ixName(p)).join('–');return x?nm+' '+(isNet(x)?NET[x].name:x):nm;}
+function opsLine(e){const I=INTERNS[e.i],name=I?tr(I.s):'',parts=e.r.map(([k,n,w])=>trn(OPS_SAY[k],n,{where:w.map(x=>opsWhere(x,k)).join(', ')}));
return (parts.length?tr('ops.l_line',{name,list:parts.join(', ')}):tr('ops.l_quiet',{name}))+opsPaid(e);}
const opsMo$=v=>(v>0?'+':'')+fmt$(v);
const opsPaid=e=>e.up||e.mo?' '+tr('ops.l_paid',{cost:fmt$(e.up||0),mo:opsMo$(e.mo||0)}):'';
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')}
`:''}${tr('puzzles.no_clock_no_bills_real_traffic')}
`; // Once, after the puzzles got traffic: the old stars are kept on the wall, the new set starts at zero. if(p.old&&!p.noted){h+=`