diff --git a/CHANGELOG.md b/CHANGELOG.md index 64b8f34..08481b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project are documented here. The project follows - Cebu joins the map on its own island, with GotchaFIX Cebu and two domestic cables from Manila: the Pan de Sal Cable Network and the Philippines Long Distance Relationship. PLDTea Time, Snow Globe, Diverge and RISE & Shine reach Cebu, and typhoons can hit it too. - Davao joins the map on Mindanao, with GotchaFIX Davao. Bi-Frosted and SEA-US Later now land in Davao, as the real cables do, instead of Manila; a link you already run on their old Manila landings keeps working as a plain subsea link. Three domestic cables reach Davao from Cebu: the Pan de Sal Cable Network, the Philippines Long Distance Relationship and the new Diverge VisMin Express. RISE & Shine peers at GotchaFIX Davao. The Pan de Sal Cable Network also runs straight from Manila to Davao. - Transit in the Philippines now costs about twice the Asian rate, as it really does, and Philippine homes pay less for broadband. GotchaFIX ports cost what the real exchange charges, about $700 a month for 10G and $2,800 for 100G. In-Vitro-IX charges about double that. +- Waves between Philippine islands now cost more than waves out of the country: Manila to Cebu costs about twice Manila to Hong Kong. ## [1.37.0] — 2026-10-28 diff --git a/src/game/10-catalog/10-economy.js b/src/game/10-catalog/10-economy.js index 45d2e52..42341c7 100644 --- a/src/game/10-catalog/10-economy.js +++ b/src/game/10-catalog/10-economy.js @@ -16,8 +16,10 @@ const AU_TRANSIT=3,AU_WAVE={land:1.8,sub:2.6,ew:1.3},AU_IX=0.8,AU_ARPU=1.8,AU_WH const AU_LEVY=0.08; /* The Philippines: few, thin routes out and an incumbent that owns most of them. 100 GigE transit in Manila costs about 1.9 times Jakarta's (TeleGeography, 2026: $2.25 against $1.21 per Mbps), so the islands pay - 1.9 times the Asian rate. Homes pay about ₱1,450 (US$25) a month, the incumbent's own figure (PLDT, 2025). */ -const PH_TRANSIT=4.7,PH_ARPU=0.7; + 1.9 times the Asian rate. Homes pay about ₱1,450 (US$25) a month, the incumbent's own figure (PLDT, 2025). + Between the islands capacity is dearer than out of the country: a Manila–Cebu wave costs about what + Manila–Singapore does, twice Manila–Hong Kong. */ +const PH_TRANSIT=4.7,PH_ARPU=0.7,PH_WAVE=3.7; const SITE2_COST=45000,SITE2_MO=3000,TE_COST=60000,TE_MO=4000; const SITE2_N=[tr('economy.the_other_building'),tr('economy.campus_b_the_one_with_parking'),tr('economy.across_the_river_dc'),tr('common.the_annex'),tr('economy.suburban_mega_shed'),tr('economy.the_cheaper_one'),tr('economy.formerly_a_shopping_mall'),tr('common.bunker_two')]; // A city's buildings: '#' becomes a site number from 1 to dcN (dc2N for the second building) that stays put for this network. diff --git a/src/game/80-simulation/80-geography-and-latency.js b/src/game/80-simulation/80-geography-and-latency.js index d4b1d80..b23a276 100644 --- a/src/game/80-simulation/80-geography-and-latency.js +++ b/src/game/80-simulation/80-geography-and-latency.js @@ -23,7 +23,7 @@ function linkLat(l){const f=l.kind==='df'?(l.own?(l.sub?seaLatencyFactor(l):1.1) const WAVE_LAND={EU:0.65,AM:1,SA:1.6,AS:1.4,OC:1.2,AF:2.2},WAVE_SUB={EU:0.8,AM:1,SA:2,AS:1.5,OC:1.5,AF:4.5}; const WAVE_NAME={EU:tr('common.europe'),AM:tr('common.north_america'),SA:tr('common.south_america'),AS:tr('common.asia'),OC:tr('common.oceania'),AF:tr('common.africa')}; function waveMarket(a,b,sub){const ra=CITY[a].reg,rb=CITY[b].reg,T=sub?WAVE_SUB:WAVE_LAND,au=sub?AU_WAVE.sub:AU_WAVE.land; - const fa=CITY[a].au?au:(T[ra]||1),fb=CITY[b].au?au:(T[rb]||1),reg=sub&&nullPair(a,b)?AU_WAVE.ew:sub?Math.max(fa,fb):(fa+fb)/2; + const fa=CITY[a].au?au:(T[ra]||1),fb=CITY[b].au?au:(T[rb]||1),reg=sub&&nullPair(a,b)?AU_WAVE.ew:sub&&CITY[a].ph&&CITY[b].ph?PH_WAVE:sub?Math.max(fa,fb):(fa+fb)/2; const key=atransitMo({net:'sgt',city:'jkt',tier:1},10)")); assert.deepEqual(errors, []); }); + +test('Philippines: waves between the islands cost more than waves out of the country', () => { + const { ev, errors } = load(); + start(ev); + // cheapest 10G wave on any cable between two cities + const w = (a, b) => ev(`Math.min(...cablesOk('${a}','${b}').map(c=>waveMo(c.km,true,0)*CAB[c.cid].price*waveMarket('${a}','${b}',true).m))`); + assert.equal(ev("waveMarket('mnl','ceb',true).reg"), ev('PH_WAVE')); + assert.equal(ev("waveMarket('mnl','hkg',true).reg"), 1.5, 'international routes keep the Asian rate'); + const ratio = w('mnl', 'ceb') / w('mnl', 'hkg'); + assert.ok(ratio > 1.8 && ratio < 2.2, `Manila–Cebu is ${ratio.toFixed(2)} times Manila–Hong Kong`); + assert.ok(w('ceb', 'dvo') > w('mnl', 'hkg'), 'even the short Cebu–Davao hop costs more than Hong Kong'); + assert.deepEqual(errors, []); +});