diff --git a/site/i18n/de.js b/site/i18n/de.js index 47eb899..b710e76 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -2128,7 +2128,7 @@ "link_panels.add_parallel_link":"Parallelen Link hinzufügen", "link_panels.additional_traffic_lost":"Zusätzlich verlorener Traffic", "link_panels.an_alternate_path_exists_but_current":"Es gibt einen anderen Weg, aber mit dem jetzigen Routing und der Kapazität kommt weniger Traffic an.", -"link_panels.apply_for_a_license_price_mo":"Lizenz beantragen {price} + {mo}/Monat · ~45 Tage", +"link_panels.apply_for_a_license_price_mo_n_days":"Lizenz beantragen {price} + {mo}/Monat · ~{n} Tage", "link_panels.back_in_n_days":"Zurück in {n} Tagen.", "link_panels.behind_the_great_firewall":"Hinter der Großen Firewall", "link_panels.biggest_fabric_money_can_buy":"Die größte Fabric, die man für Geld kaufen kann.", diff --git a/site/i18n/es.js b/site/i18n/es.js index c5e8b29..e670864 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -2126,7 +2126,7 @@ "link_panels.add_parallel_link":"Añadir enlace paralelo", "link_panels.additional_traffic_lost":"Tráfico perdido adicional", "link_panels.an_alternate_path_exists_but_current":"Hay un camino alternativo, pero con el routing y la capacidad actuales llega menos tráfico.", -"link_panels.apply_for_a_license_price_mo":"Solicitar una licencia {price} + {mo}/mes · ~45 días", +"link_panels.apply_for_a_license_price_mo_n_days":"Solicitar una licencia {price} + {mo}/mes · ~{n} días", "link_panels.back_in_n_days":"De vuelta en {n} días.", "link_panels.behind_the_great_firewall":"Tras el Gran Cortafuegos", "link_panels.biggest_fabric_money_can_buy":"La fabric más grande que el dinero puede comprar.", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 30a346d..63f3195 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -2126,7 +2126,7 @@ "link_panels.add_parallel_link":"Ajouter un lien parallèle", "link_panels.additional_traffic_lost":"Trafic perdu en plus", "link_panels.an_alternate_path_exists_but_current":"Un autre chemin existe, mais avec le routage et la capacité actuels, moins de trafic arrive.", -"link_panels.apply_for_a_license_price_mo":"Demander une licence {price} + {mo}/mois · ~45 jours", +"link_panels.apply_for_a_license_price_mo_n_days":"Demander une licence {price} + {mo}/mois · ~{n} jours", "link_panels.back_in_n_days":"Retour dans {n} jours.", "link_panels.behind_the_great_firewall":"Derrière le Grand Pare-feu", "link_panels.biggest_fabric_money_can_buy":"Le plus gros fabric que l’argent puisse acheter.", diff --git a/site/i18n/it.js b/site/i18n/it.js index a4b5b11..c183fe3 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -2126,7 +2126,7 @@ "link_panels.add_parallel_link":"Aggiungi link parallelo", "link_panels.additional_traffic_lost":"Ulteriore traffico perso", "link_panels.an_alternate_path_exists_but_current":"Esiste un percorso alternativo, ma con routing e capacità attuali viene consegnato meno traffico.", -"link_panels.apply_for_a_license_price_mo":"Richiedi una licenza {price} + {mo}/mese · ~45 giorni", +"link_panels.apply_for_a_license_price_mo_n_days":"Richiedi una licenza {price} + {mo}/mese · ~{n} giorni", "link_panels.back_in_n_days":"Torna tra {n} giorni.", "link_panels.behind_the_great_firewall":"Dietro il Great Firewall", "link_panels.biggest_fabric_money_can_buy":"Il fabric più grosso che si possa comprare.", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 4ac6bb9..e5b091c 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -2126,7 +2126,7 @@ "link_panels.add_parallel_link":"Adicionar link paralelo", "link_panels.additional_traffic_lost":"Tráfego perdido a mais", "link_panels.an_alternate_path_exists_but_current":"Existe um caminho alternativo, mas com o roteamento e a capacidade atuais chega menos tráfego.", -"link_panels.apply_for_a_license_price_mo":"Pedir licença {price} + {mo}/mês · ~45 dias", +"link_panels.apply_for_a_license_price_mo_n_days":"Pedir licença {price} + {mo}/mês · ~{n} dias", "link_panels.back_in_n_days":"Volta em {n} dias.", "link_panels.behind_the_great_firewall":"Atrás do Great Firewall", "link_panels.biggest_fabric_money_can_buy":"O maior fabric que o dinheiro pode comprar.", diff --git a/src/game/90-actions/80-security-and-china.js b/src/game/90-actions/80-security-and-china.js index 3cba21f..b909a8c 100644 --- a/src/game/90-actions/80-security-and-china.js +++ b/src/game/90-actions/80-security-and-china.js @@ -1,5 +1,5 @@ Object.assign(ACT,{ - applyCn:()=>{if(S.cnLic.state!=='none')return;if(!spend(CN_LIC))return;S.cnLic={state:'pending',ready:S.day+45};toast(tr('security_and_china.application_filed_your_local_partner'),'goal');after();}, + applyCn:()=>{if(S.cnLic.state!=='none')return;if(!spend(CN_LIC))return;S.cnLic={state:'pending',ready:S.day+leadDays(45)};toast(tr('security_and_china.application_filed_your_local_partner'),'goal');after();}, togglePrem:({id})=>{const t=S.transit.find(x=>x.id===id);if(!t||!premCity(NET[t.net],t.city)||premOnlyAt(NET[t.net],t.city))return;t.premium=!t.premium;sfx('click');after();}, buildScrub:({city,tier})=>{if(!S.pops[city]||S.scrubs.some(x=>x.city===city))return;const T=SCRUB_TIERS[tier||0];if(!T)return;if((lvl()||1){const x=S.scrubs.find(q=>q.city===city);tier=+tier;if(!x||!SCRUB_TIERS[tier]||tier<=(x.tier||0))return;const T=SCRUB_TIERS[tier];if((lvl()||1)`;} function chinaSection(c){const st=S.cnLic?S.cnLic.state:'none',loss=S.ev.gfw>S.day?0.35:0.2; let h=`

${tr('link_panels.behind_the_great_firewall')}

${tr('link_panels.mainland_china_plays_by_its_own',{list:CN_BLOCKED.slice(0,4).map(esc).join(', '),pct:pct(loss)})}

`; - if(st==='none')h+=`

${tr('link_panels.foreign_networks_need_a_local_joint')}

${btn(tr('link_panels.apply_for_a_license_price_mo',{price:fmt$(CN_LIC),mo:fmt$(CN_JV_MO)}),'applyCn',{},'pink',S.cash${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)}
`; diff --git a/src/i18n/en.js b/src/i18n/en.js index 309e046..2b6cf52 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -2127,7 +2127,7 @@ "link_panels.add_parallel_link":"Add parallel link", "link_panels.additional_traffic_lost":"Additional traffic lost", "link_panels.an_alternate_path_exists_but_current":"An alternate path exists, but current routing and capacity deliver less traffic.", -"link_panels.apply_for_a_license_price_mo":"Apply for a license {price} + {mo}/mo · ~45 days", +"link_panels.apply_for_a_license_price_mo_n_days":"Apply for a license {price} + {mo}/mo · ~{n} days", "link_panels.back_in_n_days":"Back in {n} days.", "link_panels.behind_the_great_firewall":"Behind the Great Firewall", "link_panels.biggest_fabric_money_can_buy":"Biggest fabric money can buy.", diff --git a/tests/ddos-floods.test.js b/tests/ddos-floods.test.js index d6b0d40..4415ad9 100644 --- a/tests/ddos-floods.test.js +++ b/tests/ddos-floods.test.js @@ -123,3 +123,14 @@ test('an imported save cannot put HTML in a Flood Season attacker\'s name', () = assert.equal(dom.window.document.getElementById('pwn2'), null, 'and the toast escapes it anyway'); assert.deepEqual(errors, []); }); + +test('the China licence arrives in a tenth of the time with quick lead times, and the button says so', () => { + for (const [preset, days] of [['oncall', 45], ['freeze', 5]]) { + const { ev, errors } = load(); + ev(`beginGame('C','fra',{mode:'normal',preset:'${preset}'});if(UI.pendGame)ACT.pitchSkip();S.cash=1e9`); + assert.match(ev("tr('link_panels.apply_for_a_license_price_mo_n_days',{price:'$1',mo:'$1',n:leadDays(45)})"), new RegExp(`~${days} days`)); + ev('ACT.applyCn()'); + assert.equal(ev('S.cnLic.ready-S.day'), days, preset); + assert.deepEqual(errors, []); + } +});