Merge branch 'pr270'
This commit is contained in:
commit
9cf90d0ad0
12 changed files with 199 additions and 1 deletions
|
|
@ -9,6 +9,7 @@ All notable changes to this project are documented here. The project follows
|
|||
- You can pay to hurry the survey, permits and factory of your own subsea cable, 30 days at a time (#258). Money only goes so far: the cable still has to be made, about two months plus a day for every 80 km, before the lay ships sail.
|
||||
- Three new cities in northern Australia: Port Hedland, Townsville and Alice Springs (#255). Port Hedland lands a new cable up the coast to Darwin and a branch of Darwin's cable out to Singapore; Alice Springs has no sea at all. In the wet season, November to April, fiber cuts in the tropical north, Darwin included, take twice as long to reach.
|
||||
- Traceroute no longer shows an "embedded cache in your rack" hop on paths that leave over transit, an exchange or a PNI. Only traffic that really ends at one of your cache boxes shows it now.
|
||||
- New keyboard shortcuts: [ and ] step through your POPs, - and = zoom the map out and in, n opens the NOC dashboard, and ? lists every shortcut. A letter right after n opens one of the dashboard's tabs, such as n c for Connections, and Help links to the list too.
|
||||
|
||||
## [2.6.0] — 2026-11-03
|
||||
|
||||
|
|
|
|||
|
|
@ -2379,6 +2379,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"TubeCoin ist auf dem Weg zu deinem Konto um {p} % gefallen.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"TubeCoin ist auf dem Weg zu deinem Konto um {p} % gestiegen.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>Du hast {bank} ausbezahlt.</b><br>Sie sind weitergeflogen, um ein anderes Startup zu finden.",
|
||||
"keys.close_a_window_or_deselect":"Fenster schließen oder Stadt bzw. Link abwählen",
|
||||
"keys.esc":"Esc",
|
||||
"keys.game_speed":"Spielgeschwindigkeit: ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Tastenkürzel",
|
||||
"keys.noc_dashboard_a_letter_right":"NOC-Dashboard. Ein Buchstabe direkt danach öffnet einen Tab:",
|
||||
"keys.pause_or_play":"Pause oder weiter",
|
||||
"keys.previous_or_next_of_your":"Vorheriger oder nächster deiner POPs",
|
||||
"keys.show_this_list":"Diese Liste zeigen",
|
||||
"keys.space":"Leertaste",
|
||||
"keys.zoom_the_map_out_or":"Karte heraus- oder hineinzoomen",
|
||||
"lease_swaps.cap_fabric_circuit":"{cap}-Fabric-Verbindung",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} auf einer Dark-Fiber-IRU",
|
||||
"lease_swaps.cap_wave":"{cap}-Wave",
|
||||
|
|
|
|||
|
|
@ -2377,6 +2377,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"TubeCoin bajó un {p} % de camino a tu cuenta.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"TubeCoin subió un {p} % de camino a tu cuenta.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>Compraste {bank}.</b><br>Se fueron volando a buscar otra startup.",
|
||||
"keys.close_a_window_or_deselect":"Cerrar una ventana, o deseleccionar una ciudad o un enlace",
|
||||
"keys.esc":"Esc",
|
||||
"keys.game_speed":"Velocidad del juego: ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Atajos de teclado",
|
||||
"keys.noc_dashboard_a_letter_right":"Panel del NOC. Una letra justo después abre una pestaña:",
|
||||
"keys.pause_or_play":"Pausar o reanudar",
|
||||
"keys.previous_or_next_of_your":"Tu POP anterior o siguiente",
|
||||
"keys.show_this_list":"Mostrar esta lista",
|
||||
"keys.space":"Espacio",
|
||||
"keys.zoom_the_map_out_or":"Alejar o acercar el mapa",
|
||||
"lease_swaps.cap_fabric_circuit":"Circuito de fabric de {cap}",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} en una IRU de fibra oscura",
|
||||
"lease_swaps.cap_wave":"Onda de {cap}",
|
||||
|
|
|
|||
|
|
@ -2377,6 +2377,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"Le TubeCoin a perdu {p} % en route vers ton compte.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"Le TubeCoin a pris {p} % en route vers ton compte.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>Tu as racheté la part de {bank}.</b><br>Ils se sont envolés à la recherche d’une autre startup.",
|
||||
"keys.close_a_window_or_deselect":"Fermer une fenêtre, ou désélectionner une ville ou un lien",
|
||||
"keys.esc":"Échap",
|
||||
"keys.game_speed":"Vitesse du jeu : ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Raccourcis clavier",
|
||||
"keys.noc_dashboard_a_letter_right":"Tableau de bord NOC. Une lettre juste après ouvre un onglet :",
|
||||
"keys.pause_or_play":"Pause ou reprise",
|
||||
"keys.previous_or_next_of_your":"Ton POP précédent ou suivant",
|
||||
"keys.show_this_list":"Afficher cette liste",
|
||||
"keys.space":"Espace",
|
||||
"keys.zoom_the_map_out_or":"Dézoomer ou zoomer la carte",
|
||||
"lease_swaps.cap_fabric_circuit":"circuit fabric {cap}",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} sur un IRU de fibre noire",
|
||||
"lease_swaps.cap_wave":"longueur d’onde {cap}",
|
||||
|
|
|
|||
|
|
@ -2377,6 +2377,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"TubeCoin è sceso del {p}% mentre arrivava sul tuo conto.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"TubeCoin è salito del {p}% mentre arrivava sul tuo conto.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>Hai liquidato {bank}.</b><br>Sono volati via in cerca di un’altra startup.",
|
||||
"keys.close_a_window_or_deselect":"Chiudi una finestra, o deseleziona una città o un link",
|
||||
"keys.esc":"Esc",
|
||||
"keys.game_speed":"Velocità di gioco: ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Scorciatoie da tastiera",
|
||||
"keys.noc_dashboard_a_letter_right":"Dashboard NOC. Una lettera subito dopo apre una scheda:",
|
||||
"keys.pause_or_play":"Pausa o riprendi",
|
||||
"keys.previous_or_next_of_your":"Il tuo POP precedente o successivo",
|
||||
"keys.show_this_list":"Mostra questo elenco",
|
||||
"keys.space":"Spazio",
|
||||
"keys.zoom_the_map_out_or":"Zoom indietro o avanti sulla mappa",
|
||||
"lease_swaps.cap_fabric_circuit":"circuito fabric da {cap}",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} su una dark fiber IRU",
|
||||
"lease_swaps.cap_wave":"wave da {cap}",
|
||||
|
|
|
|||
|
|
@ -2377,6 +2377,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"A TubeCoin caiu {p}% no caminho até sua conta.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"A TubeCoin subiu {p}% no caminho até sua conta.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>Você comprou a parte de {bank}.</b><br>Eles voaram em busca de outra startup.",
|
||||
"keys.close_a_window_or_deselect":"Fechar uma janela, ou desmarcar uma cidade ou link",
|
||||
"keys.esc":"Esc",
|
||||
"keys.game_speed":"Velocidade do jogo: ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Atalhos de teclado",
|
||||
"keys.noc_dashboard_a_letter_right":"Dashboard do NOC. Uma letra logo depois abre uma aba:",
|
||||
"keys.pause_or_play":"Pausar ou continuar",
|
||||
"keys.previous_or_next_of_your":"Seu POP anterior ou próximo",
|
||||
"keys.show_this_list":"Mostrar esta lista",
|
||||
"keys.space":"Espaço",
|
||||
"keys.zoom_the_map_out_or":"Afastar ou aproximar o mapa",
|
||||
"lease_swaps.cap_fabric_circuit":"circuito de fabric de {cap}",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} numa IRU de dark fiber",
|
||||
"lease_swaps.cap_wave":"wave de {cap}",
|
||||
|
|
|
|||
|
|
@ -48,5 +48,8 @@ const ACT={
|
|||
findOpen:()=>findOpen(),
|
||||
findGo:({city})=>{if(!isCity(city))return;closeModal();$('dash').hidden=true;ACT.focusCity({city});},
|
||||
focusCity:({city})=>{selectCity(city);const C=CITY[city];cam.x=C.x;cam.y=C.y;cam.z=Math.max(cam.z,1.2);if(innerWidth<760)UI.leftOpen=false;renderLeft();},
|
||||
popStep:({d})=>{const L=popOrder(),n=L.length;if(!n)return;const i=UI.sel&&UI.sel.type==='city'?L.indexOf(UI.sel.id):-1;$('dash').hidden=true;ACT.focusCity({city:L[i<0?(d>0?0:n-1):(i+(d>0?1:n-1))%n]});},
|
||||
zoomStep:({d})=>zoomAt(CW/2,CH/2,d>0?1.25:0.8),
|
||||
keys:()=>showKeys(),
|
||||
selLink:({id})=>{selectLink(id);focusLink(id);},
|
||||
};
|
||||
|
|
|
|||
22
src/game/93-ui/82-keys.js
Normal file
22
src/game/93-ui/82-keys.js
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
/* ---------- Keyboard shortcuts: [ ] step through your POPs, - = zoom, n (then a letter) the NOC, ? lists every key ----------
|
||||
Space, 0–4 and Escape live with the map's input (96-map/90-input.js), / with Find a city. */
|
||||
// Your POPs in the order Find a city lists them, so [ and ] walk the same list.
|
||||
const popOrder=()=>S&&S.pops?Object.keys(S.pops).filter(isCity).sort((a,b)=>CITY[a].name.localeCompare(CITY[b].name)):[];
|
||||
// n opens the NOC dashboard, and a letter within KEY_LEAD ms of it picks a tab (n c: Connections). n never closes the
|
||||
// dashboard, so n c switches tabs without it flashing shut; Escape closes it.
|
||||
const DASH_KEYS={o:'overview',u:'cust',c:'conn',t:'traffic',r:'infra',l:'lease'},KEY_LEAD=1000;let keyLead=0;
|
||||
function showKeys(){const k=s=>`<span class="kbd">${s}</span>`,TN={overview:tr('common.overview'),cust:tr('common.customers'),conn:tr('common.connections'),traffic:tr('common.traffic'),infra:tr('common.links_routers'),lease:tr('common.leased_lines')};
|
||||
const tabs=Object.entries(DASH_KEYS).map(([l,t])=>`<span class="keytab">${k(l)} ${TN[t]}</span>`).join(' ');
|
||||
const rows=[[k(tr('keys.space')),tr('keys.pause_or_play')],[k('0')+' – '+k('4'),tr('keys.game_speed')],[k('/'),tr('find.find_a_city')],[k('[')+' '+k(']'),tr('keys.previous_or_next_of_your')],[k('-')+' '+k('='),tr('keys.zoom_the_map_out_or')],[k('n'),`${tr('keys.noc_dashboard_a_letter_right')}<br>${tabs}`],[k(tr('keys.esc')),tr('keys.close_a_window_or_deselect')],[k('?'),tr('keys.show_this_list')]];
|
||||
openModal(`<div style="display:flex;align-items:center"><h2 style="font-size:28px">⌨️ ${tr('keys.keyboard_shortcuts')}</h2><button class="x" data-act="helpClose" aria-label="${tr('common.close')}">×</button></div>
|
||||
<dl class="keylist">${rows.map(([a,b])=>`<dt>${a}</dt><dd>${b}</dd>`).join('')}</dl><div class="btns" style="margin-top:14px">${btn(UI.started?tr('common.back_to_the_map'):tr('common.got_it'),'helpClose',{},'big')}</div>`,'keys');}
|
||||
document.addEventListener('keydown',e=>{
|
||||
// Many layouts type [ and ] with Option or AltGr held, so Alt alone is fine; Ctrl or Cmd belongs to the browser.
|
||||
if(e.key==='Shift'||e.metaKey||(e.ctrlKey&&!e.altKey)||(e.target.closest&&e.target.closest('input,textarea,select,[contenteditable]')))return;
|
||||
const k=e.key.length===1?e.key.toLowerCase():e.key,step={'[':-1,']':1}[k],zoom={'-':-1,'_':-1,'=':1,'+':1}[k];
|
||||
const lead=Date.now()-keyLead<KEY_LEAD;keyLead=0;
|
||||
if(lead&&DASH_KEYS[k]&&!$('dash').hidden){e.preventDefault();ACT.dashTab({k:DASH_KEYS[k]});return;}
|
||||
if(k==='n'){if(!S||!UI.started||!$('modal').hidden)return;e.preventDefault();if($('dash').hidden)ACT.dash();if(!$('dash').hidden)keyLead=Date.now();return;}
|
||||
if(k==='?'){if(e.repeat)return;if($('modal').hidden){if(S&&UI.started){e.preventDefault();ACT.keys();}}else if($('modal').className==='keys'){e.preventDefault();closeModal();}return;}
|
||||
if(!(step||zoom)||!S||!UI.started||!$('modal').hidden)return;
|
||||
e.preventDefault();if(step)ACT.popStep({d:step});else ACT.zoomStep({d:zoom});});
|
||||
|
|
@ -18,7 +18,7 @@ function showHelp(){
|
|||
<dt>${tr('common.waves')}</dt><dd>${tr('help.your_fiber_links_are_leased_waves')}</dd><dt>${tr('common.95th_percentile')}</dt><dd>${tr('help.transit_bills_sample_your_usage')}</dd><dt>${tr('common.routers')}</dt><dd>${tr('help.each_pop_s_router_model_caps')}</dd><dt>${tr('common.dark_fiber')}</dt><dd>${tr('help.lease_an_iru_or_build_your')}</dd><dt>${tr('common.subsea_cables')}</dt><dd>${tr('help.subsea_waves_can_only_follow_cable')}</dd><dt>${tr('common.latency')}</dt><dd>${tr('help.every_link_has_latency_high')}</dd><dt>${tr('common.noc_dashboard')}</dt><dd>${tr('help.the_chart_button_at_the_top')}</dd><dt>${tr('common.asia')}</dt><dd>${tr('help.a_weird_underserved_market_transit')}</dd><dt>${tr('common.russia')}</dt><dd>${tr('help.moscow_needs_a_mandatory_government')}</dd><dt>${tr('help.events_chains_and_wholesale')}</dt><dd>${tr('help.event_networks_a_final_a_festival')}</dd><dt>${tr('common.bank')}</dt><dd>${tr('help.tap_your_cash_to_open_the')}</dd><dt>${tr('common.lags')}</dt><dd>${tr('help.out_of_port_speed_bundle_up')}</dd><dt>${tr('common.traffic_engineering')}</dt><dd>${tr('help.tap_a_link_to_see_which')}</dd><dt>${tr('common.china')}</dt><dd>${tr('help.mainland_china_needs_a_license_and')}</dd><dt>${tr('common.weird_requirements')}</dt><dd>${tr('help.some_customers_come_with_conditions')}</dd><dt>${tr('common.customer_levels')}</dt><dd>${tr('help.as_your_peak_traffic_and_footprint')}</dd><dt>${tr('help.l2vpn_ddos_protection')}</dt><dd>${tr('help.businesses_may_want_a_private')}</dd><dt>${tr('common.ddos_attack')}</dt><dd>${tr('help.ddos_a_flood_comes_from')}</dd><dt>${tr('common.scrubbing_centers')}</dt><dd>${tr('help.scrubbing_a_center_pulls_floods')}</dd><dt>${tr('common.nni_fabrics')}</dt><dd>${tr('help.megapork_pocketfabric_and')}</dd>
|
||||
<dt>${tr('common.conferences')}</dt><dd>${tr('help.nanog_ripe_denog_and_friends_come')}</dd><dt>${tr('common.modes')}</dt><dd>${tr('help.one_game_four_doors_and_the')}</dd><dt>${tr('common.traceroute')}</dt><dd>${tr('help.tap_traceroute_on_any_of_your')}</dd><dt>${tr('common.badges')}</dt><dd>${tr('help.below_your_goals_sits_a_wall')}</dd><dt>${tr('common.the_giants')}</dt><dd>${tr('help.at_customer_level_3_and_4')}</dd><dt>RouteScript</dt><dd>${tr('help.once_auto_te_is_installed_you')}</dd><dt>Auto-TE</dt><dd>${tr('help.traffic_follows_the_shortest_path_by')}</dd><dt>${tr('common.metro_diversity')}</dt><dd>${tr('help.a_pop_is_one_building_until')}</dd><dt>${tr('common.wave_markets')}</dt><dd>${tr('help.what_a_wave_costs_depends_on')}</dd><dt>${tr('common.regional_quirks')}</dt><dd>${tr('help.in_the_gulf_saudi_pops_need')}</dd><dt>${tr('common.boot_times')}</dt><dd>${tr('help.some_routers_take_forever_to_boot')}</dd><dt>${tr('common.failures')}</dt><dd>${tr('help.things_break_all_the_time_fiber')}</dd>
|
||||
<dt>RouteScript</dt><dd>${tr('help.rules_for_your_auto_te_controller')}</dd>
|
||||
</dl><h3 style="margin:16px 0 0">${tr('help.want_to_know_how_it_really')}</h3>${plugHtml(true)}${chatHtml()}${issueHtml()}</dl><div class="btns" style="margin-top:14px">${btn(UI.started?tr('common.back_to_the_map'):tr('common.got_it'),'helpClose',{},'big')}${RELEASE_NOTES.length?btn(tr('common.what_s_new_in_v',{v:esc(APP_VERSION)}),'whatsNewShow',{},'ghost'):''}${UI.started&&S&&!S.lost?btn(tr('common.start_a_new_network'),'resetAsk',{},'ghost sm'):''}</div><div class="btns" style="margin-top:6px">${UI.started&&S&&!S.lost?btn(tr('common.export_save'),'exportSave',{},'ghost sm'):''}${btn(tr('common.import_a_save'),'importPick',{},'ghost sm')}${btn(tr('common.settings'),'settings',{},'ghost sm')}</div>`);
|
||||
</dl><h3 style="margin:16px 0 0">${tr('help.want_to_know_how_it_really')}</h3>${plugHtml(true)}${chatHtml()}${issueHtml()}</dl><div class="btns" style="margin-top:14px">${btn(UI.started?tr('common.back_to_the_map'):tr('common.got_it'),'helpClose',{},'big')}${RELEASE_NOTES.length?btn(tr('common.what_s_new_in_v',{v:esc(APP_VERSION)}),'whatsNewShow',{},'ghost'):''}${UI.started&&S&&!S.lost?btn(tr('common.start_a_new_network'),'resetAsk',{},'ghost sm'):''}</div><div class="btns" style="margin-top:6px">${UI.started&&S&&!S.lost?btn(tr('common.export_save'),'exportSave',{},'ghost sm'):''}${btn(tr('common.import_a_save'),'importPick',{},'ghost sm')}${btn(tr('common.settings'),'settings',{},'ghost sm')}${isPhone()?'':btn(tr('keys.keyboard_shortcuts'),'keys',{},'ghost sm')}</div>`);
|
||||
}
|
||||
function showWin(){setTimeout(()=>{const m=$('modalCard');if(m&&!m.querySelector('[data-act=share]'))m.insertAdjacentHTML('beforeend',`<div class="btns" style="margin-top:8px">${btn(tr('help.share_my_network'),'share',{},'pink')}</div><p class="meta" style="margin:12px 0 0">${tr('help.you_built_a_cartoon_internet_now')}</p>${plugHtml(true)}`);},0);openModal(`<h1 style="font-family:var(--display);font-size:44px;margin:0">${tr('help.you_re_a_tier_1')}</h1><p class="tagline">${tr('help.name_as_asn_is_transit_free',{name:esc(S.name),asn:S.asn,days:S.day,n:S.stats.incidents})}</p>${btn(tr('common.keep_building'),'keepPlaying',{},'pink big')}`);sfx('coin');}
|
||||
function showLose(){openModal(`<h1 style="font-family:var(--display);font-size:40px;margin:0">${tr('common.bankrupt')}</h1><p class="tagline">${tr('help.the_bank_repossessed_your_routers',{name:esc(S.name),days:S.day,peak:fmtG(S.stats.peak)})}</p>${btn(tr('common.try_again'),'newgame',{},'pink big')}`);if(UI.slot){const id=UI.slot;slotDrop(id);slotFree(id);}}
|
||||
|
|
|
|||
|
|
@ -2378,6 +2378,16 @@
|
|||
"interface.tubecoin_moved_down_p_on_the":"TubeCoin moved down {p}% on the way to your account.",
|
||||
"interface.tubecoin_moved_up_p_on_the":"TubeCoin moved up {p}% on the way to your account.",
|
||||
"interface.you_bought_out_bank_they_flew":"<b>You bought out {bank}.</b><br>They flew off to find another startup.",
|
||||
"keys.close_a_window_or_deselect":"Close a window, or deselect a city or link",
|
||||
"keys.esc":"Esc",
|
||||
"keys.game_speed":"Game speed: ½×, 1×, 2×, 4×, 8×",
|
||||
"keys.keyboard_shortcuts":"Keyboard shortcuts",
|
||||
"keys.noc_dashboard_a_letter_right":"NOC dashboard. A letter right after it opens a tab:",
|
||||
"keys.pause_or_play":"Pause or play",
|
||||
"keys.previous_or_next_of_your":"Previous or next of your POPs",
|
||||
"keys.show_this_list":"Show this list",
|
||||
"keys.space":"Space",
|
||||
"keys.zoom_the_map_out_or":"Zoom the map out or in",
|
||||
"lease_swaps.cap_fabric_circuit":"{cap} fabric circuit",
|
||||
"lease_swaps.cap_on_a_dark_fiber_iru":"{cap} on a dark fiber IRU",
|
||||
"lease_swaps.cap_wave":"{cap} wave",
|
||||
|
|
|
|||
|
|
@ -160,6 +160,10 @@ input.t{width:100%;box-sizing:border-box;border:3px solid var(--ink);border-radi
|
|||
.gl dt{font-family:var(--display);font-weight:800;font-size:16px;margin-top:10px}
|
||||
.gl dd{margin:2px 0 0;color:var(--ink2);line-height:1.45;font-size:13px}
|
||||
.kbd{display:inline-block;border:2px solid var(--ink);border-radius:6px;padding:0 5px;font-weight:900;font-size:11px;background:var(--soft)}
|
||||
.keylist{display:grid;grid-template-columns:auto 1fr;gap:10px 16px;align-items:center;margin:14px 0 0}
|
||||
.keylist dt{margin:0;white-space:nowrap}.keylist dd{margin:0;color:var(--ink2);font-size:14px}
|
||||
.keylist .kbd{font-size:13px;padding:1px 7px;min-width:12px;text-align:center}
|
||||
.keylist .keytab{display:inline-block;margin:6px 10px 0 0;white-space:nowrap}
|
||||
|
||||
/* "Your networks" on the title screen: one big tap target per network, a small ⋯ for export and delete. */
|
||||
.slots{display:flex;flex-direction:column;gap:7px;margin-bottom:6px;max-height:min(46vh,330px);overflow:auto;padding:2px 2px 5px}
|
||||
|
|
|
|||
108
tests/keyboard-shortcuts.test.js
Normal file
108
tests/keyboard-shortcuts.test.js
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { load } = require('./harness');
|
||||
|
||||
const start = "ACT.start({});S.nextFail=1e9;S.nextEvent=1e9;S.cash=1e9";
|
||||
const keyer = dom => (k, t, o) => (t || dom.window.document.body).dispatchEvent(new dom.window.KeyboardEvent('keydown', { key: k, bubbles: true, ...o }));
|
||||
|
||||
test('[ and ] step through your POPs in name order, wrap around, and move the map there', () => {
|
||||
const { ev, dom, errors } = load();
|
||||
const key = keyer(dom);
|
||||
ev(start + ";for(const c of ['par','lon','ams'])ACT.buildPop({city:c})");
|
||||
assert.equal(ev("popOrder().join()"), 'ams,fra,lon,par', 'Amsterdam, Frankfurt, London, Paris');
|
||||
const sel = () => ev('UI.sel&&UI.sel.type==="city"?UI.sel.id:null');
|
||||
assert.equal(sel(), 'fra', 'the game starts on the home POP');
|
||||
key(']'); assert.equal(sel(), 'lon');
|
||||
assert.equal(ev('cam.x'), ev('CITY.lon.x'), 'with the map on it');
|
||||
key(']'); assert.equal(sel(), 'par');
|
||||
key(']'); assert.equal(sel(), 'ams', '] wraps to the first');
|
||||
key('['); assert.equal(sel(), 'par', '[ wraps to the last');
|
||||
key('['); assert.equal(sel(), 'lon');
|
||||
// Nothing selected, or a city without a POP: ] starts at the first POP, [ at the last.
|
||||
ev('UI.sel=null'); key(']'); assert.equal(sel(), 'ams');
|
||||
ev('UI.sel=null'); key('['); assert.equal(sel(), 'par');
|
||||
ev("selectCity('tok')"); key(']'); assert.equal(sel(), 'ams');
|
||||
// The NOC dashboard steps aside so the POP can be seen.
|
||||
ev("ACT.dash()"); assert.equal(ev("$('dash').hidden"), false);
|
||||
key(']'); assert.equal(sel(), 'fra'); assert.equal(ev("$('dash').hidden"), true);
|
||||
// Not while typing, not with Ctrl or Cmd, not behind an open window.
|
||||
key(']', null, { ctrlKey: true }); key(']', null, { metaKey: true }); assert.equal(sel(), 'fra');
|
||||
key(']', null, { altKey: true }); assert.equal(sel(), 'lon', 'Option or AltGr types [ ] on many layouts');
|
||||
ev("ACT.rename()");
|
||||
key(']', dom.window.document.getElementById('rnIn'));
|
||||
key(']');
|
||||
assert.equal(sel(), 'lon');
|
||||
assert.equal(ev("$('modal').hidden"), false);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('- and = zoom the map out and in around its middle, within the zoom limits', () => {
|
||||
const { ev, dom, errors } = load();
|
||||
const key = keyer(dom);
|
||||
ev(start + ';cam.z=1');
|
||||
const x = ev('cam.x'), z = () => ev('cam.z');
|
||||
key('='); assert.ok(Math.abs(z() - 1.25) < 1e-9);
|
||||
key('+'); assert.ok(Math.abs(z() - 1.5625) < 1e-9, '+ zooms in too');
|
||||
key('-'); key('_'); assert.ok(Math.abs(z() - 1) < 1e-9, '- and _ zoom out');
|
||||
assert.ok(Math.abs(ev('cam.x') - x) < 1e-6, 'the middle of the map stays put');
|
||||
ev('cam.z=ZMAX'); key('='); assert.equal(z(), ev('ZMAX'));
|
||||
ev('cam.z=ZMIN'); key('-'); assert.equal(z(), ev('ZMIN'));
|
||||
ev("cam.z=1;ACT.rename()"); key('=', dom.window.document.getElementById('rnIn')); key('='); assert.equal(z(), 1, 'not while a window is open');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('n opens the NOC dashboard, and n followed by a letter opens one of its tabs', () => {
|
||||
const { ev, dom, errors } = load();
|
||||
const key = keyer(dom), open = () => !ev("$('dash').hidden"), tab = () => ev("UI.dtab||'overview'");
|
||||
ev(start);
|
||||
key('n'); assert.ok(open(), 'n opens it');
|
||||
assert.equal(tab(), 'overview');
|
||||
key('c'); assert.equal(tab(), 'conn', 'n c: Connections');
|
||||
key('n'); assert.ok(open(), 'n does not close it, so n c can switch tabs without a flash');
|
||||
key('u'); assert.equal(tab(), 'cust');
|
||||
for (const [l, t] of [['o', 'overview'], ['t', 'traffic'], ['r', 'infra'], ['l', 'lease'], ['c', 'conn']]) { key('n'); key(l); assert.equal(tab(), t, 'n ' + l); }
|
||||
key('o'); assert.equal(tab(), 'conn', 'a letter on its own does nothing');
|
||||
key('n'); key('Shift'); key('T'); assert.equal(tab(), 'traffic', 'Shift on the way does not cancel it');
|
||||
key('n'); ev('keyLead=Date.now()-KEY_LEAD-1'); key('c'); assert.equal(tab(), 'traffic', 'too late: the letter stands alone');
|
||||
key('n'); key('x'); key('c'); assert.equal(tab(), 'traffic', 'another key in between ends the wait');
|
||||
key('Escape'); assert.ok(!open(), 'Escape closes it');
|
||||
key('n'); key('c', null, { ctrlKey: true }); assert.equal(tab(), 'traffic', 'not with Ctrl');
|
||||
ev("$('dash').hidden=true;ACT.rename()"); key('n', dom.window.document.getElementById('rnIn')); key('n');
|
||||
assert.ok(!open(), 'not while typing or behind a window');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('? shows every keyboard shortcut and closes again; Help links to it on a computer, not on a phone', () => {
|
||||
const { ev, dom, errors } = load();
|
||||
const doc = dom.window.document, key = keyer(dom);
|
||||
ev(start);
|
||||
key('?');
|
||||
assert.equal(ev("$('modal').className"), 'keys', '? opens the list');
|
||||
const txt = doc.getElementById('modalCard').textContent;
|
||||
for (const s of ['Keyboard shortcuts', 'Space', 'Pause or play', 'Find a city', 'Previous or next of your POPs', 'Zoom the map out or in', 'NOC dashboard', 'Connections', 'Leased lines', 'Esc', 'Show this list'])
|
||||
assert.ok(txt.includes(s), s);
|
||||
for (const k of ['[', ']', '-', '=', '/', '?', '0', '4', 'n', 'o', 'u', 'c', 't', 'r', 'l']) assert.ok([...doc.querySelectorAll('#modalCard .kbd')].some(e => e.textContent === k), k);
|
||||
key('?', null, { repeat: true }); assert.equal(ev("$('modal').hidden"), false, 'holding ? does not flicker it');
|
||||
key('?'); assert.equal(ev("$('modal').hidden"), true, '? again closes it');
|
||||
key('?'); key('Escape'); assert.equal(ev("$('modal').hidden"), true, 'so does Escape');
|
||||
// Another window stays as it is, and ? in a text field is just a question mark.
|
||||
ev("ACT.findOpen()"); key('?'); assert.equal(ev("$('modal').className"), 'find');
|
||||
key('?', doc.getElementById('findIn')); assert.equal(ev("$('modal').className"), 'find');
|
||||
ev('closeModal();ACT.help()');
|
||||
const link = doc.querySelector('#modalCard [data-act="keys"]');
|
||||
assert.ok(link, 'Help has a Keyboard shortcuts button');
|
||||
link.click(); assert.equal(ev("$('modal').className"), 'keys');
|
||||
ev("closeModal();window.innerWidth=360;ACT.help()");
|
||||
assert.equal(doc.querySelector('#modalCard [data-act="keys"]'), null, 'not on a phone, which has no keys');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('the shortcut list in German', () => {
|
||||
const { ev, dom, errors } = load({ lang: 'de' });
|
||||
ev(start + ';if(ACT.pitchSkip)ACT.pitchSkip()');
|
||||
keyer(dom)('?');
|
||||
const txt = dom.window.document.getElementById('modalCard').textContent;
|
||||
assert.match(txt, /Tastenkürzel/);
|
||||
assert.match(txt, /Leertaste/);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue