Merge upstream: route worker for every routing, intern specialisations, sales renewals, French cities
Some checks are pending
CI / test 1/4 (push) Waiting to run
CI / test 2/4 (push) Waiting to run
CI / test 3/4 (push) Waiting to run
CI / test 4/4 (push) Waiting to run
CI / build (push) Waiting to run
CI / test (push) Blocked by required conditions
CI / translations (push) Waiting to run

# Conflicts:
#	CHANGELOG.md
#	src/game/60-features/39-sales-auto.js
#	src/game/60-features/95-standing-orders.js
#	src/game/85-incidents/40-chaos-monkey.js
#	src/game/88-days/10-day-tick.js
#	tests/gameplay-rules.test.js
#	tests/i18n.test.js
This commit is contained in:
jvanvik 2026-11-07 05:26:28 +01:00
commit 032470f486
54 changed files with 1123 additions and 181 deletions

View file

@ -2275,6 +2275,10 @@
"find.press_slash_to_search_from":"Tip: press <b>/</b> 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 <small>download a file</small>",
"game_and_settings.import_failed_that_save_is_damaged":"<b>Import failed.</b><br>That save is damaged and could not be loaded. Your current game is untouched.",
@ -3397,6 +3401,9 @@
"ops.fire":"Let go",
"ops.fired":"{name} handed in the badge and took the good stapler. Your standing orders are paused.",
"ops.floor":"Keep at least",
"ops.good_annie":"Best at peering: works through the exchanges every day, not weekly, and orders PNIs twice a week.",
"ops.good_kevin":"Best at maintenance: two line system swaps a night instead of one, and never a fat finger.",
"ops.good_tracy":"Best at planning ahead: buys transit, ports, routers and optics as if traffic were already 10% higher.",
"ops.hire_an_intern":"Hire a NOC intern",
"ops.hire_mo":"Hire · {price}/mo",
"ops.hire_pitch_short":"Set the rules once, and an intern clicks the buttons every day.",
@ -4520,8 +4527,22 @@
"sales.locked":"The sales desk opens at customer level {lv}.",
"sales.never":"never",
"sales.one_at_a_time":"One at a time: let them go to hire someone else.",
"sales.p_ren":"Answer haggles",
"sales.p_sign":"Sign deals",
"sales.pitch":"One salesperson brings in deals their own way. Pick who.",
"sales.ren":"Renewal haggles",
"sales.ren_ceo":"{name} answers a customer's haggle three days after it opens, on the golf course: a deeper discount than they asked for in exchange for a contract twice as long, a quick yes, or a fight that ends with the customer gone.",
"sales.ren_ceo_fight":"{name} told {cust} that nobody haggles with him. They have left.",
"sales.ren_ceo_golf":"{name} sorted out {cust} on the golf course: {price}/mo, even less than they asked, locked in until {date}.",
"sales.ren_ceo_yes":"{name} said yes to {cust} before anyone could check: {price}/mo.",
"sales.ren_eng":"{name} answers a customer's haggle three days after it opens. Nerdy customers get an afternoon with the network diagrams and usually renew at the market price; everyone else gets the discount they asked for. Nobody leaves.",
"sales.ren_eng_cave":"{name} gave {cust} the discount they asked for: {price}/mo. They stay.",
"sales.ren_eng_tech":"{name} walked {cust}'s engineers through the network for an afternoon. They renew at {price}/mo, no discount needed.",
"sales.ren_mid":"{name} met {cust} halfway: {price}/mo.",
"sales.ren_shark":"{name} answers a customer's haggle three days after it opens, and gives nothing away: most renew at the old price, often with a fresh promise, and he bills you a month of what he saved. Some walk, nerdy ones most of all.",
"sales.ren_shark_hold":"{name} told {cust} the price is the price. They renew at {price}/mo, and he bills you {fee} for the save.",
"sales.ren_shark_walk":"{name} played hardball with {cust}, and they walked.",
"sales.ren_when":"{name} answers this on {date}, unless you do first.",
"sales.shark_d":"Lands the biggest deals at a quarter more, and takes a month of each deal as commission. Oversells: half of them come with a promise your network does not keep yet, and those customers leave sooner. Ignores the nerds: no technical customers, no meetings, and peering desks want a quarter more traffic from you. Wins most haggles.",
"sales.shark_n":"The shark",
"sales.shark_s":"Chad",