From b262f22757558371eb7e563ed33b7a0a02f5f927 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 17 Dec 2025 22:16:12 +0100
Subject: [PATCH] move the interface help to the start-game message

---
 config.cpp      |  2 +-
 language-cz.cpp |  6 ++++--
 language-pl.cpp |  6 ++++--
 language-zh.cpp |  6 ++++--
 system.cpp      | 14 +++++++++++---
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/config.cpp b/config.cpp
index 2aa61332..61182b21 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1800,7 +1800,7 @@ EX void initConfig() {
 
   param_enum(bow::weapon, "pc_class", bow::weapon)
     -> editable({{"blade", "Standard Rogue weapon. Bump into a monster to hit. Most monsters attack you the same way."},
-      {"crossbow", "Hits all monsters in a straight line, but slow to reload. Press 'f' or click the crossbow icon to target."}},
+      {"crossbow", "Hits all monsters in a straight line, but slow to reload."}},
       "weapon selection", 'w')
     -> set_need_confirm()
     -> set_value_to = [] (bow::eWeapon wpn) { bool b = game_active; if(wpn != bow::weapon) stop_game(); bow::weapon = wpn;
diff --git a/language-cz.cpp b/language-cz.cpp
index 97649e57..2d6c6ec7 100644
--- a/language-cz.cpp
+++ b/language-cz.cpp
@@ -9734,8 +9734,10 @@ S("blade", "čepel")
 S("Standard Rogue weapon. Bump into a monster to hit. Most monsters attack you the same way.",
   "Standardní zbraň. Naběhni do netvora, abys na něj zaútočil. Většina netvorů na tebe útočí stejným způsobem.")
 S("crossbow", "kuše")
-S("Hits all monsters in a straight line, but slow to reload. Press 'f' or click the crossbow icon to target.",
-  "Zasáhne všechny netvory v přímé linii, chvíli však trvá, než se znovu nabije. Cíluj klávesou 'f' nebo kliknutím na ikonu kuše.")
+S("Hits all monsters in a straight line, but slow to reload.",
+  "Zasáhne všechny netvory v přímé linii, chvíli však trvá, než se znovu nabije.")
+S("Press 'f' or click the crossbow icon to target.",
+  "Cíluj klávesou 'f' nebo kliknutím na ikonu kuše.")
 
 // 'click to use orb' errors
 
diff --git a/language-pl.cpp b/language-pl.cpp
index aab7fc98..d97d41c8 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -9453,8 +9453,10 @@ S("blade", "broń biała")
 S("Standard Rogue weapon. Bump into a monster to hit. Most monsters attack you the same way.",
   "Standardowa broń. Uderz potwora, by go zaatakować. Większość potworów atakuję Cię w ten sposób.")
 S("crossbow", "kusza")
-S("Hits all monsters in a straight line, but slow to reload. Press 'f' or click the crossbow icon to target.",
-  "Rani wszystkich przeciwników w linii prostej, ale przeładowanie zajmuje dużo czasu. Naciśnij 'f' lub kliknij ikonę kuszy, by celować.")
+S("Hits all monsters in a straight line, but slow to reload.",
+  "Rani wszystkich przeciwników w linii prostej, ale przeładowanie zajmuje dużo czasu.")
+S("Press 'f' or click the crossbow icon to target.",
+  "Naciśnij 'f' lub kliknij ikonę kuszy, by celować.")
 
 // 'click to use orb' errors
 
diff --git a/language-zh.cpp b/language-zh.cpp
index 709a3fd5..4d265d31 100644
--- a/language-zh.cpp
+++ b/language-zh.cpp
@@ -8587,8 +8587,10 @@ S("blade", "短刀")
 S("Standard Rogue weapon. Bump into a monster to hit. Most monsters attack you the same way.",
   "标准游荡者武器。碰撞怪物来攻击。大多数怪物使用相同方式攻击你。")
 S("crossbow", "弩")
-S("Hits all monsters in a straight line, but slow to reload. Press 'f' or click the crossbow icon to target.",
-  "击中一条直线上所有的怪物，但装弹缓慢。按“f”或点击弩图标来瞄准。")
+S("Hits all monsters in a straight line, but slow to reload.",
+  "击中一条直线上所有的怪物，但装弹缓慢。")
+S("Press 'f' or click the crossbow icon to target.",
+  "按“f”或点击弩图标来瞄准。")
 
 // 'click to use orb' errors
 
diff --git a/system.cpp b/system.cpp
index 7d1cf6dc..ad5b2515 100644
--- a/system.cpp
+++ b/system.cpp
@@ -156,11 +156,19 @@ EX void welcomeMessage() {
     }
 
   if(nohelp == 2) return;
+
+  if(!dialog::never_keys()) {
+    if(bow::crossbow_mode()) {
+      addMessage(XLAT("Press 'f' or click the crossbow icon to target."));
+      }
+    else {
 #if ISMAC
-  addMessage(XLAT("Press F1 or right-shift-click things for help."));
-#elif !ISMOBILE
-  addMessage(XLAT("Press F1 or right-click things for help."));
+      addMessage(XLAT("Press F1 or right-shift-click things for help."));
+#else
+      addMessage(XLAT("Press F1 or right-click things for help."));
 #endif
+      }
+    }
   }
 
 /** \brief These hooks are called at the start of initgame. */