From 5fa6db3c7030e7c8731d71058da7aa62abf10cac Mon Sep 17 00:00:00 2001 From: lebomis <26766744+lebomis@users.noreply.github.com> Date: Sun, 15 Nov 2026 19:24:37 +1100 Subject: [PATCH] The free camera works on the keyboard and mouse: freecam_key switches it, the bound keys fly it and the mouse turns it input.c freecam_gate also switches the free camera on a press of TOTK_FREECAM_KEY (f6 by default, none for no key). While it is on, ZL, ZR, L and R come from the merged Switch buttons, so the keys bound to them (Z, X, Q and R by default) go down, up and change the speed like the gamepad's; the keys' sticks already flew and turned it. The mouse's counts are taken in the poll and turn it at the game camera's rate (0.08 degrees a count times mouse_sens, through freecam_mouse), and input_direct_mouse_sample gives the game's mouse camera none meanwhile; in the stick emulation mode the mouse arrives in the right stick as before. The Controls tab gets a Free camera key row (off, F2 to F7, F9), with text in all four menu languages; docs/controls.md lists the keyboard column. Co-Authored-By: Claude Opus 5.5 --- docs/controls.md | 25 +++++++++++++------------ runtime/cfg.c | 6 +++--- runtime/freecam.c | 28 ++++++++++++++++++++++------ runtime/input.c | 45 ++++++++++++++++++++++++++++++++++++++------- runtime/input.h | 1 + runtime/ui/menu.cpp | 14 ++++++++++---- runtime/ui_text.c | 15 +++++++++++++++ runtime/ui_text.h | 1 + totk.ini.example | 3 +++ 9 files changed, 106 insertions(+), 32 deletions(-) diff --git a/docs/controls.md b/docs/controls.md index 5d498d62..0aa02978 100644 --- a/docs/controls.md +++ b/docs/controls.md @@ -131,20 +131,21 @@ bind_Y = pad:north, key:mouse_l ## Free camera -On game 1.4.3, ZL+ZR+L3 together (LT+RT+L3 on an Xbox pad; `freecam_pad` in `totk.ini` picks another combo, `none` none) -detach the view from Link; the same combo brings it back. The world goes on, but the game gets no gamepad input while the -free camera is on, so Link stands where he was. +On game 1.4.3, ZL+ZR+L3 together (LT+RT+L3 on an Xbox pad) or F6 detach the view from Link; the same combo or key brings +it back (`freecam_pad` and `freecam_key` in `totk.ini` and on the Controls tab pick others, `none` none). The world goes +on, but the game gets no input while the free camera is on, so Link stands where he was. -| Input | Free camera | -|---|---| -| Left stick | forward and back along the view, and sideways | -| ZR / ZL (RT / LT) | straight up / down, by how far the trigger is pressed | -| Right stick | turn (yaw and pitch; pitch stops 5 degrees short of straight up or down) | -| R / L (RB / LB) | each press doubles / halves the speed, 0.25 to 512 m/s | +| Gamepad | Keyboard and mouse (default bindings) | Free camera | +|---|---|---| +| Left stick | W A S D | forward and back along the view, and sideways | +| ZR / ZL (RT / LT) | X / Z | straight up / down; a trigger by how far it is pressed | +| Right stick | mouse, arrow keys | turn (yaw and pitch; pitch stops 5 degrees short of straight up or down) | +| R / L (RB / LB) | R / Q | each press doubles / halves the speed, 0.25 to 512 m/s | -The keys that drive the sticks (W A S D and the arrow keys by default) move it too. Each switch starts at the game -camera's position and view at 8 m/s; the speed follows the clock, so it is the same at any frame rate and game speed. -The horizon stays level. +The keys are the ones bound to the left and right stick and to ZR, ZL, R and L (`bind_` lines), so remapped keys follow. +The mouse turns the free camera at the game camera's rate (0.08 degrees a count at `mouse_sens = 1`) and the game's +mouse camera gets none of it meanwhile. Each switch starts at the game camera's position and view at 8 m/s; the speed +follows the clock, so it is the same at any frame rate and game speed. The horizon stays level. How it works (`runtime/freecam.c`): the camera component update (main+0x628460) copies each component's eye, target and up into its sead camera. The site `freecam` (`recomp/patches-v143.txt`, main+0x6286d4) runs before that copy and diff --git a/runtime/cfg.c b/runtime/cfg.c index 485eda3e..f6a3caa5 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -43,7 +43,7 @@ static const char *const known[] = { "COLOR_PRESET", "COLOR_SATURATION", "CONTACT_DEBUG", "CONTACT_SHADOWS", "CORE_DIAG", "CRIT", "CRIT_OUT", "DESC_TEMPLATE", "DESWIZZLE", "DEVICE_PROFILE", "DIALOGUE_CLICK", "DISCORD_APP_ID", "DISCORD_IMAGE", "DISCORD_RPC", "DLAA", "DLAA_CAM_JITTER", "DLAA_EFFECTS_AFTER", "DLAA_JITTER", "DLAA_MV", "DLAA_MASKDEBUG", "DLAA_MVDEBUG", "DLAA_OBJMV", "DLAA_SURVEY", "DLAA_TIMES", "DLSS", "DLSS_CHAR_MASK", "DLSS_FIXED_EXPOSURE", "DLSS_PRESET", "DLSS_REACTIVE", "DUMP", "DUMP_BUF", "DUMP_DIR", "DUMP_LOG", "DYNAMIC_RES", "DYN_DELTA", "EXEFS", "FEEDBACK", "FIXED_RES_PATCH", "FIX_C0", "FIX_ZERO", "FLIGHT", "FLIGHT_AT", "FLIGHT_DIR", "FLIGHT_FRAMES", - "FLIGHT_SPIKE_MS", "FLIGHT_THUMBS", "FLUSH_SPAN", "FOV", "FOV_PATCH", "FPS60", "FPS_LIMIT", "FRAME_QUEUE", "FREECAM_PAD", "FREECAM_PATCH", + "FLIGHT_SPIKE_MS", "FLIGHT_THUMBS", "FLUSH_SPAN", "FOV", "FOV_PATCH", "FPS60", "FPS_LIMIT", "FRAME_QUEUE", "FREECAM_KEY", "FREECAM_PAD", "FREECAM_PATCH", "FREEZE_IDLE", "FREE_CORES", "FULLSCREEN", "FXAA", "GAMEPLAY_DISTANCE_SENSITIVITY", "GAMEPLAY_ITEM_AD", "GAMEPLAY_ITEM_SENSITIVITY", "GAMEPLAY_ITEM_WHEEL", @@ -99,7 +99,7 @@ static const struct { const char *key, *section; } sections[] = { {"GYRO_BIAS_X", "input"}, {"GYRO_BIAS_Y", "input"}, {"GYRO_BIAS_Z", "input"}, {"GYRO_BIAS_PAD", "input"}, {"PAD_LAYOUT", "input"}, {"PROMPTS", "input"}, {"STICK_DEADZONE", "input"}, {"LSTICK_DEADZONE", "input"}, {"RSTICK_DEADZONE", "input"}, {"STICK_SENS", "input"}, - {"MENU_CURSOR", "input"}, {"MAP_CLICK", "input"}, {"DIALOGUE_CLICK", "input"}, {"POINTER_IMAGE", "input"}, {"QUICKSAVE", "input"}, {"QUICKSAVE_KEY", "input"}, {"QUICKLOAD_KEY", "input"}, {"MOUSE_MODE", "input"}, {"MOUSE_SENS", "input"}, {"MOUSE_AIM_SCALE", "input"}, {"WALK_KEY", "input"}, {"WALK_SCALE", "input"}, {"FREECAM_PAD", "input"}, {"INPUT_RECORD", "input"}, + {"MENU_CURSOR", "input"}, {"MAP_CLICK", "input"}, {"DIALOGUE_CLICK", "input"}, {"POINTER_IMAGE", "input"}, {"QUICKSAVE", "input"}, {"QUICKSAVE_KEY", "input"}, {"QUICKLOAD_KEY", "input"}, {"MOUSE_MODE", "input"}, {"MOUSE_SENS", "input"}, {"MOUSE_AIM_SCALE", "input"}, {"WALK_KEY", "input"}, {"WALK_SCALE", "input"}, {"FREECAM_PAD", "input"}, {"FREECAM_KEY", "input"}, {"INPUT_RECORD", "input"}, {"BIND_A", "input"}, {"BIND_B", "input"}, {"BIND_X", "input"}, {"BIND_Y", "input"}, {"BIND_LCLICK", "input"}, {"BIND_RCLICK", "input"}, {"BIND_L", "input"}, {"BIND_R", "input"}, {"BIND_ZL", "input"}, {"BIND_ZR", "input"}, {"BIND_PLUS", "input"}, {"BIND_MINUS", "input"}, {"BIND_LEFT", "input"}, {"BIND_UP", "input"}, @@ -189,7 +189,7 @@ static const CfgMeta metas[] = { {"QUICKSAVE", "0", "0|1", LIVE}, // quicksave.c: one key saves (an autosave), another loads it {"QUICKSAVE_KEY", "f6", NULL, LIVE}, {"QUICKLOAD_KEY", "f7", NULL, LIVE}, // Half-Life's keys; a key name or none {"WALK_KEY", "none", NULL, LIVE}, {"WALK_SCALE", "0.51", "0.2..0.9", LIVE}, - {"FREECAM_PAD", "zl+zr+lstick", NULL, LIVE}, + {"FREECAM_PAD", "zl+zr+lstick", NULL, LIVE}, {"FREECAM_KEY", "f6", NULL, LIVE}, // Gameplay Tweaks {"GAMEPLAY_TWEAKS_ENABLED", "0", "0|1", LIVE}, {"GAMEPLAY_ULTRAHAND_ROTATE", "1", "0|1", LIVE}, {"GAMEPLAY_ULTRAHAND_C_AXIS", "1", "0|1", LIVE}, diff --git a/runtime/freecam.c b/runtime/freecam.c index 882cf707..60759e8f 100644 --- a/runtime/freecam.c +++ b/runtime/freecam.c @@ -21,10 +21,11 @@ // the anchor is driven. When no driven component has been updated for LOST_NS (a load replaced them) the next one // away from the default anchors again; the free camera keeps its own position. // -// Input (runtime/input.c freecam_gate): TOTK_FREECAM_PAD switches it, ZL+ZR+L3 by default. While it is on the game -// gets no gamepad input; the left stick flies along the view and to the side, the triggers straight up and down, the -// right stick turns, and each press of L or R halves or doubles the speed. Every driven component steps the flight by -// the wall-clock time since the last step, so the speed is the same at any frame rate and game speed. +// Input (runtime/input.c freecam_gate): TOTK_FREECAM_PAD (ZL+ZR+L3 by default) or TOTK_FREECAM_KEY (F6) switches +// it. While it is on the game gets no input; the left stick flies along the view and to the side, ZR and ZL straight +// up and down, the right stick and the mouse turn, and each press of L or R halves or doubles the speed. Keys work +// through their bindings: the keys' sticks, and the keys bound to ZL, ZR, L and R. Every driven component steps the +// flight by the wall-clock time since the last step, so the speed is the same at any frame rate and game speed. #include #include #include @@ -53,6 +54,7 @@ static PlatMutex pad_lock = PLAT_MUTEX_INIT; static FreecamPad pad_now; // the last poll's input (input thread), under pad_lock static int speed_clicks; // R presses minus L presses not yet applied (input thread adds, the hook takes) +static double mouse_deg[2]; // under pad_lock: mouse turn not yet applied, degrees (right +, down +) // + 1 at every switch (input thread); odd while the free camera is on. One value, so the hook never sees a switch // without the state it switched to. static unsigned generation; @@ -65,6 +67,13 @@ void freecam_pad(const FreecamPad *p) { plat_mutex_unlock(&pad_lock); } +void freecam_mouse(double right_deg, double down_deg) { + plat_mutex_lock(&pad_lock); + mouse_deg[0] += right_deg; + mouse_deg[1] += down_deg; + plat_mutex_unlock(&pad_lock); +} + void freecam_speed_click(int faster) { __atomic_add_fetch(&speed_clicks, faster ? 1 : -1, __ATOMIC_RELAXED); } #ifdef RT_PATCH_PAGE @@ -164,8 +173,11 @@ static void step(uint64_t now) { if (dt <= 0) return; if (dt > STEP_MAX_S) dt = STEP_MAX_S; FreecamPad p; + double mouse[2]; plat_mutex_lock(&pad_lock); p = pad_now; + mouse[0] = mouse_deg[0], mouse[1] = mouse_deg[1]; + mouse_deg[0] = mouse_deg[1] = 0; plat_mutex_unlock(&pad_lock); int clicks = __atomic_exchange_n(&speed_clicks, 0, __ATOMIC_RELAXED); if (clicks) { @@ -173,8 +185,9 @@ static void step(uint64_t now) { fc.speed = fc.speed < SPEED_MIN ? SPEED_MIN : fc.speed > SPEED_MAX ? SPEED_MAX : fc.speed; } double turn = TURN_DEG_S * M_PI / 180 * dt, limit = PITCH_MAX_DEG * M_PI / 180; - fc.yaw = remainder(fc.yaw - axis(p.rx) * turn, 2 * M_PI); // right turns towards -yaw (see right[] below) - fc.pitch += axis(p.ry) * turn; + // right turns towards -yaw (see right[] below); the mouse's degrees come on top of the stick's + fc.yaw = remainder(fc.yaw - axis(p.rx) * turn - mouse[0] * M_PI / 180, 2 * M_PI); + fc.pitch += axis(p.ry) * turn - mouse[1] * M_PI / 180; fc.pitch = fc.pitch > limit ? limit : fc.pitch < -limit ? -limit : fc.pitch; double d[3], right[3]; direction(d); @@ -211,6 +224,9 @@ static void freecam_hook(Cpu *c) { if (gen != fc.generation) { // a switch: a new flight starts at the game camera, at the start speed fc.generation = gen; fc.started = 0, fc.anchored = 0, fc.speed = SPEED_START; + plat_mutex_lock(&pad_lock); // mouse motion from before the switch does not turn the new flight + mouse_deg[0] = mouse_deg[1] = 0; + plat_mutex_unlock(&pad_lock); } uint64_t now = plat_now_ns(); int i = driven_index(cam); diff --git a/runtime/input.c b/runtime/input.c index c15ac48c..e12fce7f 100644 --- a/runtime/input.c +++ b/runtime/input.c @@ -267,7 +267,7 @@ static void rec_apply(uint64_t b, const int32_t sl[2], const int32_t sr[2]) { void input_direct_mouse_sample(int enabled, int32_t *dx, int32_t *dy) { plat_mutex_lock(&lock); - enabled = enabled && !g_block && !g_menu; + enabled = enabled && !g_block && !g_menu && !freecam_on(); // the free camera takes the mouse (freecam_gate) *dx = script_mouse[0]; *dy = script_mouse[1]; script_mouse[0] = script_mouse[1] = 0; if (!enabled) { *dx = *dy = 0; } @@ -830,17 +830,35 @@ static uint32_t freecam_pad_mask(void) { return mask; } +// TOTK_FREECAM_KEY (live): the key that switches the free camera, f6 by default (the settings table), none for no key. +// Under lock. +static int freecam_key(void) { + static unsigned seen; + static int read, key; + unsigned v = cfg_version(); + if (read && v == seen) return key; + read = 1, seen = v; + const char *s = cfg_value("TOTK_FREECAM_KEY"); + key = !*s || !strcasecmp(s, "none") ? KEY_NONE : input_key_id(s); + if (key == KEY_NONE && *s && strcasecmp(s, "none")) + rt_log("input: TOTK_FREECAM_KEY=%s is not a key name (docs/controls.md)", s); + return key; +} + static float trigger_unit(int16_t v) { // 0..1 past a 5 % dead zone float t = v / 32767.0f; return t < 0.05f ? 0 : (t - 0.05f) / 0.95f; } // The free camera combo, latched like Minus+Plus (input_map.c, chord): once every button of it is down the free -// camera switches once, and the buttons stay hidden from the game until all are released. While the free camera is on -// it gets the gamepad (and the keys' sticks, merged into sl and sr) and the game gets nothing, so Link stands still; -// each press of L or R is a speed click. Off for other updates and with the freecam patch set off. Under lock. +// camera switches once, and the buttons stay hidden from the game until all are released; the free camera key +// switches it on its press. While the free camera is on it gets the input and the game gets nothing, so Link stands +// still: the sticks (the keys' sticks merged into sl and sr), the trigger axes or else ZL and ZR as buttons, a press of +// L or R as a speed click, and the mouse's motion, which input_direct_mouse_sample then keeps from the game's camera. +// ZL, ZR, L and R are the merged Switch buttons, so the keys bound to them count. Off for other updates and with the +// freecam patch set off. Under lock. static void freecam_gate(uint64_t *b, int32_t sl[2], int32_t sr[2]) { - static int held, available = -1, shoulder[2]; + static int held, key_held, available = -1, shoulder[2]; if (available < 0) available = freecam_available(); uint32_t mask = available ? freecam_pad_mask() : 0, raw = 0; for (int p = PAD_SOUTH; p <= PAD_GUIDE; p++) @@ -851,15 +869,28 @@ static void freecam_gate(uint64_t *b, int32_t sl[2], int32_t sr[2]) { held = 1; freecam_toggle(); } + int key = available ? freecam_key() : KEY_NONE; + int key_down = key != KEY_NONE && ikb_foreground() && ikb_down(key); + if (key_down && !key_held) freecam_toggle(); + key_held = key_down; if (available && freecam_on()) { + float lt = trigger_unit(trigger_seen[0]), rt = trigger_unit(trigger_seen[1]); + if (*b >> B_ZL & 1) lt = 1; + if (*b >> B_ZR & 1) rt = 1; FreecamPad fp = {sl[0] / (float)STICK_MAX, sl[1] / (float)STICK_MAX, sr[0] / (float)STICK_MAX, - sr[1] / (float)STICK_MAX, trigger_unit(trigger_seen[0]), trigger_unit(trigger_seen[1])}; + sr[1] / (float)STICK_MAX, lt, rt}; freecam_pad(&fp); for (int k = 0; k < 2; k++) { - int down = pad_seen[k ? PAD_R : PAD_L]; + int down = (int)(*b >> (k ? B_R : B_L) & 1); if (down && !shoulder[k]) freecam_speed_click(k); shoulder[k] = down; } + if (ikb_captured() && ikb_foreground() && input_cursor_allowed()) { + int32_t x, y; + ikb_mouse_take(&x, &y); // what the stick emulation left (none in that mode: it is in sr already) + float deg = 0.08f * mouse_sens_get(); // the game camera's rate a count (mouse_direct.c DEG_PER_COUNT) + if (x || y) freecam_mouse(x * deg, y * deg); + } *b = 0; sl[0] = sl[1] = sr[0] = sr[1] = 0; return; diff --git a/runtime/input.h b/runtime/input.h index 80a218a0..cad3a1f3 100644 --- a/runtime/input.h +++ b/runtime/input.h @@ -107,6 +107,7 @@ int freecam_on(void); void freecam_toggle(void); // logs; input thread void freecam_pad(const FreecamPad *p); void freecam_speed_click(int faster); // R (1) doubles the speed, L (0) halves it +void freecam_mouse(double right_deg, double down_deg); // a turn from the mouse, added at the next step // How far the open gamepad's left (pct[0]) and right (pct[1]) sticks are from the centre now, in percent of full // deflection, before the dead zone: the menu shows it on the dead zone rows, so a drifting stick's resting value can be // read off. 0 (and both 0) without a connected gamepad. Any thread. diff --git a/runtime/ui/menu.cpp b/runtime/ui/menu.cpp index dcbdca7c..b8eb708a 100644 --- a/runtime/ui/menu.cpp +++ b/runtime/ui/menu.cpp @@ -944,9 +944,10 @@ static void row_quicksave_keys(void) { key_taken("TOTK_QUICKLOAD_KEY", note[1], sizeof note[1])); } -// The free camera combo (freecam.c): the trigger and shoulder pairs with a stick click, named as the open pad labels -// its buttons, or none. totk.ini takes any combo of button positions, shown as written. Off on other game versions. -static void row_freecam_pad(void) { +// The free camera combo and key (freecam.c): the trigger and shoulder pairs with a stick click, named as the open pad +// labels its buttons, or none. totk.ini takes any combo of button positions, shown as written. Off on other game +// versions. +static void rows_freecam(void) { static const char *const combos[] = {"zl+zr+lstick", "zl+zr+rstick", "l+r+lstick", "l+r+rstick", "none"}; static const int pads[][3] = {{PAD_ZL, PAD_ZR, PAD_LSTICK}, {PAD_ZL, PAD_ZR, PAD_RSTICK}, {PAD_L, PAD_R, PAD_LSTICK}, {PAD_L, PAD_R, PAD_RSTICK}}; @@ -961,6 +962,11 @@ static void row_freecam_pad(void) { names[N - 1] = menu_text(UI_MENU_OFF); if (!freecam_available()) opt_disable_next(UI_MENU_FREECAM_PAD_V143); opt_choice_list("TOTK_FREECAM_PAD", UI_MENU_FREECAM_PAD, combos, names, N, UI_MENU_FREECAM_PAD_DESC); + // The free camera key: keys no default binding uses ("none" rather than an empty value turns it off: unset is f6) + static const char *const keys[] = {"none", "f2", "f3", "f4", "f5", "f6", "f7", "f9"}; + const char *key_names[] = {menu_text(UI_MENU_OFF), "F2", "F3", "F4", "F5", "F6", "F7", "F9"}; + if (!freecam_available()) opt_disable_next(UI_MENU_FREECAM_PAD_V143); + opt_choice_list("TOTK_FREECAM_KEY", UI_MENU_FREECAM_KEY, keys, key_names, 8, UI_MENU_FREECAM_KEY_DESC); } // The note under the prompts. The settings name a folder of prompts (input_prompts_folder: the prompts and the pad @@ -1103,7 +1109,7 @@ static void tab_controls(float scale) { row_quicksave_keys(); row_walk_key(); opt_slider("TOTK_WALK_SCALE", UI_MENU_WALK_SCALE, 0.2f, 0.9f, UI_MENU_WALK_SCALE_DESC, 0.01f, "%.2f"); - row_freecam_pad(); + rows_freecam(); rows_gameplay_tweaks(); // Analog sticks: one dead zone row per stick, falling back to TOTK_STICK_DEADZONE (both sticks) while unset. With // a gamepad connected each row shows its stick's deflection now, before the dead zone: a drifting stick's resting diff --git a/runtime/ui_text.c b/runtime/ui_text.c index abd56a73..e4c1b8a5 100644 --- a/runtime/ui_text.c +++ b/runtime/ui_text.c @@ -363,6 +363,10 @@ static const char *const text_en[UI_TEXT_COUNT] = { "While it is on the game gets no input: the left stick flies along the view and sideways, the triggers up and " "down, the right stick turns, and each press of L or R halves or doubles the speed. Game version 1.4.3.", [UI_MENU_FREECAM_PAD_V143] = "Game version 1.4.3 only", + [UI_MENU_FREECAM_KEY] = "Free camera key", + [UI_MENU_FREECAM_KEY_DESC] = "A key that detaches the view from Link and brings it back. While it is on: W A S D " + "fly along the view and sideways, the keys bound to ZR and ZL (X and Z by default) up and down, the mouse and " + "the arrow keys turn, and the keys bound to L and R (Q and R) halve or double the speed. Game version 1.4.3.", [UI_MENU_GROUP_GAMEPLAY_TWEAKS] = "Gameplay tweaks", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED] = "Gameplay tweaks", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED_DESC] = "Mouse wheel controls for Ultrahand rotation and distance, item and weapon switching, and smooth map zoom.", @@ -979,6 +983,10 @@ static const char *const text_ru[UI_TEXT_COUNT] = { "включена, игра не получает ввод: левый стик ведёт камеру вдоль взгляда и вбок, курки — вверх и вниз, правый " "стик поворачивает, а каждое нажатие L или R уменьшает или увеличивает скорость вдвое. Версия игры 1.4.3.", [UI_MENU_FREECAM_PAD_V143] = "Только для версии игры 1.4.3", + [UI_MENU_FREECAM_KEY] = "Клавиша свободной камеры", + [UI_MENU_FREECAM_KEY_DESC] = "Клавиша, которая отделяет камеру от Линка и возвращает её. Пока она включена: W A S " + "D ведут камеру вдоль взгляда и вбок, клавиши ZR и ZL (по умолчанию X и Z) — вверх и вниз, мышь и стрелки " + "поворачивают, а клавиши L и R (Q и R) уменьшают или увеличивают скорость вдвое. Версия игры 1.4.3.", [UI_MENU_GROUP_GAMEPLAY_TWEAKS] = "Геймплей", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED] = "Настройки геймплея", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED_DESC] = "Управление колесом мыши: вращение и дистанция предметов в Ультраруке, выбор оружия и предметов, плавный зум карты.", @@ -1787,6 +1795,11 @@ static const char *const text_pt_br[UI_TEXT_COUNT] = { "para os lados, os gatilhos sobem e descem, o analógico direito gira, e cada toque em L ou R reduz a " "velocidade à metade ou a dobra. Versão do jogo 1.4.3.", [UI_MENU_FREECAM_PAD_V143] = "Só na versão 1.4.3 do jogo", + [UI_MENU_FREECAM_KEY] = "Tecla da câmera livre", + [UI_MENU_FREECAM_KEY_DESC] = "Uma tecla que solta a câmera do Link e a traz de volta. Enquanto ela está ligada: W " + "A S D voam na direção da visão e para os lados, as teclas de ZR e ZL (X e Z por padrão) sobem e descem, o " + "mouse e as setas giram, e as teclas de L e R (Q e R) reduzem a velocidade à metade ou a dobram. Versão do " + "jogo 1.4.3.", [UI_MENU_GROUP_GAMEPLAY_TWEAKS] = "Ajustes de jogabilidade", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED] = "Ajustes de jogabilidade", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED_DESC] = "Controles com a roda do mouse para rotação e distância na Ultramão, seleção de armas e itens, e zoom suave no mapa.", @@ -2539,6 +2552,8 @@ static const char *const text_zh_hans[UI_TEXT_COUNT] = { [UI_MENU_FREECAM_PAD] = "自由镜头组合键", [UI_MENU_FREECAM_PAD_DESC] = "同时按下的手柄按键,让镜头脱离林克,再按一次回到林克。开启期间游戏不接收输入:左摇杆沿视线方向和左右移动,扳机键上升和下降,右摇杆转动视角,每按一次 L 或 R 速度减半或加倍。游戏版本 1.4.3。", [UI_MENU_FREECAM_PAD_V143] = "仅限游戏版本 1.4.3", + [UI_MENU_FREECAM_KEY] = "自由镜头键", + [UI_MENU_FREECAM_KEY_DESC] = "让镜头脱离林克、再按一次回到林克的按键。开启期间:W A S D 沿视线方向和左右移动,ZR 和 ZL 对应的按键(默认 X 和 Z)上升和下降,鼠标和方向键转动视角,L 和 R 对应的按键(默认 Q 和 R)让速度减半或加倍。游戏版本 1.4.3。", [UI_MENU_GROUP_GAMEPLAY_TWEAKS] = "游戏操作微调", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED] = "启用操作微调", [UI_MENU_GAMEPLAY_TWEAKS_ENABLED_DESC] = "使用鼠标滚轮控制究极手物体旋转与距离、武器与道具切换以及地图平滑缩放。", diff --git a/runtime/ui_text.h b/runtime/ui_text.h index ca75c70e..f3d398e3 100644 --- a/runtime/ui_text.h +++ b/runtime/ui_text.h @@ -155,6 +155,7 @@ typedef enum { UI_MENU_MOUSE_SENS, UI_MENU_MOUSE_SENS_DESC, UI_MENU_WALK_KEY, UI_MENU_WALK_KEY_DESC, UI_MENU_WALK_KEY_TAKEN, UI_MENU_WALK_SCALE, UI_MENU_WALK_SCALE_DESC, UI_MENU_FREECAM_PAD, UI_MENU_FREECAM_PAD_DESC, UI_MENU_FREECAM_PAD_V143, + UI_MENU_FREECAM_KEY, UI_MENU_FREECAM_KEY_DESC, // Controls tab: Gameplay tweaks UI_MENU_GROUP_GAMEPLAY_TWEAKS, diff --git a/totk.ini.example b/totk.ini.example index d81f7eea..4302ed6f 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -485,6 +485,9 @@ # the triggers straight up and down, the right stick turns; each press of L halves the speed, of R doubles it # (docs/controls.md, "Free camera"). none turns the combo off. Default: zl+zr+lstick (LT+RT+L3 on an Xbox pad). # freecam_pad = zl+zr+lstick +# A key that does the same, by its name in the bind_ lines; on the keyboard the keys bound to the sticks fly and turn, +# the keys of ZR and ZL go up and down, those of R and L change the speed, and the mouse turns. none turns it off. +# freecam_key = f6 # Write the input of this run to a file that replays as a script (docs/controls.md, "Scripted input"). Default: off. # input_record = input.txt # Remap buttons: the Controls tab of the settings menu (F1) writes these lines. One line per Switch button or stick