diff --git a/CHANGELOG.md b/CHANGELOG.md index 382ce54..a9f3115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project are documented here. The project follows - Your intern can upgrade optical transport: a new standing order moves full, busy fiber to a bigger line system, or trades its smallest channels for bigger optics. Pick a line system, and every fiber on a smaller one is moved up to it. A line system swap takes the fiber down for a day, so the intern only does it where the traffic gets around it and no customer rides it, one a night. - Your intern can standardize your routers on a model you choose: pick it in Keep routers ahead, and every POP on a smaller model is swapped to it, the busiest first, within the monthly budget. Every setting in the Standing orders sheet is now a list to pick from instead of a button to tap through. +- France beyond Paris and Marseille: Lyon, Toulouse, Lille, Bordeaux, Strasbourg and Rennes, with the exchanges that really run (Quenelle-IX, Cassoulet-IX, Maroilles-IX, Claret-IX, Choucroute-IX and Galette-IX), and Nantes. SF-Error Telecom (SFR), Boy-Egg Telecom (Bouygues), Ov-Hatch Cloud (OVH) and Scale-Away (Scaleway) join the map; Tangerine Telecom and Free as in Beer reach the new cities, Cogentle reaches Toulouse, Lille, Bordeaux and Strasbourg as PeeringDB lists it, and Andorable Telecom comes up to Toulouse. The Atlantic cables now come ashore where they really do: Ami-Tea at Bordeaux and Dunno-ant at Nantes, both without a line across the country to inland Paris, and Dunno-ant starts at Virginia Beach. ## [3.0.0] — 2026-11-06 diff --git a/site/i18n/de.js b/site/i18n/de.js index 36c6582..6e18a4b 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -2194,6 +2194,10 @@ "find.press_slash_to_search_from":"Tipp: Drück irgendwo auf der Karte /, um zu suchen.", "find.type_a_city_a_country":"Gib eine Stadt, ein Land oder einen Austauschknoten ein.", "find.your_pop":"dein POP", +"france.europe_s_biggest_hosting_cloud_from":"Europas größte Hosting-Cloud, aus Roubaix. Seit dem Brand in Straßburg sichert sie alles doppelt.", +"france.france_s_number_two_it_bought_a":"Frankreichs Nummer zwei. Kaufte erst eine Kabelfirma, dann ein Medienimperium, dann jede Menge Schulden.", +"france.the_builder_that_became_a_mobile":"Der Baukonzern, der ein Mobilfunknetz wurde. Nebenbei gießt er immer noch Beton.", +"france.the_cloud_arm_of_the_free_group":"Der Cloud-Zweig der Free-Gruppe, mit ARM-Servern und einem Rechenzentrum in einem Pariser Bunker.", "game_and_settings.delete_and_start_over":"Löschen und neu anfangen", "game_and_settings.export_save_download_a_file":"Spielstand exportieren Datei herunterladen", "game_and_settings.import_failed_that_save_is_damaged":"Import fehlgeschlagen.
Dieser Spielstand ist beschädigt und konnte nicht geladen werden. Dein aktuelles Spiel ist unberührt.", diff --git a/site/i18n/es.js b/site/i18n/es.js index d447ada..e28ab4a 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -2192,6 +2192,10 @@ "find.press_slash_to_search_from":"Consejo: pulsa / en cualquier parte del mapa para buscar.", "find.type_a_city_a_country":"Escribe una ciudad, un país o un punto de intercambio.", "find.your_pop":"tu POP", +"france.europe_s_biggest_hosting_cloud_from":"La mayor nube de alojamiento de Europa, desde Roubaix. Tras el incendio de Estrasburgo, lo respalda todo dos veces.", +"france.france_s_number_two_it_bought_a":"El número dos de Francia. Compró una empresa de cable, luego un imperio mediático y luego muchas deudas.", +"france.the_builder_that_became_a_mobile":"La constructora que se hizo red móvil. Sigue echando hormigón en sus ratos libres.", +"france.the_cloud_arm_of_the_free_group":"La rama de nube del grupo Free, con servidores ARM y un centro de datos en un búnker de París.", "game_and_settings.delete_and_start_over":"Borrar y empezar de nuevo", "game_and_settings.export_save_download_a_file":"Exportar partida descargar un archivo", "game_and_settings.import_failed_that_save_is_damaged":"Falló la importación.
Esa partida está dañada y no se pudo cargar. Tu partida actual sigue intacta.", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index 908b461..cd336b3 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -2192,6 +2192,10 @@ "find.press_slash_to_search_from":"Astuce : appuyez sur / n'importe où sur la carte pour chercher.", "find.type_a_city_a_country":"Tapez une ville, un pays ou un point d'échange.", "find.your_pop":"votre POP", +"france.europe_s_biggest_hosting_cloud_from":"Le plus grand cloud d’hébergement d’Europe, de Roubaix. Depuis l’incendie de Strasbourg, tout est sauvegardé deux fois.", +"france.france_s_number_two_it_bought_a":"Le numéro deux français. Il a racheté un câblo-opérateur, puis un empire médiatique, puis beaucoup de dettes.", +"france.the_builder_that_became_a_mobile":"Le constructeur devenu réseau mobile. Il coule toujours du béton à côté.", +"france.the_cloud_arm_of_the_free_group":"La branche cloud du groupe Free, avec des serveurs ARM et un datacenter dans un bunker parisien.", "game_and_settings.delete_and_start_over":"Supprimer et recommencer", "game_and_settings.export_save_download_a_file":"Exporter la sauvegarde télécharger un fichier", "game_and_settings.import_failed_that_save_is_damaged":"Échec de l’import.
Cette sauvegarde est endommagée et n’a pas pu être chargée. Ta partie en cours est intacte.", diff --git a/site/i18n/it.js b/site/i18n/it.js index e745eff..38fc9e7 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -2192,6 +2192,10 @@ "find.press_slash_to_search_from":"Suggerimento: premi / ovunque sulla mappa per cercare.", "find.type_a_city_a_country":"Scrivi una città, un paese o un exchange.", "find.your_pop":"il tuo POP", +"france.europe_s_biggest_hosting_cloud_from":"Il più grande cloud di hosting d’Europa, da Roubaix. Dopo l’incendio di Strasburgo salva tutto due volte.", +"france.france_s_number_two_it_bought_a":"Il numero due della Francia. Ha comprato una società via cavo, poi un impero mediatico, poi un sacco di debiti.", +"france.the_builder_that_became_a_mobile":"L’impresa edile diventata rete mobile. Nel tempo libero cola ancora cemento.", +"france.the_cloud_arm_of_the_free_group":"Il ramo cloud del gruppo Free, con server ARM e un data center in un bunker di Parigi.", "game_and_settings.delete_and_start_over":"Cancella e ricomincia", "game_and_settings.export_save_download_a_file":"Esporta salvataggio scarica un file", "game_and_settings.import_failed_that_save_is_damaged":"Importazione fallita.
Quel salvataggio è danneggiato e non si può caricare. La partita in corso non è stata toccata.", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 2ff2e89..b5b17c6 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -2192,6 +2192,10 @@ "find.press_slash_to_search_from":"Dica: pressione / em qualquer lugar do mapa para pesquisar.", "find.type_a_city_a_country":"Digite uma cidade, um país ou um exchange.", "find.your_pop":"seu POP", +"france.europe_s_biggest_hosting_cloud_from":"A maior nuvem de hospedagem da Europa, de Roubaix. Depois do incêndio de Estrasburgo, faz backup de tudo duas vezes.", +"france.france_s_number_two_it_bought_a":"O número dois da França. Comprou uma operadora de cabo, depois um império de mídia, depois muitas dívidas.", +"france.the_builder_that_became_a_mobile":"A construtora que virou rede móvel. Ainda despeja concreto nas horas vagas.", +"france.the_cloud_arm_of_the_free_group":"O braço de nuvem do grupo Free, com servidores ARM e um data center num bunker de Paris.", "game_and_settings.delete_and_start_over":"Apagar e recomeçar", "game_and_settings.export_save_download_a_file":"Exportar save baixar um arquivo", "game_and_settings.import_failed_that_save_is_damaged":"Falha na importação.
Esse save está corrompido e não pôde ser carregado. Seu jogo atual não foi mexido.", diff --git a/src/game/20-world/40-city-coords.js b/src/game/20-world/40-city-coords.js index 0b57f2d..9d1fc60 100644 --- a/src/game/20-world/40-city-coords.js +++ b/src/game/20-world/40-city-coords.js @@ -50,6 +50,7 @@ const CITY_LL={ "blr":[77.59, 12.97], "bna":[-86.78,36.16], "bne":[153.03, -27.47], + "bod":[-0.58,44.84], "bog":[-74.07, 4.71], "boi":[-116.2,43.62], "bom":[72.88,19.08], @@ -201,6 +202,7 @@ const CITY_LL={ "lbv":[9.49,0.5], "ldb":[-51.16,-23.31], "lfw":[1.22,6.13], + "lil":[3.06,50.63], "lim":[-76.85,-12.05], "lis":[-9.14,38.72], "lit":[-92.29,34.75], @@ -211,6 +213,7 @@ const CITY_LL={ "lon":[-0.13,51.51], "lpb":[-68.15,-16.5], "lun":[28.32,-15.39], + "lys":[4.84,45.76], "maa":[80.18,13.25], "mad":[-3.7,40.42], "maj":[171.38,7.09], @@ -257,6 +260,7 @@ const CITY_LL={ "nou":[166.46,-22.27], "nqz":[71.45,51.17], "nsi":[11.5,3.85], + "nte":[-1.55,47.22], "nuk":[-51.72,64.18], "nyc":[-74.0,40.71], "nyt":[96.08,19.76], @@ -312,6 +316,7 @@ const CITY_LL={ "ric":[-77.44,37.54], "rio":[-43.11,-22.57], "rix":[24.11,56.95], + "rns":[-1.68,48.11], "rob":[-10.7,6.38], "rom":[12.5,41.9], "ror":[134.48,7.34], @@ -352,6 +357,7 @@ const CITY_LL={ "suv":[178.44,-18.14], "svd":[-61.22,13.16], "svg":[5.73,58.97], + "sxb":[7.75,48.57], "syd":[151.21,-33.87], "tas":[69.24,41.3], "tbs":[44.79,41.72], @@ -366,6 +372,7 @@ const CITY_LL={ "tip":[13.19,32.89], "tlh":[-84.28,30.44], "tll":[24.45,58.9], + "tls":[1.44,43.6], "tms":[6.73,0.34], "tnr":[47.52,-18.88], "tok":[139.69,35.69], diff --git a/src/game/20-world/50-cities.js b/src/game/20-world/50-cities.js index ac1f788..699263a 100644 --- a/src/game/20-world/50-cities.js +++ b/src/game/20-world/50-cities.js @@ -11,6 +11,13 @@ const CITIES=[ {id:'ams',name:'Amsterdam',x:1015,y:245,land:'eu',reg:'EU',cc:'NL',P:350,ix:'HAMS-IX',dc:'Science Park'}, {id:'fra',name:'Frankfurt',x:1075,y:295,land:'eu',reg:'EU',cc:'DE',P:600,ix:'DE-KICKS',dc:'Kleyerstraße Campus',note:tr('cities.europe_s_crossroads_lots_of_networks')}, {id:'par',name:'Paris',x:990,y:320,land:'eu',reg:'EU',cc:'FR',P:900,ix:'Fromage-IX',dc:'Interaction PAR'}, + {id:'lys',name:'Lyon',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:220,ix:'Quenelle-IX',dc:'Croix-Rousse Silk Rack'}, + {id:'tls',name:'Toulouse',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:140,ix:'Cassoulet-IX',dc:'Airbus Hangar DC'}, + {id:'lil',name:'Lille',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:120,ix:'Maroilles-IX',dc:'Belfry Colo'}, + {id:'bod',name:'Bordeaux',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:120,ix:'Claret-IX',dc:'Wine Cellar DC'}, + {id:'sxb',name:'Strasbourg',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:80,ix:'Choucroute-IX',dc:'Cathedral Clock DC'}, + {id:'rns',name:'Rennes',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:75,ix:'Galette-IX',dc:'Breton Cold Room'}, + {id:'nte',name:'Nantes',x:0,y:0,land:'eu',reg:'EU',cc:'FR',P:90,ix:'',dc:'Mechanical Elephant DC'}, {id:'mrs',name:'Marseille',x:1045,y:378,land:'eu',reg:'EU',cc:'FR',P:250,ix:'Bouilla-IX',dc:'Cable Landing Station',note:tr('cities.subsea_cables_to_africa_and_asia')}, {id:'tor',name:'Toronto',ca:true,x:548,y:252,land:'am',reg:'AM',cc:'CA',P:500,ix:'Sorry-IX',dc:'151 Front Street',note:tr('cities.canada_s_hub_polite_packets_long')}, {id:'bru',name:'Brussels',x:0,y:0,land:'eu',reg:'EU',cc:'BE',P:150,be:true,tape:true,ix:'Frites-IX',dc:'Digital Unreality BRU1',note:tr('cities.right_between_london_amsterdam_paris')}, @@ -466,6 +473,7 @@ const CITY_NUDGE={ khi:[-2,-6], kwi:[-0.4,0.5], ldb:[6.2,0.1], + lil:[-14,6], lis:[.8,0], ljd:[-5.2,-7.7], mba:[-0.8,0], @@ -491,6 +499,7 @@ const CITY_NUDGE={ rec:[-2.4,7.2], ria:[-2.4,4.9], rix:[-2,18], + rns:[-6,2], sea:[1,4], sin:[-1.3,-1.3], sis:[0.3,-0.8], @@ -500,6 +509,7 @@ const CITY_NUDGE={ stg:[7,1], tgd:[-0.8,-1.3], tll:[4,10], + tls:[0,-6], van:[-3,-6], vie:[-4.5,2.25], vix:[-0.4,0.4], diff --git a/src/game/20-world/55-city-pdb.js b/src/game/20-world/55-city-pdb.js index df12bc0..934cc78 100644 --- a/src/game/20-world/55-city-pdb.js +++ b/src/game/20-world/55-city-pdb.js @@ -55,6 +55,7 @@ const CITY_PDB={ blr:[14,104,6412], bna:[7,35,33300], // est. bne:[21,277,3196], + bod:[1,29,2249], bog:[16,195,598], boi:[3,12,33300], // est. bom:[59,1050,6412], @@ -206,6 +207,7 @@ const CITY_PDB={ lbv:[4,11,12], ldb:[3,7,9693], lfw:[1,4,11], + lil:[1,0,2249], lim:[12,156,267], lis:[9,129,187], lit:[2,6,33300], // est. @@ -216,6 +218,7 @@ const CITY_PDB={ lon:[100,2588,4027], lpb:[1,2,71], lun:[4,3,24], + lys:[1,84,2249], maa:[20,374,6412], mad:[31,578,1341], maj:[0,0,12], @@ -262,6 +265,7 @@ const CITY_PDB={ nou:[2,2,19], nqz:[2,3,284], nsi:[3,6,61], + nte:[1,3,2249], // est. nuk:[0,0,2], // est. nyc:[96,1322,33300], nyt:[0,0,173], // est. @@ -317,6 +321,7 @@ const CITY_PDB={ ric:[5,25,33300], // est. rio:[33,577,9693], rix:[8,60,330], // 8 listed, Perses 2 has 19 networks; presences est. + rns:[1,3,2249], // est. rob:[1,2,18], rom:[12,213,1534], ror:[0,0,4], @@ -357,6 +362,7 @@ const CITY_PDB={ suv:[0,0,23], svd:[0,2,6], // est. svg:[2,14,448], + sxb:[2,54,2249], syd:[40,979,3196], tas:[7,3,140], tbs:[4,15,185], @@ -371,6 +377,7 @@ const CITY_PDB={ tip:[0,0,34], // est. tlh:[1,3,33300], // est. tll:[7,80,256], + tls:[1,18,2249], tms:[0,0,2], // est. tnr:[1,4,25], // est. tok:[58,917,1330], diff --git a/src/game/20-world/60-cables.js b/src/game/20-world/60-cables.js index f50860f..3ad98fb 100644 --- a/src/game/20-world/60-cables.js +++ b/src/game/20-world/60-cables.js @@ -1,8 +1,8 @@ const CABLES=[ {"id":"marea","name":"Marea Carey","price":0.8,"age":"new","blurb":tr('cables.hits_the_high_notes_across_the'),"pairs":[["ash","bio",[[-75.7,36.85],[-60,39.5],[-40,42.5],[-20.95,44.76],[-4.25,44],[-3.2,43.55]]]]}, {"id":"grace","name":"Grace Hopscotch","price":0.85,"age":"new","blurb":tr('cables.hops_from_new_york_to_the'),"pairs":[["nyc","lon",[[-73.5,40.5],[-70.5,41],[-62.76,43.86],[-55,46],[-5,50],[-1,50],[-0.25,50.75]]],["nyc","bio",[[-70.5,41],[-62,44],[-53.28,45.88],[-43.34,47.11],[-33.84,47.46],[-21.48,46.73],[-4.25,44],[-3.2,43.55]]]]}, - {"id":"dunant","name":"Dunno-ant","price":0.85,"age":"new","blurb":tr('cables.nobody_remembers_who_it_is_named'),"pairs":[["ash","par",[[-74.25,40.5],[-70.5,41],[-61.91,43.92],[-53.25,46],[-5,50],[0,50]]]]}, - {"id":"amitie","name":"Ami-Tea","price":0.9,"age":"new","blurb":tr('cables.a_friendly_cable_with_french_manners'),"pairs":[["nyc","lon",[[-73.5,40.5],[-70.5,41],[-62.76,43.86],[-55,46],[-5,50],[-1,50],[-0.25,50.75]]],["nyc","par",[[-70.5,41],[-61.91,43.92],[-53.25,46],[-5,50],[0,50]]]]}, + {"id":"dunant","name":"Dunno-ant","price":0.85,"age":"new","blurb":tr('cables.nobody_remembers_who_it_is_named'),"pairs":[["ash","nte",[[-75.7,36.85],[-60,39.5],[-40,43],[-20,46.5],[-5,46.4],[-2.5,46.5]]]]}, + {"id":"amitie","name":"Ami-Tea","price":0.9,"age":"new","blurb":tr('cables.a_friendly_cable_with_french_manners'),"pairs":[["nyc","lon",[[-73.5,40.5],[-70.5,41],[-62.76,43.86],[-55,46],[-5,50],[-1,50],[-0.25,50.75]]],["nyc","bod",[[-70.5,41],[-61.91,43.92],[-53.25,46],[-20,46.5],[-5,45.2],[-1.6,44.8]]]]}, {"id":"hibx","name":"Hibernia Express-o","price":1.7,"age":"mid","blurb":tr('cables.the_straightest_line_across_the'),"pairs":[["nyc","lon",[[-68,42],[-55,46.5],[-30,51.3],[-11,51.1],[-6.2,50.9],[-4.6,51.25],[-3.1,51.3]]],["nyc","hfx",[[-70.5,41],[-65.25,43]]],["hfx","lon",[[-60,45.5],[-55,46.5],[-30,51.3],[-11,51.1],[-6.2,50.9],[-4.6,51.25],[-3.1,51.3]]]],"lat":0.9}, {"id":"tat","name":"TAT-14 Retirement Home","price":1.3,"age":"old","blurb":tr('cables.laid_last_century_cuts_often_costs'),"pairs":[["nyc","ams",[[-70.5,41],[-55,46],[-1,50]]]]}, {"id":"ella","name":"EllaLink-ing","price":1.0,"age":"new","blurb":tr('cables.brazil_straight_to_iberia_skipping'),"pairs":[["for","mad",[[-37,-2.2],[-32,5],[-22,20],[-14,33],[-10,37.5]]],["sao","mad",[[-42.5,-24],[-38.75,-20.25],[-30,4],[-12.75,29.75],[-6.25,36],[-2.5,36],[0.75,38.75],[0.25,39.5]]],["for","lis",[[-37,-2.2],[-32,5],[-22,20],[-14,33],[-9.6,37.9]]],["for","rai",[[-37,-2.2],[-32,5],[-26,13]]],["rai","lis",[[-22,20],[-14,33],[-9.6,37.9]]]]}, @@ -198,6 +198,6 @@ const bizCity=c=>CITY[c].cc!=='KP'; const OFFC=ALLC.filter(c=>!CITY[c].off&&bizCity(c)); const ruCity=c=>!!CITY[c].ru; const cnCity=c=>!!CITY[c].cn; -const BIGC=['man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','ruh','jed','doh','kyv','mel','bne','osa','kul','bkk','sgn','khi','dac','waw','prg','vie','bud','buh','ist','rio','bue','scl','bog','lim','del','maa','blr','hyd','tpe','cpt','auh','ber','zrh','nbo','cai','jkt','mnl','per','akl','dub','lax','tor','mex','dxb','cph','icn','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mrs','mad','sto','bom','sin','hkg','tok','syd','jnb','lag']; -const MIDC=['man','bcn','mil','lis','atn','den','phx','bos','hou','mel','osa','kul','bkk','waw','vie','ist','rio','bue','scl','bog','del','maa','blr','tpe','auh','ber','zrh','jkt','mnl','dub','lax','tor','dxb','icn','sjc','ash','nyc','chi','dal','mia','lon','ams','fra','par','mad','sin','hkg','tok','syd','bom','sao']; +const BIGC=['lys','man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','ruh','jed','doh','kyv','mel','bne','osa','kul','bkk','sgn','khi','dac','waw','prg','vie','bud','buh','ist','rio','bue','scl','bog','lim','del','maa','blr','hyd','tpe','cpt','auh','ber','zrh','nbo','cai','jkt','mnl','per','akl','dub','lax','tor','mex','dxb','cph','icn','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mrs','mad','sto','bom','sin','hkg','tok','syd','jnb','lag']; +const MIDC=['lys','man','bcn','mil','lis','atn','den','phx','bos','hou','mel','osa','kul','bkk','waw','vie','ist','rio','bue','scl','bog','del','maa','blr','tpe','auh','ber','zrh','jkt','mnl','dub','lax','tor','dxb','icn','sjc','ash','nyc','chi','dal','mia','lon','ams','fra','par','mad','sin','hkg','tok','syd','bom','sao']; diff --git a/src/game/30-networks/10-networks.js b/src/game/30-networks/10-networks.js index d2b9ae1..728d2a9 100644 --- a/src/game/30-networks/10-networks.js +++ b/src/game/30-networks/10-networks.js @@ -1,12 +1,12 @@ /* ================= NETWORKS ================= */ const NETS=[ - {id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['syd','hfx','bda','hnl','bde','man','edi','svg','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','cph','osl','tor','lax','mex','mtl','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','bio','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist','kcy','cal','van','ott','bru','bet','ham','muc','cpq','gdl','mty','qro','was','mgm','lit','sac','hfd','dov','tlh','boi','spi','ind','dsm','top','fft','btr','aug','anp','lan','stp','jan','jef','hln','lnk','csn','con','ttn','saf','alb','rdu','bis','cmh','okc','sle','har','pvd','cae','pir','bna','aus','mpv','ric','olm','crw','msn','cys'],ix:[],blurb:tr('networks.grew_from_a_seedling_into_a')}, + {id:'lvl',name:'Level Tree',asn:3535,type:'t1',pol:'restrictive',share:.07,price:9,col:'#7B61FF',pops:['syd','hfx','bda','hnl','bde','man','edi','svg','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','cph','osl','tor','lax','mex','mtl','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','bio','rio','bue','scl','bog','lim','pan','waw','prg','vie','bud','buh','ist','kcy','cal','van','ott','bru','bet','ham','muc','cpq','gdl','mty','qro','was','mgm','lit','sac','hfd','dov','tlh','boi','spi','ind','dsm','top','fft','btr','aug','anp','lan','stp','jan','jef','hln','lnk','csn','con','ttn','saf','alb','rdu','bis','cmh','okc','sle','har','pvd','cae','pir','bna','aus','mpv','ric','olm','crw','msn','cys','lys'],ix:[],blurb:tr('networks.grew_from_a_seedling_into_a')}, {id:'ntt',name:'Not That Telecom',asn:2941,type:'t1',pol:'restrictive',share:.06,price:8,col:'#4B3FC4',pops:['hnl','gum','man','mil','atn','den','bos','hou','phx','jkt','mnl','lax','dxb','icn','sea','sjc','dal','ash','nyc','lon','ams','fra','sin','hkg','tok','syd','tpe','del','maa','blr','hyd','osa','kul','bkk','sgn','kcy','dus','fuk'],ix:[],blurb:tr('networks.huge_in_asia_which_telecom_not')}, - {id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['pdl','tci','svg','edi','man','mil','rom','pmo','ath','ber','osl','cph','hel','beg','sof','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','mrs','hkg','sin','tpe','tll','waw','vie','bud','buh','prg','kyv','van','bru','ham','muc','dus','krs','ebj','rix','zag','bts','got','mmx','hpa'],ix:[],blurb:tr('networks.nordic_backbone_that_tells_you')}, - {id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['hfx','bde','man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','bio','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv','kcy','van','ott','bru','oos','bet','ham','muc','dus','syd','per','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','pvd','hfd','har','msn','zag','vno','bts','lju','brn','pry'],ix:[],blurb:tr('networks.cheapest_transit_on_the_map_famously')}, + {id:'tly',name:'Tell-Ya Carrier',asn:1229,type:'t1',pol:'restrictive',share:.05,price:8,col:'#9D4EDD',pops:['pdl','tci','svg','edi','man','mil','rom','pmo','ath','ber','osl','cph','hel','beg','sof','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','mrs','hkg','sin','tpe','tll','waw','vie','bud','buh','prg','kyv','van','bru','ham','muc','dus','krs','ebj','rix','zag','bts','got','mmx','hpa','lys'],ix:[],blurb:tr('networks.nordic_backbone_that_tells_you')}, + {id:'cog',name:'Cogentle',asn:714,type:'t1',pol:'restrictive',share:.04,price:3,col:'#B35CF0',pops:['hfx','bde','man','edi','bcn','mil','rom','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','dub','hel','sof','beg','tor','lax','mex','cph','icn','sea','sjc','dal','chi','ash','nyc','mia','sao','lon','ams','fra','par','mad','bio','mrs','sto','sin','hkg','tok','rio','bue','scl','bog','lim','osa','waw','prg','vie','bud','buh','ist','kyv','kcy','van','ott','bru','oos','bet','ham','muc','dus','syd','per','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','pvd','hfd','har','msn','zag','vno','bts','lju','brn','pry','lys','tls','lil','bod','sxb'],ix:[],blurb:tr('networks.cheapest_transit_on_the_map_famously')}, {id:'tat',name:'Ta-Ta Comms',asn:6543,type:'t1',pol:'restrictive',share:.04,price:9,col:'#6A4C93',pops:['tci','gum','mil','pmo','lis','nbo','cai','jkt','dxb','nyc','ash','lon','fra','mrs','lag','jnb','bom','sin','hkg','tok','del','maa','blr','hyd','cpt','fuj','auh','tpe','khi','dac','cbo','kul','bkk','jed','ruh','doh','jib','dar','mba','dkr'],ix:[],blurb:tr('networks.waves_goodbye_to_latency_across_the')}, - {id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',auIx:['syd','mel','bne','per'],pops:['man','chc','edi','svg','bde','bcn','mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','bio','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh','kcy','cal','van','ott','bru','oos','bet','ham','muc','ccs','lpb','alg','tun','cas','dkr','dus','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','dsm','msn','boi','yeg','ywg','yxe','yqb','tia','zag','vno','skp','bts','lju','pnh','wlg'],ix:'ALL',blurb:tr('networks.will_peer_with_anyone_anywhere')}, - {id:'tng',name:'Tangerine Telecom',asn:5115,type:'t1',cc:['CD','CI','CM','EG','ES','FR','MA','MG','MQ','PL','RE','RO','SN','TN','MD','SK','JO','BF','CF','GN','GW','LR','ML','SL'],pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['tci','bcn','cai','nbo','dxb','fra','par','mrs','mad','bio','lon','ams','lag','jnb','waw','buh','dkr','abj','cas','tun','dla','fih','fdf','run','tnr','kiv','bts','amm','oua','cky','oxb','rob','bko','fna','bgf','ask','nsi','rba'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw','dkr','abj','cas','tun','dla','fih'],blurb:tr('networks.juicy_reach_into_europe_and_africa')}, + {id:'drz',name:'Drizzle Electric',asn:9369,type:'t2',pol:'open',share:.04,price:4,col:'#1E90FF',auIx:['syd','mel','bne','per'],pops:['man','chc','edi','svg','bde','bcn','mil','rom','pmo','lis','ath','atn','den','phx','bos','hou','slc','ber','zrh','nbo','akl','per','jkt','mnl','dub','rek','tor','mtl','lax','mex','sof','osl','icn','sea','sjc','dal','chi','ash','nyc','mia','lon','ams','fra','par','sto','mad','bio','hkg','sin','tok','syd','jnb','for','rio','bue','scl','lim','bog','pan','del','maa','blr','hyd','tpe','auh','cpt','mel','bne','osa','kul','bkk','sgn','khi','dac','cbo','waw','prg','vie','bud','buh','tll','ist','kyv','jed','ruh','doh','kcy','cal','van','ott','bru','oos','bet','ham','muc','ccs','lpb','alg','tun','cas','dkr','dus','was','sac','ind','stp','cmh','aus','bna','rdu','ric','okc','alb','dsm','msn','boi','yeg','ywg','yxe','yqb','tia','zag','vno','skp','bts','lju','pnh','wlg','lys'],ix:'ALL',blurb:tr('networks.will_peer_with_anyone_anywhere')}, + {id:'tng',name:'Tangerine Telecom',asn:5115,type:'t1',cc:['CD','CI','CM','EG','ES','FR','MA','MG','MQ','PL','RE','RO','SN','TN','MD','SK','JO','BF','CF','GN','GW','LR','ML','SL'],pol:'selective',minIx:15,minPni:40,share:.03,price:6,col:'#FF8C42',pops:['tci','bcn','cai','nbo','dxb','fra','par','mrs','mad','bio','lon','ams','lag','jnb','waw','buh','dkr','abj','cas','tun','dla','fih','fdf','run','tnr','kiv','bts','amm','oua','cky','oxb','rob','bko','fna','bgf','ask','nsi','rba','lys','tls','lil','bod','sxb','rns','nte'],ix:['bcn','par','mrs','mad','lon','ams','lag','jnb','waw','dkr','abj','cas','tun','dla','fih','lys','tls','lil','sxb'],blurb:tr('networks.juicy_reach_into_europe_and_africa')}, {id:'sgt',name:'SingTell',asn:7474,type:'t2',cc:'SG',pol:'selective',minIx:15,minPni:40,share:.03,price:7,col:'#00A6A6',pops:['jkt','mnl','per','akl','icn','sin','hkg','tok','syd','bom','tpe','maa','kul','bkk','sgn','mel','bne'],ix:['sin','hkg','tok','bom','tpe','maa','kul','bkk'],blurb:tr('networks.sings_your_packets_across_asia')}, {id:'vdp',name:'Voda-Phony',asn:1373,type:'t2',cc:['CD','CZ','DE','EG','ES','GB','GR','IE','MZ','NL','PT','QA','RO','TR','TZ','ZA','AL','LS'],pol:'paid',freeLv:7,paidFee:8000,share:.03,price:6,col:'#E63946',pops:['man','edi','mil','rom','lis','ath','nbo','cai','ber','dub','dxb','lon','fra','ams','mad','mrs','jnb','bom','lag','cpt','del','maa','ist','prg','bud','buh','doh','acc','dar','fih','mpm','dus','tia','msu','pry','dod'],ix:[],blurb:tr('networks.ended_free_peering_across_europe_and')}, {id:'ctc',name:'China Telecomet',asn:4314,type:'t2',cc:'CN',pol:'restrictive',share:.02,price:22,premium:2.5,premAt:['hkg','mos'],premOnly:['mos'],cn:true,col:'#0B5CAD',pops:['pek','sha','hkg','sin','tok','lon','fra','nyc','sjc'],ix:[],blurb:tr('networks.the_biggest_network_in_china_its')}, @@ -105,7 +105,7 @@ NETS.push({id:'stc',name:'Sticky Telecom',asn:39368,type:'t2',cc:['SA','BH','KW' {id:'ord',name:'Ooh-redoo',asn:8871,type:'eye',cc:['QA','OM','ID','IQ','KW'],pol:'paid',freeLv:11,paidFee:5000,share:.004,up:['tat','tly'],col:'#ED1C24',pops:['doh','dxb','jkt','mct','bgw','kwi'],ix:[],blurb:tr('networks.qatar_s_big_operator_paid_peering')}); NETS.push( {id:'tim',name:'TIM-Tam Italia',asn:3269,type:'eye',cc:['IT','SM'],pol:'selective',minIx:8,minPni:25,share:.008,up:['skl'],col:'#004691',pops:['mil','rom','pmo','smr'],ix:['mil','rom'],blurb:tr('networks.italy_s_incumbent_sweet_on_the')}, - {id:'skl',name:'Sparkly Seabone',asn:6762,type:'t1',pol:'restrictive',share:.04,price:6,col:'#5B2C83',pops:['pmo','mil','rom','ath','mrs','bcn','mad','bio','lis','par','lon','ams','fra','zrh','vie','bud','prg','waw','buh','sof','ist','ber','sto','nyc','ash','mia','atn','dal','chi','lax','sjc','tor','mex','pan','bog','lim','scl','bue','sao','rio','for','cai','jed','dxb','bom','sin','hkg','tok','hav'],ix:[],blurb:tr('networks.the_tier_1_that_grew_up')}, + {id:'skl',name:'Sparkly Seabone',asn:6762,type:'t1',pol:'restrictive',share:.04,price:6,col:'#5B2C83',pops:['pmo','mil','rom','ath','mrs','bcn','mad','bio','lis','par','lon','ams','fra','zrh','vie','bud','prg','waw','buh','sof','ist','ber','sto','nyc','ash','mia','atn','dal','chi','lax','sjc','tor','mex','pan','bog','lim','scl','bue','sao','rio','for','cai','jed','dxb','bom','sin','hkg','tok','hav','lys'],ix:[],blurb:tr('networks.the_tier_1_that_grew_up')}, {id:'fwb',name:'Fast-Webby',asn:12874,type:'eye',cc:'IT',pol:'open',share:.004,col:'#FDC300',pops:['mil','rom'],ix:['mil','rom'],blurb:tr('networks.fiber_to_the_italian_home_with')}, {id:'meo',name:'MEO-w Portugal',asn:3243,type:'eye',cc:'PT',pol:'selective',minIx:5,minPni:20,share:.004,col:'#00A3E0',pops:['pdl','lis','mad'],ix:['lis'],blurb:tr('networks.portugal_s_incumbent_purrs_when_you')}, {id:'nos',name:'NOS-y Neighbour',asn:2860,type:'eye',cc:'PT',pol:'open',share:.003,col:'#111111',pops:['lis'],ix:['lis'],blurb:tr('networks.peers_with_anyone_and_wants_to')}, diff --git a/src/game/30-networks/32-homegrown-eyeballs.js b/src/game/30-networks/32-homegrown-eyeballs.js index a883165..2f079b2 100644 --- a/src/game/30-networks/32-homegrown-eyeballs.js +++ b/src/game/30-networks/32-homegrown-eyeballs.js @@ -7,7 +7,7 @@ NETS.push( {id:'a1b',name:'A-Wan Bulgaria',asn:8717,type:'eye',cc:'BG',pol:'open',share:.0015,up:['aat'],col:'#DA291C',pops:['sof','vie'],ix:['sof'],blurb:tr('homegrown_eyeballs.a_wan_telekom_s_bulgarian_sister')}, {id:'aat',name:'A-Wan Telekom',asn:8447,type:'eye',cc:['AT','BY','HR','MK','SI'],pol:'selective',minIx:6,minPni:20,share:.003,up:['tly','lvl'],col:'#DA291C',pops:['vie','fra','prg','bud','msq','zag','skp','lju'],ix:['vie'],blurb:tr('homegrown_eyeballs.austria_s_incumbent_first_in_line')}, - {id:'adt',name:'Andorable Telecom',asn:6752,type:'t2',cc:'AD',pol:'open',share:.0002,price:11,up:['tng','cog'],col:'#E2001A',pops:['ala','bcn','par'],ix:[],blurb:tr('homegrown_eyeballs.andorra_s_only_telco_by_law')}, + {id:'adt',name:'Andorable Telecom',asn:6752,type:'t2',cc:'AD',pol:'open',share:.0002,price:11,up:['tng','cog'],col:'#E2001A',pops:['ala','bcn','par','tls'],ix:[],blurb:tr('homegrown_eyeballs.andorra_s_only_telco_by_law')}, {id:'afc',name:'Afri-Sell',asn:37524,type:'eye',cc:['GM','SL'],pol:'open',share:.0006,up:['tng','cog'],col:'#6B2C91',pops:['bjl','fna'],ix:['bjl','fna'],blurb:tr('homegrown_eyeballs.a_mobile_group_from_the_gambia')}, {id:'aft',name:'Afghan Tele-Pass',asn:55330,type:'t2',cc:'AF',pol:'open',share:.0008,price:13,up:['uzt','tta'],col:'#00843D',pops:['kbl','tas'],ix:['kbl'],blurb:tr('homegrown_eyeballs.afghanistan_s_state_telco_finds_transit')}, {id:'agt',name:'Algérie Comme-Ci Comme-Ça',asn:36947,type:'eye',cc:'DZ',pol:'selective',minIx:2,minPni:12,share:.003,up:['tly','cog'],col:'#0B7A3E',pops:['alg','mrs'],ix:['alg'],blurb:tr('homegrown_eyeballs.algeria_s_state_incumbent_so_so')}, @@ -51,7 +51,7 @@ NETS.push( {id:'erl',name:'Earth-Linky',asn:50710,type:'t2',cc:'IQ',pol:'open',share:.0015,price:12,up:['ttk','stc','cog'],col:'#1D70B8',pops:['bgw'],ix:['bgw'],blurb:tr('homegrown_eyeballs.iraq_s_biggest_home_isp_down')}, {id:'fet',name:'Far EasTone-Deaf',asn:9674,type:'eye',cc:'TW',pol:'selective',minIx:3,minPni:12,share:.003,up:['ntt'],col:'#E60012',pops:['tpe','hkg'],ix:['tpe'],blurb:tr('homegrown_eyeballs.taiwan_s_number_three_never_hears')}, {id:'fl1',name:'FL-One-Liner',asn:20634,type:'t2',cc:'LI',pol:'open',share:.0002,price:10,up:['lvl','aat'],col:'#9F1D35',pops:['vdz','zrh'],ix:['vdz'],blurb:tr('homegrown_eyeballs.liechtenstein_s_telecom_short_enough_for')}, - {id:'fre',name:'Free as in Beer',asn:12322,type:'eye',cc:'FR',pol:'selective',minIx:6,minPni:20,share:.006,up:['cog','lvl'],col:'#CD1E25',pops:['par','mrs','ams','lon','fra'],ix:['par','mrs'],blurb:tr('homegrown_eyeballs.the_challenger_that_made_french_broadband')}, + {id:'fre',name:'Free as in Beer',asn:12322,type:'eye',cc:'FR',pol:'selective',minIx:6,minPni:20,share:.006,up:['cog','lvl'],col:'#CD1E25',pops:['par','mrs','ams','lon','fra','lys','tls','lil','bod','sxb','rns','nte'],ix:['par','mrs','lys','tls','lil','bod'],blurb:tr('homegrown_eyeballs.the_challenger_that_made_french_broadband')}, {id:'frs',name:'Oh Yas Sénégal',asn:37649,type:'eye',cc:['SN','KM'],pol:'open',share:.0008,up:['tat','tly'],col:'#FFD100',pops:['dkr','hah'],ix:['dkr'],blurb:tr('homegrown_eyeballs.senegal_s_number_two_freshly_renamed')}, {id:'fsm',name:'Island-Hop Micronesia',asn:10130,type:'t2',cc:'FM',pol:'open',share:.0001,price:14,up:['gtg'],col:'#0072CE',pops:['pni','gum'],ix:[],blurb:tr('homegrown_eyeballs.micronesia_s_only_telco_noodling_across')}, {id:'gbt',name:'Gabon Tele-Calm',asn:16058,type:'t2',cc:'GA',pol:'open',share:.0004,price:11,up:['mrc','tng'],col:'#F7941D',pops:['lbv','cas'],ix:['lbv'],blurb:tr('homegrown_eyeballs.gabon_s_old_telco_now_part')}, diff --git a/src/game/30-networks/38-france.js b/src/game/30-networks/38-france.js new file mode 100644 index 0000000..8f978b2 --- /dev/null +++ b/src/game/30-networks/38-france.js @@ -0,0 +1,8 @@ +/* France beyond Paris and Marseille: the second and third mobile operators and the two big French clouds, with real ASNs. + Orange (Tangerine Telecom) and Free (Free as in Beer) reach the new cities too; Andorable Telecom comes up to Toulouse. + Sits before 40-traffic-shares.js, which indexes NETS. */ +NETS.push( + {id:'sfe',name:'SF-Error Telecom',asn:15557,type:'eye',cc:'FR',pol:'selective',minIx:6,minPni:20,share:.005,up:['cog','lvl','tly'],col:'#E4002B',pops:['par','mrs','lys','tls','lil','bod','sxb','rns','nte','lon','ams','fra'],ix:['par','mrs','lys','tls','lil','bod','sxb'],blurb:tr('france.france_s_number_two_it_bought_a')}, + {id:'byg',name:'Boy-Egg Telecom',asn:5410,type:'eye',cc:'FR',pol:'selective',minIx:6,minPni:20,share:.004,up:['cog','lvl','tng'],col:'#0072CE',pops:['par','mrs','lys','tls','lil','bod','sxb','rns','nte','lon','ams','fra'],ix:['par','mrs','lys','tls','lil','sxb'],blurb:tr('france.the_builder_that_became_a_mobile')}, + {id:'ovh',name:'Ov-Hatch Cloud',asn:16276,type:'cdn',pol:'selective',minIx:5,minPni:20,share:.004,col:'#123F6D',pops:['par','lil','sxb','lon','fra','ams','waw','sin','syd'],ix:['par','sxb','lon','fra','ams','sin'],blurb:tr('france.europe_s_biggest_hosting_cloud_from')}, + {id:'sca',name:'Scale-Away',asn:12876,type:'cdn',pol:'selective',minIx:5,minPni:20,share:.002,col:'#4F0599',pops:['par','ams','waw'],ix:['par'],blurb:tr('france.the_cloud_arm_of_the_free_group')}); diff --git a/src/i18n/en.js b/src/i18n/en.js index da93f15..799dfe9 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -2193,6 +2193,10 @@ "find.press_slash_to_search_from":"Tip: press / anywhere on the map to search.", "find.type_a_city_a_country":"Type a city, a country or an exchange.", "find.your_pop":"your POP", +"france.europe_s_biggest_hosting_cloud_from":"Europe’s biggest hosting cloud, from Roubaix. After the Strasbourg fire it backs everything up twice.", +"france.france_s_number_two_it_bought_a":"France’s number two. It bought a cable company, then a media empire, then a lot of debt.", +"france.the_builder_that_became_a_mobile":"The builder that became a mobile network. It still pours concrete on the side.", +"france.the_cloud_arm_of_the_free_group":"The cloud arm of the Free group, with ARM servers and a data centre in a Paris bunker.", "game_and_settings.delete_and_start_over":"Delete and start over", "game_and_settings.export_save_download_a_file":"Export save download a file", "game_and_settings.import_failed_that_save_is_damaged":"Import failed.
That save is damaged and could not be loaded. Your current game is untouched.", diff --git a/tests/france.test.js b/tests/france.test.js new file mode 100644 index 0000000..99c315c --- /dev/null +++ b/tests/france.test.js @@ -0,0 +1,50 @@ +const test = require('node:test'); +const assert = require('node:assert/strict'); +const { load } = require('./harness'); + +const start = "ACT.start({});S.cash=1e9;S.nextFail=1e9;S.nextEvent=1e9;for(const g of GOALS)S.done[g.id]=0"; +const NEW = { lys: ['Lyon', 'Quenelle-IX'], tls: ['Toulouse', 'Cassoulet-IX'], lil: ['Lille', 'Maroilles-IX'], bod: ['Bordeaux', 'Claret-IX'], + sxb: ['Strasbourg', 'Choucroute-IX'], rns: ['Rennes', 'Galette-IX'], nte: ['Nantes', ''] }; + +test('Lyon, Toulouse, Lille, Bordeaux, Strasbourg, Rennes and Nantes are French cities on land, with a seller of transit each', () => { + const { ev, errors } = load(); + ev(start); + for (const [id, [name, ix]] of Object.entries(NEW)) { + assert.equal(ev(`CITY.${id}.name`), name); + assert.equal(ev(`CITY.${id}.cc`), 'FR'); + assert.equal(ev(`CITY.${id}.ix`), ix); + assert.equal(ev(`onLand(CITY.${id}.x,CITY.${id}.y)`), true, `${id} is on drawn land`); + assert.equal(ev(`NETS.some(n=>sellsAt(n,'${id}'))`), true, `${id} has a transit seller`); + assert.equal(ev(`CITY_PDB.${id}.length`), 3, `${id} has calibration`); + } + assert.deepEqual(errors, []); +}); + +test('SF-Error Telecom, Boy-Egg Telecom, Ov-Hatch Cloud and Scale-Away carry the real ASNs, and Orange and Free reach the new cities', () => { + const { ev, errors } = load(); + ev(start); + assert.deepEqual(['sfe', 'byg', 'ovh', 'sca'].map((n) => ev(`NET.${n}.asn`)), [15557, 5410, 16276, 12876]); + assert.deepEqual(['sfe', 'byg', 'ovh', 'sca'].map((n) => ev(`NET.${n}.name`)), ['SF-Error Telecom', 'Boy-Egg Telecom', 'Ov-Hatch Cloud', 'Scale-Away']); + for (const c of Object.keys(NEW)) for (const n of ['tng', 'fre', 'sfe', 'byg']) assert.equal(ev(`NET.${n}.pops.includes('${c}')`), true, `${n} is in ${c}`); + assert.equal(ev("NET.ovh.pops.includes('sxb')&&NET.ovh.ix.includes('sxb')"), true, 'Ov-Hatch is on EuroRhine-IX in Strasbourg'); + for (const c of ['lys', 'tls', 'lil', 'bod', 'sxb']) assert.equal(ev(`NET.cog.pops.includes('${c}')`), true, `Cogentle is in ${c}, where PeeringDB lists Cogent`); + assert.equal(ev("NET.adt.pops.includes('tls')"), true, 'Andorra’s telco comes up to Toulouse'); + assert.equal(ev("NETS.filter(n=>n.type!=='cdn'&&[].concat(n.cc||[]).includes('FR')&&n.pops.includes('lys')).length>=4"), true, 'four consumer networks in Lyon'); + assert.deepEqual(errors, []); +}); + +test('Ami-Tea comes ashore at Bordeaux and Dunno-ant at Nantes, and Dunno-ant starts at Virginia Beach, not New Jersey', () => { + const { ev, errors } = load(); + ev(start); + const pairs = (id) => JSON.parse(ev(`JSON.stringify(CABLES.find(c=>c.id==='${id}').pairs.map(p=>p.slice(0,2)))`)); + assert.deepEqual(pairs('amitie'), [['nyc', 'lon'], ['nyc', 'bod']]); + assert.deepEqual(pairs('dunant'), [['ash', 'nte']]); + assert.deepEqual(JSON.parse(ev("JSON.stringify(CABLES.find(c=>c.id==='dunant').pairs[0][2][0])")), [-75.7, 36.85]); + for (const id of ['amitie', 'dunant']) { + const wp = JSON.parse(ev(`JSON.stringify(CABLES.find(c=>c.id==='${id}').pairs.flatMap(p=>p[2].map(w=>{const q=proj(w[0],w[1]);return onLand(q[0],q[1])})))`)); + assert.ok(wp.every((x) => !x), `${id}: every waypoint is at sea`); + } + assert.equal(ev("CABLE_PAIRS.some(p=>p.cid==='dunant'&&(p.a==='par'||p.b==='par'))"), false, 'nothing lands in inland Paris any more'); + for (const z of [0.35, 1.4, 6]) ev(`cam.z=${z};draw(performance.now())`); + assert.deepEqual(errors, []); +}); diff --git a/tests/issues.test.js b/tests/issues.test.js index c59b76d..f3b660e 100644 --- a/tests/issues.test.js +++ b/tests/issues.test.js @@ -600,17 +600,18 @@ test('#66 #68 subsea optics: engineered glass reaches further, and the same limi // counted as land glass it would be 400G, which is what #66 saw ev("S.links.find(l=>l.id==='oc').sub=false;compute()"); assert.equal(ev("dfCap(S.links.find(l=>l.id==='oc'))"), 400); - // leased waves: transatlantic London–New York still takes 6.4T (4×1.6T); Paris–Ashburn tops out at 800G + // leased waves: transatlantic London–New York still takes 6.4T (4×1.6T); Nantes–Ashburn tops out at 800G assert.equal(ev("subWaveWhy(5,cablesFor('lon','nyc')[0].km,true)"), ''); - assert.match(ev("subWaveWhy(4,cablesFor('par','ash')[0].km,true)"), /at most 1.2T per carrier/); - assert.equal(ev("LT[subMaxTier(cablesFor('par','ash')[0].km)].n"), '800G'); + assert.match(ev("subWaveWhy(4,cablesFor('nte','ash')[0].km,true)"), /at most 1.2T per carrier/); + assert.equal(ev("LT[subMaxTier(cablesFor('nte','ash')[0].km)].n"), '800G'); assert.equal(ev("LT[subMaxTier(14000)].n"), '400G', 'the longest cables carry 400G waves'); assert.equal(ev("subWaveWhy(5,4000,false)"), '', 'land waves are not capped this way'); // buying a too-big wave is refused; an old one keeps running - ev("UI.pending={a:'par',b:'ash'};UI.via=cablesFor('par','ash')[0].cid;const n=S.links.length;ACT.buildLink({tier:4});window.__d=S.links.length-n"); - assert.equal(ev('__d'), 0, 'no 1.6T wave across 6,670 km'); + ev("ACT.buildPop({city:'nte'});S.pops.nte.rgen=3;compute()"); + ev("UI.pending={a:'nte',b:'ash'};UI.via=cablesFor('nte','ash')[0].cid;const n=S.links.length;ACT.buildLink({tier:4});window.__d=S.links.length-n"); + assert.equal(ev('__d'), 0, 'no 1.6T wave across 6,473 km'); ev("ACT.buildLink({tier:3})"); - const w = "S.links.find(l=>l.kind==='wave'&&l.a==='par')"; + const w = "S.links.find(l=>l.kind==='wave'&&(l.a==='nte'||l.b==='nte'))"; assert.equal(ev(`${w}.tier`), 3, '800G is fine'); ev(`ACT.upLink({id:${w}.id,tier:4})`); assert.equal(ev(`${w}.tier`), 3, 'and it cannot be upgraded past the cable'); diff --git a/tests/scenarios-playtest.test.js b/tests/scenarios-playtest.test.js index 4e98b7d..51287df 100644 --- a/tests/scenarios-playtest.test.js +++ b/tests/scenarios-playtest.test.js @@ -18,7 +18,7 @@ const PLAY = { stg: { ref: [['bb', 'stg'], ['ix', 'stg'], ['link', 'stg', 'fra', 1], ['ix', 'fra'], ['bb', 'fra'], ['link', 'fra', 'ams', 1], ['ix', 'ams'], ['bb', 'ams'], ['link', 'ams', 'lon', 1], ['ix', 'lon'], ['bb', 'lon'], ['link', 'fra', 'par', 1], ['ix', 'par'], ['bb', 'par'], ['hire', ['routers', 'repair', 'caches', 'pni', 'ix', 'sales'], { pni: { paid: true } }], ['link', 'stg', 'muc', 1], ['ix', 'muc'], ['bb', 'muc'], ['wait', 120], ['pnis'], ['link', 'lon', 'nyc', 2], ['ix', 'nyc'], ['bb', 'nyc'], ['wait', 200], ['pnis']], win: [120, 240], cheese: [['bb', 'stg'], ['ix', 'stg'], ['link', 'stg', 'fra', 1], ['ix', 'fra'], ['bb', 'fra'], ['loans'], ['hire', ['routers', 'repair']]], by: null }, // The other way round the planet: Paris, New York, Los Angeles, Tokyo, Hong Kong, Singapore. - redsea: { ref: [...home('mrs'), ['link', 'mrs', 'par', 1], ['bb', 'par'], ['ix', 'par'], ['link', 'par', 'nyc', 1, 'amitie'], ['tr', 'nyc', 1], ['ix', 'nyc'], ['link', 'nyc', 'lax', 1], ['ix', 'lax'], ['tr', 'lax', 1], ['link', 'lax', 'tok', 1, 'jup'], ['bb', 'tok'], ['tr', 'tok', 1], ['ix', 'tok'], ['link', 'tok', 'hkg', 1, 'apg'], ['bb', 'hkg'], ['tr', 'hkg', 1], ['ix', 'hkg'], ['link', 'hkg', 'sin', 1], ['bb', 'sin'], ['tr', 'sin', 1], ['ix', 'sin'], HIRE], + redsea: { ref: [...home('mrs'), ['link', 'mrs', 'par', 1], ['bb', 'par'], ['ix', 'par'], ['link', 'par', 'bod', 1], ['link', 'bod', 'nyc', 1, 'amitie'], ['tr', 'nyc', 1], ['ix', 'nyc'], ['link', 'nyc', 'lax', 1], ['ix', 'lax'], ['tr', 'lax', 1], ['link', 'lax', 'tok', 1, 'jup'], ['bb', 'tok'], ['tr', 'tok', 1], ['ix', 'tok'], ['link', 'tok', 'hkg', 1, 'apg'], ['bb', 'hkg'], ['tr', 'hkg', 1], ['ix', 'hkg'], ['link', 'hkg', 'sin', 1], ['bb', 'sin'], ['tr', 'sin', 1], ['ix', 'sin'], HIRE], // 2.0.0: no more max-prefix outages to break the 30-day streak, so the reference can finish in under 100 days. win: [80, 250], cheese: [...home('mrs'), ['loans'], ['link', 'mrs', 'sin', 1], ['bb', 'sin']], by: null }, spat: { ref: [...home('nyc'), HIRE], avoid: ['cog'], win: [50, 140], cheese: [...home('nyc'), ['hire', ['routers', 'repair']]], by: 160 }, diff --git a/tests/tier1-cone.test.js b/tests/tier1-cone.test.js index 9d86b26..5ebcbc3 100644 --- a/tests/tier1-cone.test.js +++ b/tests/tier1-cone.test.js @@ -80,7 +80,7 @@ test('the long tail no longer stands between you and Tier 1', () => { assert.equal(ev("isTier1()"), true); // the peers you need directly are all real networks of some size, and fewer than before const islands = ev("S.pni.filter(p=>p.id[0]==='i').length"); - assert.ok(islands < 70, `${islands} networks to peer with directly`); + assert.ok(islands < 80, `${islands} networks to peer with directly`); assert.deepEqual(errors, []); });