diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fba37d..f907dd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] - The NOC charts have tooltips, on the dashboard and on the wallboard in the NOC window: hover (or touch) a chart to see every series on that day, with a total. Click an entry in the legend to hide or show that series, and the scale follows what is left. The "how it arrives" bars on the Traffic tab show the same kind of tooltip, and its legend picks which ways in (caches, PNIs, IX peering, transit) the table counts. -- Bilbao joins the map, where the transatlantic cables really come ashore: Marea Carey, Grace Hopscotch, Sol Survivor and Columbus III-and-a-half now land there instead of Madrid. It has no exchange of its own, so traffic heads inland to Madrid, and Drizzle Electric, Tangerine Telecom and the big carriers sell transit there. A link you already run on the old Madrid landings keeps working as a plain subsea link, and the Mid-Atlantic Accent scenario now goes Azores, Bilbao, Madrid, and Marea Carey now leaves the American coast at Virginia Beach instead of crossing the northeast to New Jersey. +- Bilbao joins the map, where the transatlantic cables really come ashore: Marea Carey, Grace Hopscotch and Sol Survivor now land there instead of Madrid. It has no exchange of its own, so traffic heads inland to Madrid, and Drizzle Electric, Tangerine Telecom and the big carriers sell transit there. A link you already run on the old Madrid landings keeps working as a plain subsea link, and the Mid-Atlantic Accent scenario now goes Azores, Bilbao, Madrid, and Marea Carey now leaves the American coast at Virginia Beach instead of crossing the northeast to New Jersey. Columbus III-and-a-half now comes ashore near Cádiz, where it really landed, on its way to Madrid. ## [2.9.1] — 2026-11-04 - Jokes in the game now poke fun at networks, cables and routers, never at people, countries or beliefs. A few networks have new names (Atlas Hold-the-Line Telecom, Star-Blink, Telekom Malay-tency, Oh Yas Sénégal, Afghan Tele-Pass, Island-Hop Micronesia, Tel-One-derful, Tango Two-Step), so do three of the names for your own cables, and about forty descriptions of networks, cities, cables and events were rewritten. diff --git a/src/game/20-world/60-cables.js b/src/game/20-world/60-cables.js index 6e80b7a..f50860f 100644 --- a/src/game/20-world/60-cables.js +++ b/src/game/20-world/60-cables.js @@ -7,7 +7,7 @@ const CABLES=[ {"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]]]]}, {"id":"sacs","name":"SACS-y Cable","price":1.0,"age":"mid","blurb":tr('cables.south_atlantic_cool_and_confident'),"pairs":[["for","lag",[[-36,-3],[-20,0],[0,3]]],["sao","lag",[[-46,-24],[-42,-24],[-30.51,-17.71],[-14.49,-7.05],[2,5]]],["for","lad",[[-37,-2.5],[-20,-5],[0,-8],[12.6,-9]]]]}, - {"id":"col3","name":"Columbus III-and-a-half","price":1.4,"age":"old","blurb":tr('cables.crossed_the_atlantic_again_old'),"pairs":[["mia","bio",[[-79.5,25.75],[-69.91,36.41],[-62,43],[-53.51,45.01],[-38.07,46.85],[-22.19,46.53],[-4.25,44],[-3.2,43.55]]],["mia","pdl",[[-79,26],[-60,30],[-35,36]]],["pdl","lis",[[-15,38.2]]]]}, + {"id":"col3","name":"Columbus III-and-a-half","price":1.4,"age":"old","blurb":tr('cables.crossed_the_atlantic_again_old'),"pairs":[["mia","mad",[[-79.5,25.75],[-60,31],[-35,35.5],[-15,36.3],[-7.5,36.2],[-6.1,36.3]]],["mia","pdl",[[-79,26],[-60,30],[-35,36]]],["pdl","lis",[[-15,38.2]]]]}, {"id":"twoaf","name":"2Africa-n-Back","price":0.75,"age":"new","blurb":tr('cables.all_the_way_around_africa_and'),"pairs":[["lon","lag",[[-0.25,50.75],[-1,50],[-4.5,49.25],[-9,44.27],[-12.48,39.05],[-16.49,31.46],[-17.75,28.75],[-18,14],[-17.5,12.75],[-13.75,8.25],[-8.75,4.25],[-2,4.25],[2.75,5.75]]],["jnb","mrs",[[32,-30],[32,-30],[32.34,-29.6],[32.67,-29.2],[33.01,-28.8],[33.34,-28.39],[33.67,-27.99],[33.99,-27.58],[34.32,-27.18],[34.64,-26.77],[34.96,-26.36],[35.27,-25.96],[35.59,-25.55],[35.9,-25.14],[36.21,-24.73],[36.52,-24.32],[36.82,-23.91],[37.13,-23.5],[37.43,-23.08],[37.73,-22.67],[38.03,-22.26],[38.33,-21.84],[38.62,-21.43],[38.92,-21.01],[39.21,-20.6],[39.5,-20.18],[39.79,-19.77],[40.07,-19.35],[40.36,-18.93],[40.65,-18.51],[40.93,-18.1],[41.21,-17.68],[41.49,-17.26],[41.77,-16.84],[42.05,-16.42],[42.32,-16],[42.6,-15.58],[42.87,-15.16],[43.15,-14.74],[43.42,-14.32],[43.69,-13.89],[43.96,-13.47],[44.23,-13.05],[44.5,-12.63],[44.77,-12.2],[45.03,-11.78],[45.3,-11.36],[45.56,-10.93],[45.83,-10.51],[46.09,-10.09],[46.35,-9.66],[46.62,-9.24],[46.88,-8.81],[47.14,-8.39],[47.4,-7.96],[47.66,-7.54],[47.92,-7.11],[48.18,-6.69],[48.43,-6.26],[48.69,-5.84],[48.95,-5.41],[49.21,-4.98],[49.46,-4.56],[49.72,-4.13],[49.98,-3.71],[50.23,-3.28],[50.49,-2.85],[50.74,-2.43],[51,-2],[51.03,-1.51],[51.05,-1.02],[51.08,-0.53],[51.11,-0.04],[51.13,0.46],[51.16,0.95],[51.19,1.44],[51.21,1.93],[51.24,2.42],[51.26,2.91],[51.29,3.4],[51.32,3.89],[51.34,4.38],[51.37,4.88],[51.4,5.37],[51.42,5.86],[51.45,6.35],[51.48,6.84],[51.5,7.33],[51.53,7.82],[51.56,8.31],[51.59,8.8],[51.61,9.29],[51.64,9.79],[51.67,10.28],[51.69,10.77],[51.72,11.26],[51.75,11.75],[51,12.5],[50.5,12.47],[50,12.44],[49.5,12.41],[49,12.38],[48.5,12.34],[48,12.31],[47.5,12.27],[47,12.24],[46.5,12.2],[46,12.16],[45.5,12.12],[45,12.08],[44.5,12.04],[44,12],[43.75,12.25],[43.5,12.5],[43.25,12.75],[43.25,13],[43.25,13.25],[43,13.5],[42.75,13.75],[42.5,14],[42.26,14.43],[42.02,14.86],[41.78,15.3],[41.54,15.73],[41.3,16.16],[41.05,16.59],[40.81,17.02],[40.56,17.45],[40.31,17.88],[40.06,18.31],[39.82,18.74],[39.56,19.17],[39.31,19.6],[39.06,20.03],[38.8,20.46],[38.55,20.88],[38.29,21.31],[38.03,21.74],[37.77,22.17],[37.51,22.59],[37.24,23.02],[36.98,23.44],[36.71,23.87],[36.44,24.29],[36.17,24.72],[35.89,25.14],[35.62,25.56],[35.34,25.99],[35.06,26.41],[34.78,26.83],[34.5,27.25],[34.25,27.5],[34,27.75],[33.75,28],[33.5,28.25],[33.25,28.5],[33,28.75],[33,29],[32.75,29.25],[32.5,29.5],[32.5,29.75],[32.5,30.5],[32.5,31.25],[32.25,31.5],[32,31.75],[31.6,32.11],[31.2,32.47],[30.8,32.83],[30.39,33.19],[29.98,33.55],[29.56,33.9],[29.14,34.25],[28.72,34.61],[28.3,34.96],[27.87,35.31],[27.44,35.65],[27,36],[26.43,36.01],[25.86,36.01],[25.29,36.02],[24.71,36.02],[24.14,36.01],[23.57,36.01],[23,36],[22,36],[21.42,36.02],[20.83,36.03],[20.25,36.04],[19.67,36.05],[19.08,36.05],[18.5,36.05],[17.92,36.05],[17.33,36.05],[16.75,36.04],[16.17,36.03],[15.58,36.02],[15,36],[14.07,36.36],[13.14,36.71],[12.21,37.07],[11.29,37.43],[10.36,37.79],[9.43,38.14],[8.5,38.5],[7.75,39.25],[7.54,39.66],[7.33,40.06],[7.11,40.47],[6.9,40.88],[6.68,41.28],[6.45,41.69],[6.23,42.1],[6,42.5],[6,42.5]]],["mrs","bom",[[5.25,43.25],[5.25,43],[5.25,42.75],[5.58,42.32],[5.9,41.88],[6.22,41.44],[6.53,41.01],[6.84,40.57],[7.15,40.13],[7.45,39.69],[7.75,39.25],[8.5,38.5],[9.43,38.14],[10.36,37.79],[11.29,37.43],[12.21,37.07],[13.14,36.71],[14.07,36.36],[15,36],[15.58,36.02],[16.17,36.03],[16.75,36.04],[17.33,36.05],[17.92,36.05],[18.5,36.05],[19.08,36.05],[19.67,36.05],[20.25,36.04],[20.83,36.03],[21.42,36.02],[22,36],[23,36],[23.57,36.01],[24.14,36.01],[24.71,36.02],[25.29,36.02],[25.86,36.01],[26.43,36.01],[27,36],[27.44,35.65],[27.87,35.31],[28.3,34.96],[28.72,34.61],[29.14,34.25],[29.56,33.9],[29.98,33.55],[30.39,33.19],[30.8,32.83],[31.2,32.47],[31.6,32.11],[32,31.75],[32.25,31.5],[32.5,31.25],[32.5,30.5],[32.5,29.75],[32.5,29.5],[32.75,29.25],[33,29],[33,28.75],[33.25,28.5],[33.5,28.25],[33.75,28],[34,27.75],[34.25,27.5],[34.5,27.25],[34.78,26.83],[35.06,26.41],[35.34,25.99],[35.62,25.56],[35.89,25.14],[36.17,24.72],[36.44,24.29],[36.71,23.87],[36.98,23.44],[37.24,23.02],[37.51,22.59],[37.77,22.17],[38.03,21.74],[38.29,21.31],[38.55,20.88],[38.8,20.46],[39.06,20.03],[39.31,19.6],[39.56,19.17],[39.82,18.74],[40.06,18.31],[40.31,17.88],[40.56,17.45],[40.81,17.02],[41.05,16.59],[41.3,16.16],[41.54,15.73],[41.78,15.3],[42.02,14.86],[42.26,14.43],[42.5,14],[42.75,13.75],[43,13.5],[43.25,13.25],[43.25,13],[43.25,12.75],[43.5,12.5],[43.75,12.25],[44,12],[44.5,12],[45.25,12.38],[46,12.75],[46.48,12.9],[46.97,13.04],[47.46,13.19],[47.94,13.33],[48.43,13.47],[48.92,13.61],[49.4,13.75],[49.89,13.89],[50.38,14.03],[50.87,14.17],[51.36,14.31],[51.85,14.44],[52.34,14.58],[52.84,14.71],[53.33,14.84],[53.82,14.97],[54.32,15.1],[54.81,15.23],[55.31,15.36],[55.8,15.49],[56.3,15.61],[56.8,15.74],[57.29,15.86],[57.79,15.98],[58.29,16.11],[58.79,16.23],[59.29,16.35],[59.79,16.46],[60.29,16.58],[60.79,16.7],[61.3,16.81],[61.8,16.92],[62.3,17.04],[62.81,17.15],[63.31,17.26],[63.82,17.36],[64.32,17.47],[64.83,17.58],[65.34,17.68],[65.85,17.78],[66.35,17.89],[66.86,17.99],[67.37,18.08],[67.88,18.18],[68.39,18.28],[68.91,18.37],[69.42,18.47],[69.93,18.56],[70.44,18.65],[70.96,18.74],[71.47,18.83],[71.98,18.91],[72.5,19],[72.75,19]]],["dkr","abj",[[-18,14.7],[-17,10],[-14,5],[-8,4],[-4,4.8]]],["abj","acc",[[-3,4],[0,5]]],["acc","lag",[[-0.2,5.1],[3.2,5.8]]],["lag","lad",[[3.2,5.8],[6,3],[9,3.6],[8,-2],[11.5,-6],[12.6,-9]]],["lad","cpt",[[12.5,-9.5],[11.25,-15.25],[12,-26]]],["cpt","dur",[[17.6,-34.4],[22,-35.5],[28,-34],[32,-30.3]]],["dur","mpm",[[32,-30.3],[34.5,-26]]],["mpm","dar",[[34.5,-26],[38,-20],[41.5,-14],[40.4,-7]]],["dar","mba",[[40.4,-7],[40.6,-4.3]]],["mba","jib",[[48.25,4],[51.5,9.5],[51.75,11.75],[51,12.5]]],["jib","cai",[[43.25,11.75],[44,12],[43,13],[43,13.5],[42.5,14],[39.06,20.03],[35.89,25.14],[34.5,27.25],[33,28.75],[33,29],[32.5,29.5],[32.5,29.75]]],["lon","tci",[[-1,50],[-4.75,49],[-6.49,47.39],[-15.4,36.87],[-16,36]]],["tci","lag",[[-18,25],[-20,20],[-18,8],[-5,3],[3,5.5]]],["doh","fuj",[[56.5,26.5]]],["fuj","mct",[[58.25,24.25]]],["mct","khi",[[58.75,24]]],["khi","bom",[[66.75,24],[70,20.75]]]]}, {"id":"equi","name":"Equi-yes","price":0.8,"age":"new","blurb":tr('cables.always_agrees_with_you_iberia_to'),"pairs":[["lfw","lag",[[2.1,5.9],[3.3,6.1]]],["lag","cpt",[[4,3],[6,-5],[10,-20],[16,-33]]],["mad","lag",[[0.25,39.5],[0.75,38.75],[-2,36.25],[-6.25,36],[-17.5,24],[-18,14],[-13.75,8.25],[-8.75,4.25],[-2,4.25],[2.75,5.75]]],["lis","lag",[[-12.28,35.71],[-17.75,28.75],[-18,14],[-13.75,8.25],[-8.75,4.25],[-2,4.25],[2.75,5.75]]],["lag","wdh",[[12,-20.5],[14,-22.5]]],["wdh","cpt",[[13.5,-22.7],[15,-30],[17.6,-34.4]]],["lag","jam",[[4,3],[2,-5],[-3,-12]]],["jam","wdh",[[-2,-18],[8,-21.5],[13.5,-22.7]]]]}, {"id":"smw6","name":"SEE-ME-WAVE 6","price":0.95,"age":"new","blurb":tr('cables.sixth_in_a_long_running_series'),"pairs":[["mrs","bom",[[5.25,43.25],[5.25,43],[5.25,42.75],[5.58,42.32],[5.9,41.88],[6.22,41.44],[6.53,41.01],[6.84,40.57],[7.15,40.13],[7.45,39.69],[7.75,39.25],[8.5,38.5],[9.43,38.14],[10.36,37.79],[11.29,37.43],[12.21,37.07],[13.14,36.71],[14.07,36.36],[15,36],[15.58,36.02],[16.17,36.03],[16.75,36.04],[17.33,36.05],[17.92,36.05],[18.5,36.05],[19.08,36.05],[19.67,36.05],[20.25,36.04],[20.83,36.03],[21.42,36.02],[22,36],[23,36],[23.57,36.01],[24.14,36.01],[24.71,36.02],[25.29,36.02],[25.86,36.01],[26.43,36.01],[27,36],[27.44,35.65],[27.87,35.31],[28.3,34.96],[28.72,34.61],[29.14,34.25],[29.56,33.9],[29.98,33.55],[30.39,33.19],[30.8,32.83],[31.2,32.47],[31.6,32.11],[32,31.75],[32.25,31.5],[32.5,31.25],[32.5,30.5],[32.5,29.75],[32.5,29.5],[32.75,29.25],[33,29],[33,28.75],[33.25,28.5],[33.5,28.25],[33.75,28],[34,27.75],[34.25,27.5],[34.5,27.25],[34.78,26.83],[35.06,26.41],[35.34,25.99],[35.62,25.56],[35.89,25.14],[36.17,24.72],[36.44,24.29],[36.71,23.87],[36.98,23.44],[37.24,23.02],[37.51,22.59],[37.77,22.17],[38.03,21.74],[38.29,21.31],[38.55,20.88],[38.8,20.46],[39.06,20.03],[39.31,19.6],[39.56,19.17],[39.82,18.74],[40.06,18.31],[40.31,17.88],[40.56,17.45],[40.81,17.02],[41.05,16.59],[41.3,16.16],[41.54,15.73],[41.78,15.3],[42.02,14.86],[42.26,14.43],[42.5,14],[42.75,13.75],[43,13.5],[43.25,13.25],[43.25,13],[43.25,12.75],[43.5,12.5],[43.75,12.25],[44,12],[44.5,12],[45.25,12.38],[46,12.75],[46.48,12.9],[46.97,13.04],[47.46,13.19],[47.94,13.33],[48.43,13.47],[48.92,13.61],[49.4,13.75],[49.89,13.89],[50.38,14.03],[50.87,14.17],[51.36,14.31],[51.85,14.44],[52.34,14.58],[52.84,14.71],[53.33,14.84],[53.82,14.97],[54.32,15.1],[54.81,15.23],[55.31,15.36],[55.8,15.49],[56.3,15.61],[56.8,15.74],[57.29,15.86],[57.79,15.98],[58.29,16.11],[58.79,16.23],[59.29,16.35],[59.79,16.46],[60.29,16.58],[60.79,16.7],[61.3,16.81],[61.8,16.92],[62.3,17.04],[62.81,17.15],[63.31,17.26],[63.82,17.36],[64.32,17.47],[64.83,17.58],[65.34,17.68],[65.85,17.78],[66.35,17.89],[66.86,17.99],[67.37,18.08],[67.88,18.18],[68.39,18.28],[68.91,18.37],[69.42,18.47],[69.93,18.56],[70.44,18.65],[70.96,18.74],[71.47,18.83],[71.98,18.91],[72.5,19],[72.75,19]]],["bom","sin",[[72.75,19],[72.5,19],[72.25,18.5],[72.38,18.04],[72.5,17.58],[72.63,17.13],[72.75,16.67],[72.88,16.21],[73,15.75],[73.21,15.3],[73.41,14.85],[73.61,14.4],[73.82,13.95],[74.02,13.5],[74.22,13.05],[74.42,12.6],[74.62,12.15],[74.82,11.7],[75.02,11.25],[75.21,10.8],[75.41,10.35],[75.61,9.9],[75.8,9.45],[76,9],[76.5,8.5],[77,8],[78,7],[78.36,6.75],[78.72,6.5],[79.07,6.25],[79.43,6],[79.79,5.75],[80.14,5.5],[80.5,5.25],[81,5.28],[81.5,5.31],[82,5.34],[82.5,5.37],[83,5.4],[83.5,5.43],[84,5.46],[84.5,5.49],[85,5.52],[85.5,5.55],[86,5.58],[86.5,5.6],[87,5.63],[87.5,5.66],[88,5.68],[88.5,5.71],[89,5.73],[89.5,5.76],[90,5.78],[90.5,5.81],[91,5.83],[91.5,5.85],[92,5.87],[92.5,5.9],[93,5.92],[93.5,5.94],[94,5.96],[94.5,5.98],[95,6],[95.83,6],[96.67,6],[97.5,6],[97.83,5.68],[98.15,5.35],[98.48,5.03],[98.8,4.7],[99.13,4.38],[99.45,4.05],[99.78,3.73],[100.1,3.4],[100.43,3.08],[100.75,2.75],[101,2.75],[101.25,2.75],[101.5,2.5],[101.75,2.25],[102,2],[102.25,1.75],[102.5,1.5],[102.75,1.25],[103,1.25],[103.25,1.25],[103.5,1.25],[103.75,1.25]]],["mrs","sin",[[5.25,43.25],[5.25,43],[5.25,42.75],[5.57,42.35],[5.88,41.96],[6.19,41.56],[6.49,41.16],[6.8,40.76],[7.09,40.36],[7.39,39.96],[7.68,39.56],[7.97,39.15],[8.25,38.75],[9,38.25],[9.59,38.06],[10.17,37.87],[10.76,37.68],[11.34,37.48],[11.91,37.28],[12.49,37.08],[13.06,36.88],[13.62,36.67],[14.19,36.46],[14.75,36.25],[15.34,36.15],[15.93,36.04],[16.52,35.93],[17.11,35.82],[17.7,35.71],[18.28,35.59],[18.87,35.47],[19.45,35.35],[20.03,35.23],[20.6,35.1],[21.18,34.97],[21.75,34.83],[22.33,34.7],[22.9,34.56],[23.47,34.42],[24.03,34.28],[24.6,34.13],[25.16,33.98],[25.72,33.83],[26.28,33.67],[26.83,33.52],[27.39,33.36],[27.94,33.2],[28.49,33.03],[29.04,32.87],[29.59,32.7],[30.13,32.53],[30.67,32.35],[31.21,32.18],[31.75,32],[32,31.75],[32.25,31.5],[32.5,31.25],[32.5,30.5],[32.5,29.75],[32.5,29.5],[32.75,29.25],[33,29],[33,28.75],[33.25,28.5],[33.5,28.25],[33.75,28],[34,27.75],[34.25,27.5],[34.5,27.25],[34.78,26.83],[35.06,26.41],[35.34,25.99],[35.62,25.56],[35.89,25.14],[36.17,24.72],[36.44,24.29],[36.71,23.87],[36.98,23.44],[37.24,23.02],[37.51,22.59],[37.77,22.17],[38.03,21.74],[38.29,21.31],[38.55,20.88],[38.8,20.46],[39.06,20.03],[39.31,19.6],[39.56,19.17],[39.82,18.74],[40.06,18.31],[40.31,17.88],[40.56,17.45],[40.81,17.02],[41.05,16.59],[41.3,16.16],[41.54,15.73],[41.78,15.3],[42.02,14.86],[42.26,14.43],[42.5,14],[42.75,13.75],[43,13.5],[43,13.25],[43,13],[44,12],[44.48,12.04],[44.97,12.08],[45.45,12.12],[45.93,12.15],[46.41,12.19],[46.9,12.22],[47.38,12.26],[47.86,12.29],[48.35,12.32],[48.83,12.35],[49.31,12.39],[49.8,12.42],[50.28,12.44],[50.77,12.47],[51.25,12.5],[51.74,12.4],[52.24,12.3],[52.73,12.21],[53.22,12.11],[53.72,12.01],[54.21,11.9],[54.7,11.8],[55.19,11.7],[55.68,11.59],[56.17,11.49],[56.66,11.38],[57.15,11.28],[57.64,11.17],[58.13,11.06],[58.62,10.95],[59.11,10.84],[59.6,10.73],[60.08,10.62],[60.57,10.51],[61.06,10.4],[61.54,10.28],[62.03,10.17],[62.52,10.06],[63,9.94],[63.49,9.82],[63.97,9.71],[64.46,9.59],[64.94,9.47],[65.42,9.35],[65.91,9.23],[66.39,9.11],[66.87,8.99],[67.36,8.87],[67.84,8.75],[68.32,8.62],[68.8,8.5],[69.28,8.38],[69.76,8.25],[70.24,8.13],[70.73,8],[71.21,7.88],[71.68,7.75],[72.16,7.62],[72.64,7.49],[73.12,7.37],[73.6,7.24],[74.08,7.11],[74.56,6.98],[75.04,6.85],[75.51,6.72],[75.99,6.59],[76.47,6.45],[76.94,6.32],[77.42,6.19],[77.9,6.06],[78.37,5.92],[78.85,5.79],[79.32,5.65],[79.8,5.52],[80.28,5.39],[80.75,5.25],[81.24,5.28],[81.73,5.31],[82.22,5.34],[82.71,5.37],[83.2,5.4],[83.7,5.43],[84.19,5.46],[84.68,5.49],[85.17,5.52],[85.66,5.55],[86.15,5.58],[86.64,5.6],[87.13,5.63],[87.62,5.66],[88.12,5.68],[88.61,5.71],[89.1,5.73],[89.59,5.76],[90.08,5.78],[90.57,5.8],[91.07,5.83],[91.56,5.85],[92.05,5.87],[92.54,5.9],[93.03,5.92],[93.52,5.94],[94.02,5.96],[94.51,5.98],[95,6],[95.83,6],[96.67,6],[97.5,6],[97.83,5.68],[98.15,5.35],[98.48,5.03],[98.8,4.7],[99.13,4.38],[99.45,4.05],[99.78,3.73],[100.1,3.4],[100.43,3.08],[100.75,2.75],[101,2.75],[101.25,2.75],[101.5,2.5],[101.75,2.25],[102,2],[102.25,1.75],[102.5,1.5],[102.75,1.25],[103,1.25],[103.25,1.25],[103.5,1.25],[103.75,1.25]]],["mrs","cai",[[5.25,43.25],[5.25,43],[5.25,42.75],[5.58,42.32],[5.9,41.88],[6.22,41.44],[6.53,41.01],[6.84,40.57],[7.15,40.13],[7.45,39.69],[7.75,39.25],[8.75,38.25],[9.74,37.93],[10.73,37.61],[11.71,37.29],[12.7,36.96],[13.69,36.64],[14.68,36.32],[15.67,36],[16.65,35.68],[17.64,35.36],[18.63,35.04],[19.62,34.71],[20.61,34.39],[21.6,34.07],[22.58,33.75],[23.57,33.43],[24.56,33.11],[25.55,32.79],[26.54,32.46],[27.52,32.14],[28.51,31.82],[29.5,31.5],[29.75,31.25],[30.5,30.65]]],["cai","jed",[[32.5,29.75],[33,28.75]]],["jed","jib",[[38.75,21],[43,13],[44,12]]],["jib","khi",[[43.25,11.75],[43.5,11.75],[43.97,11.91],[44.45,12.08],[44.92,12.24],[45.4,12.4],[45.88,12.56],[46.35,12.72],[46.83,12.88],[47.31,13.03],[47.79,13.19],[48.27,13.35],[48.75,13.5],[49.21,13.72],[49.67,13.93],[50.14,14.15],[50.6,14.36],[51.07,14.58],[51.53,14.79],[52,15],[52.43,15.22],[52.85,15.43],[53.28,15.65],[53.71,15.86],[54.14,16.08],[54.57,16.29],[55,16.5],[55.96,17.19],[56.92,17.88],[57.88,18.56],[58.83,19.25],[59.79,19.94],[60.75,20.63],[61.71,21.31],[62.67,22],[63.63,22.69],[64.58,23.38],[65.54,24.06],[66.5,24.75],[66.75,24.75]]],["khi","bom",[[66.75,24],[70,20.75]]],["bom","mle",[[72.75,19],[72.5,19],[72.25,18.5],[72.3,18.01],[72.34,17.52],[72.39,17.03],[72.43,16.53],[72.48,16.04],[72.52,15.55],[72.56,15.06],[72.61,14.57],[72.65,14.08],[72.7,13.59],[72.74,13.1],[72.78,12.6],[72.83,12.11],[72.87,11.62],[72.91,11.13],[72.95,10.64],[73,10.15],[73.04,9.66],[73.08,9.16],[73.12,8.67],[73.17,8.18],[73.21,7.69],[73.25,7.2],[73.29,6.71],[73.33,6.22],[73.38,5.72],[73.42,5.23],[73.46,4.74],[73.5,4.25]]],["mle","cbo",[[76.75,5.56]]],["cbo","maa",[[79,8],[79,9],[80.5,10.5],[80.75,13]]],["maa","dac",[[89.5,21.5]]],["dac","kul",[[91.5,22.75],[91.25,22],[93.75,16.5],[97.75,12.5],[97.75,8.25],[100.5,3.5]]],["kul","sin",[[102.75,1.25]]]]}, diff --git a/tests/bilbao-landing.test.js b/tests/bilbao-landing.test.js index 09d86e9..f08a6e3 100644 --- a/tests/bilbao-landing.test.js +++ b/tests/bilbao-landing.test.js @@ -20,18 +20,17 @@ test('Bilbao is on the map, on land and ready to take a POP; it has no exchange assert.deepEqual(errors, []); }); -test('every transatlantic cable that came ashore on the Biscay coast lands at Bilbao', () => { +test('the transatlantic cables that come ashore on the Biscay coast land at Bilbao', () => { const { ev, errors } = load(); ev("ACT.start({})"); const lands = id => JSON.parse(ev(`JSON.stringify(CABLES.find(c=>c.id==='${id}').pairs.map(p=>p.slice(0,2)))`)); assert.deepEqual(lands('marea'), [['ash', 'bio']]); assert.deepEqual(lands('grace'), [['nyc', 'lon'], ['nyc', 'bio']]); assert.ok(lands('sol').some(p => p.join() === 'pdl,bio')); - assert.ok(lands('col3').some(p => p.join() === 'mia,bio')); - for (const [id, a, b] of [['marea', 'ash', 'bio'], ['grace', 'nyc', 'bio'], ['sol', 'pdl', 'bio'], ['col3', 'mia', 'bio']]) { + for (const [id, a, b] of [['marea', 'ash', 'bio'], ['grace', 'nyc', 'bio'], ['sol', 'pdl', 'bio']]) { assert.equal(ev(`cablesFor('${a}','${b}').map(c=>c.cid).includes('${id}')`), true, `${id} lands at Bilbao`); } - for (const id of ['marea', 'grace', 'sol', 'col3']) { + for (const id of ['marea', 'grace', 'sol']) { assert.equal(ev(`CABLE_PAIRS.some(p=>p.cid==='${id}'&&(p.a==='mad'||p.b==='mad'))`), false, `${id} no longer ends at Madrid`); } assert.deepEqual(errors, []); @@ -64,3 +63,15 @@ test('Marea leaves the American coast at Virginia Beach, not New Jersey, so its assert.ok(pts.every(([lo, la]) => ev(`(()=>{const p=proj(${lo},${la});return !onLand(p[0],p[1])})()`)), 'every waypoint is at sea'); assert.deepEqual(errors, []); }); + +test('Columbus III-and-a-half comes ashore in the south, near Cadiz, not on the Biscay coast', () => { + const { ev, errors } = load(); + ev(start); + const pair = JSON.parse(ev("JSON.stringify(CABLES.find(c=>c.id==='col3').pairs.find(p=>p[0]==='mia'&&p[1]==='mad'))")); + assert.ok(pair, 'Miami to Madrid, as before, so old saves keep their Columbus links'); + const last = pair[2][pair[2].length - 1]; + assert.ok(last[1] < 37 && last[0] > -7 && last[0] < -5.5, `it lands on the Gulf of Cadiz (${last})`); + assert.equal(ev("cablesFor('mia','bio').some(c=>c.cid==='col3')"), false, 'not at Bilbao'); + assert.ok(pair[2].every(([lo, la]) => ev(`(()=>{const p=proj(${lo},${la});return !onLand(p[0],p[1])})()`)), 'every waypoint is at sea'); + assert.deepEqual(errors, []); +}); diff --git a/tests/regions.test.js b/tests/regions.test.js index e76e5c1..962ac81 100644 --- a/tests/regions.test.js +++ b/tests/regions.test.js @@ -795,7 +795,7 @@ test('Atlantic islands and Halifax: real landings, real exchanges only, and isla assert.equal(ev(`NETS.filter(n=>n.type!=='t1'&&n.pops.some(c=>${JSON.stringify(isl)}.includes(c))&&!(n.up||[]).some(u=>NET[u].type==='t1')&&!n.pops.some(c=>!${JSON.stringify(isl)}.includes(c))).map(n=>n.id).join()`), ''); const hop = (path) => ev(`Math.min(...${JSON.stringify(path)}.slice(1).map((c,i)=>Math.max(...cablesFor(${JSON.stringify(path)}[i],c).map(p=>subCarrier(p.km)))))`); const direct = (a, b) => ev(`Math.max(...cablesFor('${a}','${b}').map(p=>subCarrier(p.km)))`); - assert.equal(direct('mia', 'bio'), 1200); + assert.equal(direct('mia', 'mad'), 1200); assert.equal(hop(['mia', 'bda', 'pdl', 'bio']), 1600, 'Florida to Spain via Bermuda and the Azores'); assert.equal(hop(['mia', 'pdl', 'lis']), 1600, 'Florida to Lisbon via the Azores'); assert.equal(direct('atn', 'lis'), 1200); diff --git a/tests/scenarios-playtest.test.js b/tests/scenarios-playtest.test.js index f120d6b..104fb44 100644 --- a/tests/scenarios-playtest.test.js +++ b/tests/scenarios-playtest.test.js @@ -44,7 +44,7 @@ const PLAY = { win: [25, 120], cheese: [...home('hnl'), ...home('lax'), ...home('syd'), ['link', 'lax', 'tok', 1, 'jup'], ['link', 'lax', 'syd', 3, 'hwk'], ['loans']], by: null }, // The win day swings with the seed (34 to 58 over five seeds in 2.5.0), so the floor sits below that spread. atl: { ref: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), HIRE, ['link', 'mia', 'bda', 4, 'sol'], ['link', 'bda', 'pdl', 4, 'sol'], ['pop', 'bio'], ['link', 'pdl', 'bio', 4, 'sol'], ['link', 'bio', 'mad', 4], ['served', 90], ['link', 'lis', 'tci', 4, 'ace'], ['link', 'tci', 'lag', 4, 'twoaf'], ['bb', 'lag']], - win: [30, 120], cheese: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), ['pop', 'bio'], ['link', 'mia', 'bio', 3, 'col3'], ['link', 'lis', 'lag', 3, 'equi'], ['loans']], by: null }, + win: [30, 120], cheese: [['bb', 'pdl'], ['tr', 'pdl', 1], ...home('mia'), ...home('mad'), ...home('lis'), ['link', 'mia', 'mad', 3, 'col3'], ['link', 'lis', 'lag', 3, 'equi'], ['loans']], by: null }, }; test('C1 played: every scenario has a reference strategy and a shortcut that fails', () => {