From 2eb22d1df34b93fc9b1471b521a4271ff8e21755 Mon Sep 17 00:00:00 2001 From: Frederic Jung Date: Thu, 29 Oct 2026 11:31:46 +0100 Subject: [PATCH] Title screen: language first, name on top, compact presets, one home-city drawer --- CHANGELOG.md | 1 + site/i18n/de.js | 4 +-- site/i18n/es.js | 4 +-- site/i18n/fr.js | 4 +-- site/i18n/it.js | 4 +-- site/i18n/pt.js | 4 +-- src/game/90-actions/89-game-and-settings.js | 4 +-- src/game/95-modals/40-title.js | 26 +++++++++-------- src/i18n/en.js | 4 +-- src/styles/40-modal.css | 7 ++++- src/styles/60-phone.css | 7 ++--- tests/any-home-city.test.js | 31 +++++++++++---------- tests/regions.test.js | 2 +- 13 files changed, 49 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f7204b..bf31011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ All notable changes to this project are documented here. The project follows - Palau's and the Marshall Islands' main networks now show their real AS numbers instead of ones borrowed from networks elsewhere. - When a new release changes prices so that this week's or a coming week's puzzle no longer adds up, that puzzle gets a fair new budget, and only its stars start again. Weeks that are over keep theirs. - The Networks list shows 100 networks at a time, with a button for the rest, so it opens quickly now that every country has its own networks. +- A tidier start screen: language first, then your network's name, the doors, three compact difficulty buttons with the chosen one explained below, and one drop-down for your home city with the five suggested homes at the top. ## [1.37.0] — 2026-10-28 diff --git a/site/i18n/de.js b/site/i18n/de.js index e9e57f3..3e92480 100644 --- a/site/i18n/de.js +++ b/site/i18n/de.js @@ -3517,14 +3517,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · noch {n} Tage", "supply_chain.your_price_lock_covers_you_until":"Deine Preisgarantie gilt bis {date}.", "title.a_billion_dollars_and_every_toy":"Eine Milliarde Dollar und jedes Spielzeug im Laden.", -"title.anywhere_else":"Irgendwo anders", "title.asia_hub_great_peering_far_from":"Asien-Drehkreuz. Tolles Peering, weit weg von zu Hause.", "title.back_to_my_network":"Zurück zu meinem Netz", "title.big_hungry_market_few_providers":"Großer, hungriger Markt, wenige Anbieter.", "title.build_an_internet_lay_fiber_between":"Baue deinen eigenen ISP auf. Verlege Glasfaser zwischen Städten, kauf Transit, peere an Exchanges, gewinne Geschäftskunden und halte deine Privatkunden bei Laune, während Bagger, Haie und Route Leaks alles tun, um dich aufzuhalten.", "title.chaos_in_your_sandbox":"Chaos in deinem Sandkasten", "title.chat_on_signal":"Chat auf Signal", -"title.choose":"Auswählen …", "title.continue_name_date":"{name} fortsetzen · {date}", "title.cookieless_stats_no_tracking":"Statistik ohne Cookies, kein Tracking", "title.crossroads_of_europe_de_kicks_ix":"Drehkreuz Europas. DE-KICKS IX, günstiger Transit.", @@ -3532,7 +3530,6 @@ "title.hard_mode_pricey_everything":"Schwerer Modus. Alles teuer, und die Tierwelt will dich tot sehen.", "title.how_much_trouble":"Wie viel Ärger darf’s sein?", "title.huge_eyeball_market_pricey":"Riesiger Privatkundenmarkt. Teure Nachbarn.", -"title.n_more_cities_with_transit":{"one":"{n} weitere Stadt mit Transit zum Kaufen","other":"{n} weitere Städte mit Transit zum Kaufen"}, "title.name_your_network":"Gib deinem Netz einen Namen", "title.new_in_series_of_tubes_v":"Neu in Series of Tubes {v}", "title.one_network_one_knot_no_clock":"Ein Netz, ein Knoten zum Entwirren. Keine Uhr.", @@ -3543,6 +3540,7 @@ "title.rules_are_picked_once_and_locked":"Die Regeln wählst du einmal, danach sind sie für dieses Netz festgelegt. Kein Nachverhandeln mitten im Spiel.", "title.scenarios_amp_weekly":"Szenarien & Woche", "title.source_on_github":"Quellcode auf GitHub", +"title.suggested":"Empfohlen", "title.the_real_game_climb_from_tier":"Das echte Spiel: von Tier 3 hoch zu Tier 1.", "title.your_network_name_was_saved_and":"Dein Netz {name} wurde gespeichert und wartet auf dich.", "traceroute.a_peer_s_customers_come_after":"die Kunden eines Peers kommen nach direkten Peers und vor Transit", diff --git a/site/i18n/es.js b/site/i18n/es.js index 8fa80cc..fa2aec2 100644 --- a/site/i18n/es.js +++ b/site/i18n/es.js @@ -3515,14 +3515,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · quedan {n} días", "supply_chain.your_price_lock_covers_you_until":"Tu precio fijo te cubre hasta {date}.", "title.a_billion_dollars_and_every_toy":"Mil millones de dólares y todos los juguetes de la tienda.", -"title.anywhere_else":"En otro lugar", "title.asia_hub_great_peering_far_from":"Hub de Asia. Gran peering, lejos de casa.", "title.back_to_my_network":"Volver a mi red", "title.big_hungry_market_few_providers":"Mercado enorme y hambriento, pocos proveedores.", "title.build_an_internet_lay_fiber_between":"Construye un internet. Tiende fibra entre ciudades, compra tránsito, haz peering en intercambios, firma con empresas y mantén contentos a los eyeballs mientras retroexcavadoras, tiburones y fugas de rutas hacen lo posible por detenerte.", "title.chaos_in_your_sandbox":"Caos en tu sandbox", "title.chat_on_signal":"Chatea en Signal", -"title.choose":"Elegir…", "title.continue_name_date":"Continuar {name} · {date}", "title.cookieless_stats_no_tracking":"Estadísticas sin cookies, sin rastreo", "title.crossroads_of_europe_de_kicks_ix":"La encrucijada de Europa. DE-KICKS IX, tránsito barato.", @@ -3530,7 +3528,6 @@ "title.hard_mode_pricey_everything":"Modo difícil. Todo carísimo, y la fauna te quiere muerto.", "title.how_much_trouble":"¿Cuántos problemas quieres?", "title.huge_eyeball_market_pricey":"Mercado enorme de eyeballs. Vecinos caros.", -"title.n_more_cities_with_transit":{"one":"{n} ciudad más con tránsito a la venta","other":"{n} ciudades más con tránsito a la venta"}, "title.name_your_network":"Ponle nombre a tu red", "title.new_in_series_of_tubes_v":"Novedades de Series of Tubes {v}", "title.one_network_one_knot_no_clock":"Una red, un nudo que deshacer. Sin reloj.", @@ -3541,6 +3538,7 @@ "title.rules_are_picked_once_and_locked":"Las reglas se eligen una vez y quedan fijadas para esta red. Nada de cambiar el trato a mitad de partida.", "title.scenarios_amp_weekly":"Escenarios y semanal", "title.source_on_github":"Código en GitHub", +"title.suggested":"Sugeridas", "title.the_real_game_climb_from_tier":"El juego de verdad: sube de Tier 3 a Tier 1.", "title.your_network_name_was_saved_and":"Tu red {name} se guardó y te está esperando.", "traceroute.a_peer_s_customers_come_after":"los clientes de un peer van después de los peers directos y antes del tránsito", diff --git a/site/i18n/fr.js b/site/i18n/fr.js index f10dcd5..030f85f 100644 --- a/site/i18n/fr.js +++ b/site/i18n/fr.js @@ -3515,14 +3515,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · encore {n} jours", "supply_chain.your_price_lock_covers_you_until":"Votre blocage des prix vous couvre jusqu’au {date}.", "title.a_billion_dollars_and_every_toy":"Un milliard de dollars et tous les jouets du magasin.", -"title.anywhere_else":"Ailleurs", "title.asia_hub_great_peering_far_from":"Hub de l’Asie. Super peering, loin de chez soi.", "title.back_to_my_network":"Retour à mon réseau", "title.big_hungry_market_few_providers":"Gros marché affamé, peu d’opérateurs.", "title.build_an_internet_lay_fiber_between":"Construis un Internet. Pose de la fibre entre les villes, achète du transit, fais du peering aux IX, signe des entreprises et garde les eyeballs contents pendant que pelleteuses, requins et fuites de routes font tout pour t’arrêter.", "title.chaos_in_your_sandbox":"Du chaos dans ton bac à sable", "title.chat_on_signal":"Discuter sur Signal", -"title.choose":"Choisir…", "title.continue_name_date":"Continuer {name} · {date}", "title.cookieless_stats_no_tracking":"Stats sans cookies, sans pistage", "title.crossroads_of_europe_de_kicks_ix":"Carrefour de l’Europe. IX DE-KICKS, transit pas cher.", @@ -3530,7 +3528,6 @@ "title.hard_mode_pricey_everything":"Mode difficile. Tout coûte cher, et la faune veut ta peau.", "title.how_much_trouble":"Combien d’ennuis ?", "title.huge_eyeball_market_pricey":"Énorme marché d’eyeballs. Voisins chers.", -"title.n_more_cities_with_transit":{"one":"{n} autre ville où acheter du transit","other":"{n} autres villes où acheter du transit"}, "title.name_your_network":"Nomme ton réseau", "title.new_in_series_of_tubes_v":"Nouveautés de Series of Tubes {v}", "title.one_network_one_knot_no_clock":"Un réseau, un nœud à défaire. Pas d’horloge.", @@ -3541,6 +3538,7 @@ "title.rules_are_picked_once_and_locked":"Les règles se choisissent une fois et restent verrouillées pour ce réseau. Pas de renégociation en pleine partie.", "title.scenarios_amp_weekly":"Scénarios & hebdo", "title.source_on_github":"Code source sur GitHub", +"title.suggested":"Suggérées", "title.the_real_game_climb_from_tier":"Le vrai jeu : grimpe de Tier 3 à Tier 1.", "title.your_network_name_was_saved_and":"Ton réseau {name} a été sauvegardé et t’attend.", "traceroute.a_peer_s_customers_come_after":"les clients d’un peer passent après les peers directs, avant le transit", diff --git a/site/i18n/it.js b/site/i18n/it.js index 3f3f7d3..09c5feb 100644 --- a/site/i18n/it.js +++ b/site/i18n/it.js @@ -3515,14 +3515,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · {n} giorni rimasti", "supply_chain.your_price_lock_covers_you_until":"Il tuo blocco dei prezzi ti copre fino al {date}.", "title.a_billion_dollars_and_every_toy":"Un miliardo di dollari e tutti i giocattoli del negozio.", -"title.anywhere_else":"Altrove", "title.asia_hub_great_peering_far_from":"Hub dell’Asia. Ottimo peering, lontano da casa.", "title.back_to_my_network":"Torna alla mia rete", "title.big_hungry_market_few_providers":"Mercato grande e affamato, pochi provider.", "title.build_an_internet_lay_fiber_between":"Costruisci un internet. Posa fibra tra le città, compra transit, fai peering agli exchange, metti sotto contratto le aziende e tieni contenti gli eyeball, mentre ruspe, squali e route leak fanno di tutto per fermarti.", "title.chaos_in_your_sandbox":"Caos nella tua sandbox", "title.chat_on_signal":"Chat su Signal", -"title.choose":"Scegli…", "title.continue_name_date":"Continua {name} · {date}", "title.cookieless_stats_no_tracking":"Statistiche senza cookie, nessun tracciamento", "title.crossroads_of_europe_de_kicks_ix":"Crocevia d’Europa. IX DE-KICKS, transit economico.", @@ -3530,7 +3528,6 @@ "title.hard_mode_pricey_everything":"Modalità difficile. Tutto carissimo, e la fauna ti vuole morto.", "title.how_much_trouble":"Quanti guai vuoi?", "title.huge_eyeball_market_pricey":"Enorme mercato di eyeball. Vicini costosi.", -"title.n_more_cities_with_transit":{"one":"Ancora {n} città dove comprare transit","other":"Altre {n} città dove comprare transit"}, "title.name_your_network":"Dai un nome alla tua rete", "title.new_in_series_of_tubes_v":"Novità di Series of Tubes {v}", "title.one_network_one_knot_no_clock":"Una rete, un nodo da sciogliere. Niente orologio.", @@ -3541,6 +3538,7 @@ "title.rules_are_picked_once_and_locked":"Le regole si scelgono una volta e restano bloccate per questa rete. Niente cambi di accordo a metà partita.", "title.scenarios_amp_weekly":"Scenari e sfida settimanale", "title.source_on_github":"Codice su GitHub", +"title.suggested":"Consigliate", "title.the_real_game_climb_from_tier":"Il gioco vero: sali da Tier 3 a Tier 1.", "title.your_network_name_was_saved_and":"La tua rete {name} è stata salvata e ti sta aspettando.", "traceroute.a_peer_s_customers_come_after":"i clienti di un peer vengono dopo i peer diretti e prima del transit", diff --git a/site/i18n/pt.js b/site/i18n/pt.js index 634078f..32d8965 100644 --- a/site/i18n/pt.js +++ b/site/i18n/pt.js @@ -3515,14 +3515,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · faltam {n} dias", "supply_chain.your_price_lock_covers_you_until":"Seu congelamento de preços te cobre até {date}.", "title.a_billion_dollars_and_every_toy":"Um bilhão de dólares e todos os brinquedos da loja.", -"title.anywhere_else":"Outro lugar", "title.asia_hub_great_peering_far_from":"Hub da Ásia. Ótimo peering, longe de casa.", "title.back_to_my_network":"Voltar para minha rede", "title.big_hungry_market_few_providers":"Mercado grande e faminto, poucos provedores.", "title.build_an_internet_lay_fiber_between":"Construa uma internet. Lance fibra entre cidades, compre transit, faça peering nos exchanges, feche contratos com empresas e mantenha os eyeballs felizes enquanto retroescavadeiras, tubarões e route leaks fazem de tudo para te parar.", "title.chaos_in_your_sandbox":"Caos na sua sandbox", "title.chat_on_signal":"Chat no Signal", -"title.choose":"Escolha…", "title.continue_name_date":"Continuar {name} · {date}", "title.cookieless_stats_no_tracking":"Estatísticas sem cookies, sem rastreamento", "title.crossroads_of_europe_de_kicks_ix":"Encruzilhada da Europa. IX DE-KICKS, transit barato.", @@ -3530,7 +3528,6 @@ "title.hard_mode_pricey_everything":"Modo difícil. Tudo caro, e a fauna quer te ver morto.", "title.how_much_trouble":"Quanta encrenca?", "title.huge_eyeball_market_pricey":"Mercado enorme de eyeballs. Vizinhos caros.", -"title.n_more_cities_with_transit":{"one":"Mais {n} cidade com transit à venda","other":"Mais {n} cidades com transit à venda"}, "title.name_your_network":"Dê um nome à sua rede", "title.new_in_series_of_tubes_v":"Novidades no Series of Tubes {v}", "title.one_network_one_knot_no_clock":"Uma rede, um nó para desatar. Sem relógio.", @@ -3541,6 +3538,7 @@ "title.rules_are_picked_once_and_locked":"As regras são escolhidas uma vez e ficam travadas para esta rede. Nada de mudar o combinado no meio do jogo.", "title.scenarios_amp_weekly":"Cenários e semanal", "title.source_on_github":"Código no GitHub", +"title.suggested":"Sugeridas", "title.the_real_game_climb_from_tier":"O jogo de verdade: suba de Tier 3 a Tier 1.", "title.your_network_name_was_saved_and":"Sua rede {name} foi salva e está te esperando.", "traceroute.a_peer_s_customers_come_after":"os clientes de um peer vêm depois dos peers diretos e antes do transit", diff --git a/src/game/90-actions/89-game-and-settings.js b/src/game/90-actions/89-game-and-settings.js index 2cf2360..d81413e 100644 --- a/src/game/90-actions/89-game-and-settings.js +++ b/src/game/90-actions/89-game-and-settings.js @@ -4,14 +4,14 @@ Object.assign(ACT,{ beginGame(nm,homeOk(UI.startCity)?UI.startCity:'fra',sb?{mode:'sandbox',rules:{chaos:own(CHAOS,UI.sbChaos)?UI.sbChaos:'none'}}:{mode:'normal',preset:NORMAL_PRESETS.includes(UI.preset)?UI.preset:'oncall'});}, // Title-screen doors and their options toggle in place, so the name being typed and the city stay as they are. modeSet:({m})=>{if(m!=='sandbox'&&m!=='normal')return;UI.mode=m;document.querySelectorAll('.door').forEach(b=>b.classList.toggle('on',b.dataset.door===m));const n=$('doorNormal'),x=$('doorSandbox');if(n)n.hidden=m!=='normal';if(x)x.hidden=m!=='sandbox';}, - presetSet:({p})=>{if(!NORMAL_PRESETS.includes(p))return;UI.preset=p;ACT.modeSet({m:'normal'});document.querySelectorAll('.preset').forEach(b=>b.classList.toggle('on',b.dataset.preset===p));}, + presetSet:({p})=>{if(!NORMAL_PRESETS.includes(p))return;UI.preset=p;ACT.modeSet({m:'normal'});document.querySelectorAll('.preset').forEach(b=>{b.classList.toggle('on',b.dataset.preset===p);b.setAttribute('aria-pressed',b.dataset.preset===p);});const w=$('presetWhat');if(w)w.innerHTML=presetWhat(p);}, chaosSet:({c})=>{if(!own(CHAOS,c))return;UI.sbChaos=c;ACT.modeSet({m:'sandbox'});document.querySelectorAll('.chs').forEach(b=>b.classList.toggle('on',b.dataset.chaos===c));}, // Puzzles live in their own module; until it ships, the door says so. puzzleDoor:()=>{UI.nm=(($('nmIn')&&$('nmIn').value)||UI.nm||randomNetworkName()).slice(0,24);if(typeof ACT.puzzleMenu==='function')ACT.puzzleMenu();else toast(tr('title.puzzles_are_coming_soon'),'goal');}, scenarios:()=>{UI.nm=(($('nmIn')&&$('nmIn').value)||UI.nm||(S&&S.name)||randomNetworkName()).slice(0,24);scenarioModal();}, startScn:({id})=>{const sc=SCN.find(x=>x.id===id);if(!sc)return;beginGame(UI.nm||(S&&S.name)||randomNetworkName(),sc.city,{scn:sc});}, startWeekly:()=>{const wk=weekly();beginGame(UI.nm||(S&&S.name)||randomNetworkName(),wk.city,{scn:wk,seed:wk.seed});}, - pickStart:({city})=>{if(!homeOk(city))return;UI.startCity=city;document.querySelectorAll('.start').forEach(b=>b.classList.toggle('on',b.dataset.city===city||(b.classList.contains('own')&&!START5.includes(city))));const s=$('homeSel');if(s&&START5.includes(city))s.value='';const w=$('homeWhat');if(w)w.innerHTML=homeWhat();}, + pickStart:({city})=>{if(!homeOk(city))return;UI.startCity=city;const s=$('homeSel');if(s)s.value=city;const w=$('homeWhat');if(w)w.innerHTML=homeWhat();}, pickHome:({v})=>{if(v)ACT.pickStart({city:v});else ACT.pickStart({city:'fra'});}, // Delete this window's network and go back to the title (the other networks stay). newgame:()=>{if(pzOn())pzLeave();const id=UI.slot;if(id){slotDrop(id);slotFree(id);}gameClear();showTitle();}, diff --git a/src/game/95-modals/40-title.js b/src/game/95-modals/40-title.js index ec9a0f9..ef1dc02 100644 --- a/src/game/95-modals/40-title.js +++ b/src/game/95-modals/40-title.js @@ -2,24 +2,24 @@ // a license first) can't be a home, and neither can a city where nobody sells transit: you'd start cut off. const homeOk=c=>own(CITY,c)&&!CITY[c].off&&!CITY[c].cn&&NETS.some(n=>sellsAt(n,c)); const START5=['fra','nyc','sin','sao','syd']; -function homePick(){const cs=Object.keys(CITY).filter(homeOk),cur=START5.includes(UI.startCity)?'':UI.startCity; - return ``;} -// A dropdown can't wrap, so long names (Yuzhno-Sakhalinsk) get cut on phones: the line above it says the whole name. -const homeWhat=()=>START5.includes(UI.startCity)?trn('title.n_more_cities_with_transit',Object.keys(CITY).filter(c=>homeOk(c)&&!START5.includes(c)).length):`${esc(CITY[UI.startCity].name)} · ${esc(REG[CITY[UI.startCity].reg])}`; +// One drawer for the home city: the five suggested homes first, then every city with transit by continent. +const START_D=()=>({fra:tr('title.crossroads_of_europe_de_kicks_ix'),nyc:tr('title.huge_eyeball_market_pricey'),sin:tr('title.asia_hub_great_peering_far_from'),sao:tr('title.big_hungry_market_few_providers'),syd:tr('title.hard_mode_pricey_everything')}); +function homePick(){const cs=Object.keys(CITY).filter(c=>homeOk(c)&&!START5.includes(c)),cur=UI.startCity,opt=c=>``; + return ``;} +// The line under the drawer: what the suggested home is like, or which continent another city is on. +const homeWhat=()=>START5.includes(UI.startCity)?esc(START_D()[UI.startCity]):`${esc(CITY[UI.startCity].name)} · ${esc(REG[CITY[UI.startCity].reg])}`; function showTitle(){ const list=slotIdx(true),top=slotTop(list),many=list.length>1||(list.length===1&&list[0]!==top); if(UI.nm==null)UI.nm=randomNetworkName(); - const starts=[['fra',tr('title.crossroads_of_europe_de_kicks_ix')],['nyc',tr('title.huge_eyeball_market_pricey')],['sin',tr('title.asia_hub_great_peering_far_from')],['sao',tr('title.big_hungry_market_few_providers')],['syd',tr('title.hard_mode_pricey_everything')]]; - openModal(`
+ openModal(`
${langPick('langTitle')}

Series
of Tubes

-

${tr('title.build_an_internet_lay_fiber_between')}

${plugHtml(false)}${isPhone()?installRow():''} +

${tr('title.build_an_internet_lay_fiber_between')}

${isPhone()?installRow():''} ${top?`
${btn(tr('title.continue_name_date',{name:esc(top.name||tr('common.unnamed_network')),date:dateStr(top.day)}),'cont',{id:top.id},'pink big')}
`:''} ${many?slotsHtml():''} - ${doorsHtml()}
${btn(tr('common.another_one'),'randomName',{},'ghost sm')}
-
${starts.map(([c,d])=>``).join('')}
- ${langPick('langTitle')} + ${doorsHtml()} + ${homePick()}

${homeWhat()}

${btn(list.length?tr('common.start_a_new_network'):tr('common.start_building'),'start',{},'big')}${btn(tr('common.how_to_play'),'help',{},'ghost')}${btn(tr('common.import_a_save'),'importPick',{},'ghost')}${btn(tr('common.settings'),'settings',{},'ghost')}

v${APP_VERSION} · ${tr('title.source_on_github')} · ${tr('title.chat_on_signal')} · ${tr('title.cookieless_stats_no_tracking')}

`); $('nmIn').addEventListener('input',e=>{UI.nm=e.target.value;}); } @@ -37,8 +37,10 @@ function whatsNew(returning,force){ screen (presets / chaos below), Puzzles and Scenarios open their own lists. Choices toggle in place (no re-render). */ const DOORS=[['puzzle','🧩',tr('title.puzzles'),tr('title.one_network_one_knot_no_clock')],['sandbox','🏖️',tr('common.sandbox'),tr('title.a_billion_dollars_and_every_toy')],['normal','📟',tr('common.normal'),tr('title.the_real_game_climb_from_tier')],['scn','🏆',tr('title.scenarios_amp_weekly'),tr('title.hand_built_crises_and_one_world')]]; const doorAct={puzzle:'puzzleDoor',sandbox:'modeSet',normal:'modeSet',scn:'scenarios'}; +// The chosen preset in one line: its joke, then what actually changes. +const presetWhat=k=>`${esc(PRESETS[k].d)} ${esc(PRESETS[k].x)}`; function doorsHtml(){const m=UI.mode==='sandbox'?'sandbox':'normal',pr=own(PRESETS,UI.preset)&&NORMAL_PRESETS.includes(UI.preset)?UI.preset:'oncall',ch=own(CHAOS,UI.sbChaos)?UI.sbChaos:'none'; return `
${DOORS.map(([k,i,n,d])=>``).join('')}
-
${NORMAL_PRESETS.map(k=>{const P=PRESETS[k];return ``;}).join('')}
+
${NORMAL_PRESETS.map(k=>{const P=PRESETS[k];return ``;}).join('')}

${presetWhat(pr)}

${Object.entries(CHAOS).map(([k,C])=>``).join('')}

🔒 ${tr('title.rules_are_picked_once_and_locked')}

`;} diff --git a/src/i18n/en.js b/src/i18n/en.js index ba42357..eec9b80 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -3516,14 +3516,12 @@ "supply_chain.what_p_n_days_left":"{what} +{p} · {n} days left", "supply_chain.your_price_lock_covers_you_until":"Your price lock covers you until {date}.", "title.a_billion_dollars_and_every_toy":"A billion dollars and every toy in the shop.", -"title.anywhere_else":"Anywhere else", "title.asia_hub_great_peering_far_from":"Asia hub. Great peering, far from home.", "title.back_to_my_network":"Back to my network", "title.big_hungry_market_few_providers":"Big hungry market, few providers.", "title.build_an_internet_lay_fiber_between":"Build an internet. Lay fiber between cities, buy transit, peer at exchanges, sign up businesses, and keep the eyeballs happy while backhoes, sharks and route leaks do their best to stop you.", "title.chaos_in_your_sandbox":"Chaos in your sandbox", "title.chat_on_signal":"Chat on Signal", -"title.choose":"Choose…", "title.continue_name_date":"Continue {name} · {date}", "title.cookieless_stats_no_tracking":"Cookieless stats, no tracking", "title.crossroads_of_europe_de_kicks_ix":"Crossroads of Europe. DE-KICKS IX, cheap transit.", @@ -3531,7 +3529,6 @@ "title.hard_mode_pricey_everything":"Hard mode. Pricey everything, and the wildlife wants you dead.", "title.how_much_trouble":"How much trouble?", "title.huge_eyeball_market_pricey":"Huge eyeball market. Pricey neighbours.", -"title.n_more_cities_with_transit":{"one":"{n} more city with transit to buy","other":"{n} more cities with transit to buy"}, "title.name_your_network":"Name your network", "title.new_in_series_of_tubes_v":"New in Series of Tubes {v}", "title.one_network_one_knot_no_clock":"One network, one knot to untie. No clock.", @@ -3542,6 +3539,7 @@ "title.rules_are_picked_once_and_locked":"The rules are picked once and locked for this network. No changing the deal mid-game.", "title.scenarios_amp_weekly":"Scenarios & weekly", "title.source_on_github":"Source on GitHub", +"title.suggested":"Suggested", "title.the_real_game_climb_from_tier":"The real game: climb from Tier 3 to Tier 1.", "title.your_network_name_was_saved_and":"Your network {name} was saved and is waiting for you.", "traceroute.a_peer_s_customers_come_after":"a peer’s customers come after direct peers, before transit", diff --git a/src/styles/40-modal.css b/src/styles/40-modal.css index 9853087..01c2101 100644 --- a/src/styles/40-modal.css +++ b/src/styles/40-modal.css @@ -107,7 +107,7 @@ label.f+select.pick{width:100%} .title-art h1 span{color:var(--me)} .tagline{color:var(--ink2);font-size:14.5px;line-height:1.45;margin:10px 0 14px} label.f{display:block;font-weight:900;font-size:12px;letter-spacing:.06em;text-transform:uppercase;color:var(--ink2);margin:12px 0 5px} -input.t{width:100%;box-sizing:border-box;border:3px solid var(--ink);border-radius:12px;padding:8px 12px;font-family:var(--display);font-weight:800;font-size:18px;background:var(--soft)} +input.t{width:100%;box-sizing:border-box;border:3px solid var(--ink);border-radius:12px;padding:8px 12px;font-family:var(--display);font-weight:800;font-size:18px;background:var(--soft);color:var(--ink);-webkit-text-fill-color:var(--ink)} .network-name{display:flex;flex-wrap:wrap;align-items:center;gap:8px} .network-name input.t{flex:1 1 240px;width:auto;min-width:0} .metric-in{display:flex;gap:6px;align-items:center;margin-top:6px}.metric-in input.t{flex:1 1 120px;width:auto;min-width:0;font-size:16px;padding:4px 10px} @@ -177,3 +177,8 @@ input.t{width:100%;box-sizing:border-box;border:3px solid var(--ink);border-radi .slot-go:focus-visible,.slot-more:focus-visible{outline:3px solid #FF4F9A;outline-offset:-3px} .ibx.space{display:flex;align-items:center;gap:8px;flex-wrap:wrap}.ibx.space .btns{margin:0} h2 .rn{font-size:18px;vertical-align:middle;padding:2px 4px} +/* Title: language first, compact presets, one drawer for the home city (2.0) */ +.tlang{display:flex;justify-content:flex-end;margin:-4px 0 4px}.tlang .pick{width:auto;max-width:60%} +.presets .preset{flex-direction:row;align-items:center;gap:6px;padding:6px 10px 5px}.presets .preset i{font-size:20px}.presets .preset b{font-size:15px} +.presets .preset.on::after{display:none}#presetWhat{margin:6px 0 0} +.homepick{width:100%} diff --git a/src/styles/60-phone.css b/src/styles/60-phone.css index ae2a0b8..6bccadf 100644 --- a/src/styles/60-phone.css +++ b/src/styles/60-phone.css @@ -60,10 +60,9 @@ button,.chip,.b,a{touch-action:manipulation;-webkit-tap-highlight-color:transpar .tagline{font-size:13.5px;margin:8px 0 10px} .slots{max-height:38vh}.slot-go{padding:7px 4px 7px 9px;gap:8px}.slot-go>i{font-size:22px}.slot .sn b{font-size:16px}.slot .sm em{font-size:13.5px}.slot .sn small,.slot .sm small{font-size:11.5px} .door{padding:7px 9px 6px}.door i{font-size:22px}.door b{font-size:16px}.door span{font-size:11.5px} - .presets{grid-template-columns:1fr;gap:6px} - .preset{display:grid;grid-template-columns:auto 1fr;column-gap:9px;align-items:center;padding:6px 10px} - .preset i{grid-row:1/4;font-size:24px}.preset b{font-size:16px}.preset span,.preset small{grid-column:2} - .preset small{border-top:0;padding-top:0;margin-top:1px} + .presets{grid-template-columns:repeat(3,minmax(0,1fr));gap:6px} + .presets .preset{flex-direction:column;align-items:center;text-align:center;padding:6px 4px;gap:0} + .presets .preset i{font-size:20px}.presets .preset b{font-size:13.5px} .chaos{grid-template-columns:repeat(2,minmax(0,1fr))} #modal .card{box-sizing:border-box;width:100%;max-height:calc(100% - env(safe-area-inset-top,0px) - 24px);border-radius:22px 22px 0 0;padding:16px 16px calc(16px + env(safe-area-inset-bottom,0px));border-bottom:0} #dash{padding:calc(env(safe-area-inset-top,0px) + 6px) 0 0} diff --git a/tests/any-home-city.test.js b/tests/any-home-city.test.js index 9044b9c..0330cb7 100644 --- a/tests/any-home-city.test.js +++ b/tests/any-home-city.test.js @@ -3,31 +3,29 @@ const assert = require('node:assert/strict'); const { load } = require('./harness'); const choose = (ev, v) => ev(`(()=>{const s=document.getElementById('homeSel');s.value=${JSON.stringify(v)};s.dispatchEvent(new Event('change',{bubbles:true}));})()`); -const onTiles = ev => JSON.parse(ev("JSON.stringify([...document.querySelectorAll('.starts .start.on')].map(b=>b.dataset.city||'own'))")); - -test('the title screen offers five homes and a sixth tile for any city, grouped by continent', () => { +test('the title screen has one drawer for the home city: the five suggested first, then every city by continent', () => { const { ev, errors } = load(); assert.equal(ev('S'), null, 'before any game exists'); - assert.equal(ev("document.querySelectorAll('.starts .start').length"), 6); - const opts = JSON.parse(ev("JSON.stringify([...document.querySelectorAll('#homeSel option')].map(o=>o.value).filter(Boolean))")); + const opts = JSON.parse(ev("JSON.stringify([...document.querySelectorAll('#homeSel option')].map(o=>o.value))")); + assert.deepEqual(opts.slice(0, 5), ['fra', 'nyc', 'sin', 'sao', 'syd'], 'the suggested homes come first'); + assert.equal(new Set(opts).size, opts.length, 'no city twice'); assert.ok(opts.length > 150, `lots of cities (${opts.length})`); assert.ok(opts.every(c => ev(`homeOk('${c}')`)), 'only cities that work as a home'); assert.ok(!opts.some(c => ev(`!!CITY['${c}'].cn||!!CITY['${c}'].off`)), 'no hidden or Chinese cities'); assert.ok(!opts.includes('stg'), 'no city without transit to buy'); - assert.ok(ev("document.querySelectorAll('#homeSel optgroup').length") >= 5, 'grouped by continent'); + assert.ok(ev("document.querySelectorAll('#homeSel optgroup').length") >= 6, 'suggested plus continents'); + assert.equal(ev("document.getElementById('homeSel').value"), 'fra'); + assert.equal(ev("document.querySelectorAll('.starts .start').length"), 0, 'no tiles any more'); assert.deepEqual(errors, []); }); -test('picking any city starts the network there, and the tiles follow the choice', () => { +test('picking any city starts the network there, and the line under the drawer follows the choice', () => { const { ev, errors } = load(); choose(ev, 'lis'); assert.equal(ev('UI.startCity'), 'lis'); - assert.deepEqual(onTiles(ev), ['own'], 'the sixth tile lights up'); assert.equal(ev("document.getElementById('homeWhat').textContent"), 'Lisbon · ' + ev("REG[CITY.lis.reg]"), 'and names the city in full'); - ev("document.querySelector('.start[data-city=nyc]').click()"); - assert.deepEqual(onTiles(ev), ['nyc'], 'a suggested tile takes over again'); - assert.equal(ev("document.getElementById('homeSel').value"), '', 'and the dropdown resets'); - assert.match(ev("document.getElementById('homeWhat').textContent"), /more cities/); + choose(ev, 'nyc'); + assert.equal(ev("document.getElementById('homeWhat').textContent"), ev("tr('title.huge_eyeball_market_pricey')"), 'a suggested home says what it is like'); choose(ev, 'akl'); ev("ACT.start({});if(UI.pendGame)ACT.pitchSkip()"); assert.equal(ev('S.home'), 'akl'); @@ -45,12 +43,15 @@ test('a home that cannot work is refused, and the game falls back to Frankfurt', assert.deepEqual(errors, []); }); -test('the sixth tile works on a phone and in every language', () => { +test('the title screen works on a phone in every language: language first, the name on top, compact presets', () => { for (const lang of ['en', 'it', 'pt', 'fr', 'es', 'de']) { const { ev, errors } = load(lang === 'en' ? {} : { lang }); ev('window.innerWidth=360;showTitle()'); - assert.equal(ev("document.querySelector('label.start.own b').textContent"), ev("tr('title.anywhere_else')"), lang); - if (lang !== 'en') assert.notEqual(ev("tr('title.anywhere_else')"), 'Anywhere else', `${lang}: translated`); + const order = ev("(()=>{const c=document.getElementById('modalCard');const at=s=>[...c.querySelectorAll('*')].indexOf(c.querySelector(s));return [at('#langTitle'),at('.title-art'),at('#nmIn'),at('.doors'),at('#homeSel')].join(',')})()").split(',').map(Number); + assert.ok(order.every((v, i) => v >= 0 && (i === 0 || v > order[i - 1])), `${lang}: language, title, name, doors, home (${order})`); + assert.equal(ev("document.querySelectorAll('#modalCard .preset small,#modalCard .preset span').length"), 0, `${lang}: presets are just icon and name`); + assert.ok(ev("document.getElementById('presetWhat').textContent.length") > 10, `${lang}: the chosen preset explained below`); + if (lang !== 'en') assert.notEqual(ev("tr('title.suggested')"), 'Suggested', `${lang}: translated`); assert.deepEqual(errors, []); } }); diff --git a/tests/regions.test.js b/tests/regions.test.js index cba9320..0ae73fa 100644 --- a/tests/regions.test.js +++ b/tests/regions.test.js @@ -605,7 +605,7 @@ test('Africa: more countries, cables along both coasts, border costs and Cape to test('Australia: hard mode start in Sydney, dear transit and waves, cheap IX ports, NBN takes its cut', () => { const { ev, errors } = load(); ev("showTitle()"); - assert.ok(ev("!!document.querySelector('.start[data-city=\"syd\"]')"), 'Sydney is on the start screen'); + assert.ok(ev("!!document.querySelector('#homeSel optgroup:first-child option[value=syd]')"), 'Sydney is among the suggested homes'); ev("ACT.pickStart({city:'syd'});ACT.start({});S.cash=1e9;S.lvl=4;for(const g of GOALS)S.done[g.id]=0"); assert.equal(ev('S.home'), 'syd'); assert.equal(ev("regionMult('syd')"), 3, 'transit into Australia costs more than Asia');