Merge upstream: Lambda Bazaar, traffic badges, moving customers and faster routing (3.3.0)
Some checks are pending
CI / plan (push) Waiting to run
CI / part (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / translations (push) Waiting to run
CI / test (push) Blocked by required conditions
CI / timings (push) Blocked by required conditions
Container image / gate (push) Waiting to run
Container image / test (push) Blocked by required conditions
Container image / publish (push) Blocked by required conditions
Some checks are pending
CI / plan (push) Waiting to run
CI / part (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / translations (push) Waiting to run
CI / test (push) Blocked by required conditions
CI / timings (push) Blocked by required conditions
Container image / gate (push) Waiting to run
Container image / test (push) Blocked by required conditions
Container image / publish (push) Blocked by required conditions
CHANGELOG.md: upstream's released sections as they are; main's 11 Unreleased bullets kept under Unreleased. scripts/lib/route-fuzz.js: upstream's skip of dashboard tabs the base lacks, plus main's trimming of args the base's buttons lack. src/game/10-catalog/40-ports.js: upstream's one-pass portsAt(); an express still takes ports per channel at its ends. src/game/10-catalog/60-reach-and-subsea.js: upstream's dfLit/dfCap0/dfOn (managed waves carved out); capOf() keeps xp and sat. src/game/60-features/80-new-game.js: upstream's vol and cm in a new game, with main's ip4, rgen, mp and saved-shape fields. src/game/60-features/95-standing-orders.js: upstream's portsAt, cachePlan and promiseCheck, inside main's build-standard routers order, optup marks, opsDarkPre and decom gone list; opsPairs still leaves satellites out. src/game/80-simulation/30-compute.js: upstream's routing core; main's satellite edges (SATN) pass into it, express risks and sat/ip4 money stay. src/game/80-simulation/29-route-core.js: main's satellite latency note moved into the core, where upstream moved the flow loop. src/game/80-simulation/40-billing.js: main's linkCut() and xp/sat in linkDown(), with upstream's dfOn(). src/game/80-simulation/50-sanitize.js: upstream's cmClean listings and cmFix/volFix; main keeps the xp/sat kinds, mpSanitize, ip4Fix and satSanitize. src/game/80-simulation/60-requirements.js: upstream's shared diversity graph; an express link carries the list of trenches it rides. src/game/91-save.js: upstream's saves in the worker, except a multiplayer session network, whose text is made on the page (mpSave) so the server gets the very save the slot holds; bootNotes() kept. src/game/91-slots.js: upstream's slot text and day, with main's mp badge on a slot. src/game/93-ui/70-link-panels.js: a fiber says both its managed waves and the expresses it carries. src/game/94-dashboard/60-dashboard.js: upstream's carried tile, main's themed demand line. src/game/95-modals/70-link-modal.js: main's Express tab, then upstream's hint for a coast no cable lands on (#321). After the merge: - Moving a circuit: a path over an express shares the trenches of the fibers it rides, so it is never called fully diverse from a path along them (test in express-fiber). - The capacity market and moving customers leave the slots expresses hold (test in express-fiber; no code change needed). - The NOC log keeps only the kinds a reload keeps: the market's info/warn news is a plain line, live as after a reload. - New acts classified for server-run play: market and path moves sent, marketOpen and pathOpen local; pathPin's path may be longer than 64 characters. - Server-play fixtures written again (new cm and vol fields); the dark-mode test reads mapStill()'s three states. - A big multiplayer network that moved on still pushes its save to the server (test in multiplayer). - The full suite ran on jsdom 31.0.0 and playwright-core 1.65.0, the versions the merged lockfile pins.
This commit is contained in:
commit
61e31c53d3
105 changed files with 3281 additions and 664 deletions
114
src/i18n/en.js
114
src/i18n/en.js
|
|
@ -227,12 +227,16 @@
|
|||
"badges.run_a_slow_booting_packetoinker":"Run a slow-booting PacketOinker chassis.",
|
||||
"badges.run_two_routers_in_one_pop":"Run two routers in one POP.",
|
||||
"badges.serve_100_tbps":"Serve 100 Tbps.",
|
||||
"badges.serve_10_tbps":"Serve 10 Tbps.",
|
||||
"badges.serve_1_pbps_a_thousand_terabits":"Serve 1 Pbps: a thousand terabits of happy traffic.",
|
||||
"badges.serve_1_tbps":"Serve 1 Tbps.",
|
||||
"badges.serve_99_5_of_demand_every":"Serve 99.5% of demand every single day for a whole year.",
|
||||
"badges.set_up_a_pni_while_the":"Set up a PNI while the conference glow lasts.",
|
||||
"badges.survive_100_incidents_without":"Survive 100 incidents without customer impact.",
|
||||
"badges.take_a_de_kicks_retention_offer":"Take a DE-KICKS retention offer.",
|
||||
"badges.take_out_a_loan":"Take out a loan.",
|
||||
"badges.ten_terabits":"Ten Terabits",
|
||||
"badges.terabit_club":"Terabit Club",
|
||||
"badges.the_long_way_round":"The Long Way Round",
|
||||
"badges.this_game_earns_fiery_badges":"This game runs BGP at 3 a.m.: every badge you earn here is forged in fire, and upgrades one you already have.",
|
||||
"badges.this_game_earns_frosted_badges":"This game runs a Change Freeze: badges you earn here come freeze-dried.",
|
||||
|
|
@ -242,6 +246,14 @@
|
|||
"badges.variant_forged_at_3_a_m":"Forged at 3 a.m.",
|
||||
"badges.variant_freeze_dried":"Freeze-dried",
|
||||
"badges.variant_on_call":"On-call",
|
||||
"badges.vol_100pb":"A Hundred Petabytes",
|
||||
"badges.vol_100pb_d":"Carry 100 PB of traffic in one game.",
|
||||
"badges.vol_eb":"Exabyte Express",
|
||||
"badges.vol_eb_d":"Carry an exabyte of traffic in one game: a million terabytes.",
|
||||
"badges.vol_pb":"Your First Petabyte",
|
||||
"badges.vol_pb_d":"Carry a petabyte of traffic in one game.",
|
||||
"badges.vol_zb":"The Zettabyte Era",
|
||||
"badges.vol_zb_d":"Carry a zettabyte in one game, about what the whole internet moved in a year around 2016.",
|
||||
"badges.weather_a_ddos_with_your_defences":"Weather a DDoS with your defences ready.",
|
||||
"badges.weather_a_multi_terabit_ddos":"Weather a multi-terabit DDoS.",
|
||||
"badges.win_without_ever_taking_a_loan":"Win without ever taking a loan.",
|
||||
|
|
@ -375,8 +387,6 @@
|
|||
"broker.goal_wave":"Sell a wave on your glass",
|
||||
"broker.goal_wave_d":"Carriers rent alien waves on fiber you have lit. Accept one from your deals.",
|
||||
"broker.goal_win_d":"Your own cables land on five continents, and carriers pay you $1M a month for capacity.",
|
||||
"broker.how":"it sells as the market wants; the broker keeps 10%",
|
||||
"broker.lead":"The broker keeps your listing and sells it off over time, as carriers between these two cities want capacity. It keeps 10% of each sale.",
|
||||
"broker.list_all":"List all {n}",
|
||||
"broker.list_more":"List {n} more",
|
||||
"broker.list_n":{"one":"List {n} wave","other":"List {n} waves"},
|
||||
|
|
@ -1790,6 +1800,33 @@
|
|||
"core.vendor_zoo":"Vendor zoo",
|
||||
"core.your_auto_te_predates_backbones":"Your Auto-TE was installed before backbones had a technology, so it runs as it always did. Changing the backbone switches to the new rules.",
|
||||
"core.your_backbone_now_runs_lv":"Your backbone now runs {lv}.",
|
||||
"customer_paths.fiber_label":"{name} · {km} km",
|
||||
"customer_paths.fits_only_g_of_bw":"Fits only {g} of {bw}",
|
||||
"customer_paths.fully_diverse":"Fully diverse",
|
||||
"customer_paths.its_spare_pairs_are_taken":"Its spare pairs are already rented",
|
||||
"customer_paths.let_routing_choose_again":"Let routing choose again",
|
||||
"customer_paths.move":"Move",
|
||||
"customer_paths.move_name":"Move {name}",
|
||||
"customer_paths.move_to_another_path":"Move to another path",
|
||||
"customer_paths.name_follows_routing_again":"<b>{name}</b> follows routing again.",
|
||||
"customer_paths.name_moved_to_fiber":"<b>{name}</b> moved to {fiber}.",
|
||||
"customer_paths.name_now_rides_path":"<b>{name}</b> now rides {path}.",
|
||||
"customer_paths.needs_a_g_channel":"Needs a channel lit at {g} or more",
|
||||
"customer_paths.no_other_path":"There is no other working path between {a} and {b} right now.",
|
||||
"customer_paths.no_other_working_fiber":"There is no other working fiber between {a} and {b}. Build one, and you can move this customer onto it.",
|
||||
"customer_paths.not_enough_free_channels":"Not enough free channels: {free} free, needs {n}",
|
||||
"customer_paths.not_enough_spare_capacity":"Not enough spare capacity: {free} left after your own traffic and the {hold}% you keep back, needs {g}",
|
||||
"customer_paths.not_enough_spare_channels":"Not enough spare channels: {free} left after the {hold}% you keep back for your own traffic, needs {n}",
|
||||
"customer_paths.now_on":"Now on",
|
||||
"customer_paths.only_your_own_fiber_rents_pairs":"Only your own fiber can rent out pairs",
|
||||
"customer_paths.over_the_ms_budget":"Over the {ms} ms budget",
|
||||
"customer_paths.path_facts":"{km} km · {ms} ms",
|
||||
"customer_paths.pinned_to_path":"Pinned to {path}",
|
||||
"customer_paths.routing_chooses_this_circuit":"Routing chooses this circuit's path between {a} and {b} every day. Moving it pins it to the path you pick, for free. While a link on that path is down, it follows routing until the link is back.",
|
||||
"customer_paths.same_trench":"Same trench",
|
||||
"customer_paths.shares_n_spans":{"one":"Shares {n} span","other":"Shares {n} spans"},
|
||||
"customer_paths.that_path_is_down":"That path is down, so it follows routing for now",
|
||||
"customer_paths.this_customer_rides_one_fiber":"This customer rides one fiber between {a} and {b}. Moving it to another one is free and happens at once.",
|
||||
"customers.attacks_on_city_are_hauled_to":"attacks on {city} are hauled to {to} for scrubbing: +{ms} ms",
|
||||
"customers.everyone_who_pays_you_happiest_last":"Everyone who pays you, happiest last. Below 60% they start to grumble, below 30% they are furious, and at 0% they cancel.",
|
||||
"customers.from_unhappy_customers":"from unhappy customers",
|
||||
|
|
@ -1834,6 +1871,8 @@
|
|||
"dashboard.all_n":"All ({n})",
|
||||
"dashboard.amp_huts_and_spares":"Amp huts and spares",
|
||||
"dashboard.caches_pnis_and_ix":"caches, PNIs and IX",
|
||||
"dashboard.carried":"Carried",
|
||||
"dashboard.carried_sub":"in total, this game",
|
||||
"dashboard.chart_total":"Total",
|
||||
"dashboard.customers_are_upset":"customers are upset",
|
||||
"dashboard.delivered_30_days":"Delivered, 30 days",
|
||||
|
|
@ -2901,6 +2940,8 @@
|
|||
"link_modal.no_circuit_crosses_between_north_and":"No circuit crosses between North and South Korea, and no carrier will sell you one. Pyongyang reaches the world through China and Russia.",
|
||||
"link_modal.no_subsea_cable_lands_in_both":"No subsea cable lands in both {a} and {b}. Cables from {a} reach {list}. Hop through one of those.",
|
||||
"link_modal.no_subsea_cable_lands_in_city":"No subsea cable lands in {city}. The nearest landing station is {near}: run fiber there first, then take a cable from it.",
|
||||
"link_modal.no_subsea_cable_lands_in_city_land":"No subsea cable lands in {city} yet. Reach it overland, or lay a subsea cable of your own.",
|
||||
"link_modal.no_subsea_cable_lands_in_city_own":"No subsea cable lands in {city} yet, and no road or fiber reaches it overland. Only a subsea cable of your own can get there.",
|
||||
"link_modal.nobody_sells_capacity_between_kyiv":"Nobody sells capacity between Kyiv and Moscow, and nobody is going to. Route through Warsaw, Bucharest or Helsinki instead.",
|
||||
"link_modal.not_without_a_license":"Not without a license",
|
||||
"link_modal.premium_crossing_60_3_loss":"Premium crossing <small>+60% · ~3% loss</small>",
|
||||
|
|
@ -3191,6 +3232,75 @@
|
|||
"loop.something_in_the_noc_glitched_the":"<b>Something in the NOC glitched.</b><br>The game kept going. If things look odd, export your save and open an issue on GitHub.",
|
||||
"loop.welcome_back_name_your_network_is":"<b>Welcome back, {name}.</b><br>Your network is right where you left it: {date}.",
|
||||
"loop.your_saved_game_could_not_be":"<b>Your saved game could not be loaded.</b><br>It was damaged, so a backup was kept and you can start fresh.",
|
||||
"market.below_floor":"below your floor",
|
||||
"market.cool":"❄️ Cool ×{x}",
|
||||
"market.days_ago":{"one":"{n} day ago","other":"{n} days ago"},
|
||||
"market.fee":"The broker keeps",
|
||||
"market.fee_broker":"a Cable broker's rate",
|
||||
"market.floor":"Never sell below",
|
||||
"market.forecast":"In 30 days {a} · in 90 days {b}",
|
||||
"market.forecast_lock":"A Cable broker also sees where each route is heading.",
|
||||
"market.forecast_now":"{n} now · {a} in 30 days · {b} in 90 days",
|
||||
"market.g_sold_as_managed":"{g} sold as managed waves",
|
||||
"market.hold":"Keep back for your own traffic",
|
||||
"market.hold_d":"The share of every fiber's spectrum and lit capacity the broker never sells, so your own traffic has room to grow.",
|
||||
"market.hot":"🔥 Hot ×{x}",
|
||||
"market.how":"it sells as the market wants; the broker keeps {n}%",
|
||||
"market.lead":"Carriers buy capacity on the routes you hold dark fiber on. What each route wants moves all the time: hot routes pay more and fill faster, a short, straight route sells waves at a premium, and a long one costs more because its fiber does. Choose what the broker sells, from what demand and at what price.",
|
||||
"market.lead_fiber":"The broker keeps your listing and sells it off over time, as carriers between these two cities want capacity. It keeps {n}% of each sale.",
|
||||
"market.legend":"Each bar: what is sold (green) of what the route wants (the line); the pink tick is your minimum.",
|
||||
"market.managed_wave":"Managed wave",
|
||||
"market.min":"List while the route wants at least",
|
||||
"market.n_g_left":{"one":"{n} managed {g} wave left to sell","other":"{n} managed {g} waves left to sell"},
|
||||
"market.n_g_wave_on":{"one":"{n}× {g} managed wave on your {a}–{b} fiber","other":"{n}× {g} managed waves on your {a}–{b} fiber"},
|
||||
"market.needs_optic":"needs a {g} optic on this fiber",
|
||||
"market.news":"Market news",
|
||||
"market.news_ai_big":"An AI cluster wants to talk between {a} and {b}: 400G and bigger waves there are hot.",
|
||||
"market.news_boom":"A streaming hit floods {a}: carriers want more spectrum and 100G waves from there.",
|
||||
"market.news_cut":"Fiber cut between {a} and {b}: carriers want diverse paths around it.",
|
||||
"market.news_dc_big":"A hyperscaler breaks ground near {a}: big waves and dark pairs from there are wanted.",
|
||||
"market.news_exch":"Trading firms move their matching engines to {a}: fast waves from there pay more.",
|
||||
"market.news_glut":"A rival lights new fiber between {a} and {b}: buyers there cool off.",
|
||||
"market.news_merge":"Two carriers merge between {a} and {b}: fewer buyers there.",
|
||||
"market.news_redsea":"Subsea cables are cut: every subsea route is in demand.",
|
||||
"market.no_news":"Quiet so far.",
|
||||
"market.no_room":"no room left: light more capacity",
|
||||
"market.no_routes":"You hold no ready dark fiber yet. Lease or dig some, and its route shows up here.",
|
||||
"market.not_selling":"Not selling",
|
||||
"market.not_yet":"Nobody wants these here yet: {list}.",
|
||||
"market.open":"Lambda Bazaar",
|
||||
"market.p_iru":"Dark pair IRUs",
|
||||
"market.p_iru_d":"A spare pair in a trench you dug: two years of its lease up front, then a little upkeep every month.",
|
||||
"market.p_spec":"Spectrum",
|
||||
"market.p_spec_d":"An alien wave: a channel of your line system, and the buyer brings the optics.",
|
||||
"market.p_w100":"Managed 100G waves",
|
||||
"market.p_w100_d":"Carved out of capacity you lit: they pay more than spectrum, and your own traffic gets that much less.",
|
||||
"market.p_w1600":"Managed 1.6T waves",
|
||||
"market.p_w1600_d":"One wave on a 1.6T optic: the cheapest bit you can sell, and what the biggest buyers want once the years go by.",
|
||||
"market.p_w400":"Managed 400G waves",
|
||||
"market.p_w400_d":"2.7 times the price of a 100G wave for four times the capacity (3.8 times on subsea). AI data centers want them.",
|
||||
"market.p_w800":"Managed 800G waves",
|
||||
"market.p_w800_d":"One wave on an 800G-capable optic. Buyers move to them a few years in, AI data centers first.",
|
||||
"market.price":"{price}/mo · {pct}% of list",
|
||||
"market.price_pair":"{up} up front + {price}/mo · {pct}% of list",
|
||||
"market.route_meta":"{km} km · {ms} ms · fast waves +{n}%",
|
||||
"market.route_off":"Broker leaves it alone",
|
||||
"market.route_on":"Broker trades here",
|
||||
"market.routes":"Your routes",
|
||||
"market.row":"{want} wanted · {sold} sold · {listed} listed",
|
||||
"market.sales":"Capacity you sell",
|
||||
"market.scout":"Routes you could build",
|
||||
"market.scout_d":"Between your POPs, without your fiber yet: what each route wants and where it is heading, the most valuable first.",
|
||||
"market.scout_none":"Build POPs in more cities to see routes between them.",
|
||||
"market.scout_spend":"{km} km · carriers there spend about {v}/mo at today's prices",
|
||||
"market.selling":"Selling",
|
||||
"market.sold_pair":"<b>Your broker sold a dark pair.</b><br>{name} pays {up} up front for {what}, then {price}/mo.",
|
||||
"market.steady":"Steady",
|
||||
"market.tab":"Capacity market",
|
||||
"market.title":"Lambda Bazaar",
|
||||
"market.today":"today",
|
||||
"market.upgraded":"<b>{name} grows.</b><br>Its {n}× {g0} waves on {a}–{b} become {g1}: {price}/mo.",
|
||||
"market.wants_more":"<b>{name} wants to grow</b> from {g0} to {g1} waves on {a}–{b}, but that fiber has no room. Light more capacity, or keep back less.",
|
||||
"meet_a_network.all_n_out_of_reach":{"one":"All {n} out of reach","other":"All {n} out of reach"},
|
||||
"meet_a_network.peer_with_the_tier_1_club":"Peer with the Tier 1 club: their customers come along for free. Only networks in nobody’s customer cone need peering of their own.",
|
||||
"meet_a_network.peer_with_the_tier_1_club_n":{"one":"Peer with the Tier 1 club: their customers come along for free. {n} network already comes along with a peer.","other":"Peer with the Tier 1 club: their customers come along for free. {n} networks already come along with a peer."},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue