tour:: improved the idea of DECK_CONTROLS, to TOUR_CONTROLS

2026-03-19 03:19:43 +00:00 · 2026-01-27 18:54:53 +01:00
parent 9da2b3dffe
commit ef6f0ea50d
6 changed files with 77 additions and 58 deletions
--- a/language-cz.cpp
+++ b/language-cz.cpp
@@ -5127,23 +5127,27 @@ S("This guided tour is different than most other game tutorials -- "
  "a je možné, že se v něm ztratíš.\n\n"
  "Nezapomeň, že stiskem klávesy Enter můžeš přejít na další snímek.")

-S("Introduction", "Úvod")
-S("Welcome to the HyperRogue Guided Tour!", "Vítej v tutoriálu HyperRogue!")
 S(
-  "This tour is mostly aimed to show what is "
-  "special about the geometry used by HyperRogue. "
-  "It also shows the basics of gameplay, and "
-  "how is it affected by geometry.\n\n"
  "You decide when you want to stop playing with the "
  "current \"slide\" and go to the next one, by pressing Enter. You can also "
  "press ESC to see a "
  "menu with other options.",
+
+  "Když si budeš chtít přestat hrát se současným \"snímkem\" a přejít na další, "
+  "stiskni Enter. Stiskem ESC můžeš také zobrazit menu s dalšími možnostmi.")
+
+S("Introduction", "Úvod")
+S("Welcome to the HyperRogue Guided Tour!", "Vítej v tutoriálu HyperRogue!")
+
+S(
+  "This tour is mostly aimed to show what is "
+  "special about the geometry used by HyperRogue. "
+  "It also shows the basics of gameplay, and "
+  "how is it affected by geometry.",
  
  "Tento tutoriál je převážně zaměřen na to, aby ukázal, co je zvláštního "
  "na geometrii, kterou HyperRogue používá. Také ukazuje základy hry a to, "
-  "jak ji geometrie ovlivňuje.\n\n"
-  "Když si budeš chtít přestat hrát se současným \"snímkem\" a přejít na další, "
-  "stiskni Enter. Stiskem ESC můžeš také zobrazit menu s dalšími možnostmi.")
+  "jak ji geometrie ovlivňuje.")
 // FIX: tutorial changed to tour

 S("Basics of gameplay", "Základy hry")
--- a/language-fr.cpp
+++ b/language-fr.cpp
@@ -4938,32 +4938,36 @@ S("This guided tour is different than most other game tutorials -- "
  "We will not explain this land at the moment, and you could potentially "
  "get lost there.\n\n"
  "Remember that you can get to the next slide by pressing Enter.",
-  
+
  "Cette visite guidée est différente de la plupart des autres tutoriels de jeu -- "
  "vous n'avez pas besoin de faire quoi que se soit, et pouvez aller où vous voulez.\n\n"
  "Cependant, %le1 n'est pas ce dont on parle maintenant. Nous n'expliquerons pas ce "
  "pays maintenant, et vous pourriez vous y perdre.\n\n"
  "Rappelez vous que vous pouvez aller à la diapositive suivante en appuyant sur Entrée.")

-S("Introduction", "Introduction")
-S("Welcome to the HyperRogue Guided Tour!", "Bienvenue dans la visite guidée d'HyperRogue!")
 S(
-  "This tour is mostly aimed to show what is "
-  "special about the geometry used by HyperRogue. "
-  "It also shows the basics of gameplay, and "
-  "how is it affected by geometry.\n\n"
  "You decide when you want to stop playing with the "
  "current \"slide\" and go to the next one, by pressing Enter. You can also "
  "press ESC to see a "
  "menu with other options.",
+
+  "Vous décidez quand vous voulez arrêter de jouer avec la "
+  "\"diapositive\" actuelle et aller à la suivante, en appuyant sur Entrée. "
+  "Vous pouvez aussi appuyer ESC pour voir un menu avec d'autres options.")
+
+S("Introduction", "Introduction")
+S("Welcome to the HyperRogue Guided Tour!", "Bienvenue dans la visite guidée d'HyperRogue!")
+
+S(
+  "This tour is mostly aimed to show what is "
+  "special about the geometry used by HyperRogue. "
+  "It also shows the basics of gameplay, and "
+  "how is it affected by geometry.",
  
  "Cette visite a surtout pour but de montrer ce qui "
  "est spécial avec la géométrie utilisée par HyperRogue. "
  "Elle montre aussi les bases des mécaniques de jeu, et "
-  "comment il est affecté par la géométrie.\n\n"
-  "Vous décidez quand vous voulez arrêter de jouer avec la "
-  "\"diapositive\" actuelle et aller à la suivante, en appuyant sur Entrée. "
-  "Vous pouvez aussi appuyer ESC pour voir un menu avec d'autres options.")
+  "comment il est affecté par la géométrie.")

 S("Basics of gameplay", "Bases du jeu")
 S("gain Ice Diamonds", "gagnez des Diamants des glaces")
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -5070,24 +5070,26 @@ S("This guided tour is different than most other game tutorials -- "
  "i potencjalnie możesz się zgubić.\n\n"
  "Naciśnij Enter, by przejść do kolejnego slajdu.")

+S("You decide when you want to stop playing with the "
+  "current \"slide\" and go to the next one, by pressing Enter. You can also "
+  "press ESC to see a "
+  "menu with other options.",
+
+  "Ty decydujesz, kiedy chcesz skończyć bawić się obecnym \"slajdem\" "
+  "i przejść do kolejnego, naciskając Enter. Naciśnij ESC, by zobaczyć "
+  "pozostałe opcje.")
+
 S("Introduction", "Wstęp")
 S("Welcome to the HyperRogue Guided Tour!", "Witaj w Wycieczce HyperRogue!")
 S(
  "This tour is mostly aimed to show what is "
  "special about the geometry used by HyperRogue. "
  "It also shows the basics of gameplay, and "
-  "how is it affected by geometry.\n\n"
-  "You decide when you want to stop playing with the "
-  "current \"slide\" and go to the next one, by pressing Enter. You can also "
-  "press ESC to see a "
-  "menu with other options.",
+  "how is it affected by geometry.",
  
  "Zadaniem tej wycieczki jest pokazanie szczególnych własności "
  "geometrii używanej przez HyperRogue; są też pokazane podstawy "
-  "rozgrywki i jak geometria na nie wpływa.\n\n"
-  "Ty decydujesz, kiedy chcesz skończyć bawić się obecnym \"slajdem\" "
-  "i przejść do kolejnego, naciskając Enter. Naciśnij ESC, by zobaczyć "
-  "pozostałe opcje.")
+  "rozgrywki i jak geometria na nie wpływa.")

 S("Basics of gameplay", "Podstawy rozgrywki")
 S("gain Ice Diamonds", "daj Lodowe Diamenty")
--- a/language-ru.cpp
+++ b/language-ru.cpp
@@ -5179,30 +5179,33 @@ S("This guided tour is different than most other game tutorials -- "
  "We will not explain this land at the moment, and you could potentially "
  "get lost there.\n\n"
  "Remember that you can get to the next slide by pressing Enter.",
- 
+
  "Это руководство отличается от большинства других -- "
  "ты не обязан ничего делать, иди куда хочешь.\n\n"
  "Однако %1 -- не то, о чём мы сейчас говорим. Мы не будем сейчас "
  "объяснять эту землю, и ты можешь заблудиться в ней.\n\n"
  "Нажми Enter, чтобы перейти на следующий слайд.")
 
+S("You decide when you want to stop playing with the "
+  "current \"slide\" and go to the next one, by pressing Enter. You can also "
+  "press ESC to see a "
+  "menu with other options.",
+
+  "Ты можешь перейти на следующий \"слайд\", "
+  "нажав Enter. Нажми ESC, чтобы открыть меню с другими опциями.")
+// FIX: tutorial changed to tour
+
 S("Introduction", "Введение")
 S("Welcome to the HyperRogue Guided Tour!", "Добро пожаловать в руководство HyperRogue!")
 S(
  "This tour is mostly aimed to show what is "
  "special about the geometry used by HyperRogue. "
  "It also shows the basics of gameplay, and "
-  "how is it affected by geometry.\n\n"
-  "You decide when you want to stop playing with the "
-  "current \"slide\" and go to the next one, by pressing Enter. You can also "
-  "press ESC to see a "
-  "menu with other options.",
+  "how is it affected by geometry.\n\n",
 
  "Главная цель этого руководства -- показать особенности геометрии "
  "в HyperRogue. Также здесь объясняются основы игры, и как геометрия "
-  "на них влияет.\n\n"
-  "Ты можешь перейти на следующий \"слайд\", "
-  "нажав Enter. Нажми ESC, чтобы открыть меню с другими опциями.")
+  "на них влияет.\n\n")
 // FIX: tutorial changed to tour
 
 S("Basics of gameplay", "Начала игры")
--- a/language-zh.cpp
+++ b/language-zh.cpp
@@ -4588,20 +4588,24 @@ S("This guided tour is different than most other game tutorials -- "
  "不过，%1不是我们正在讨论的内容。我们暂时不会解释这一地域，你有可能会在其中迷路。\n\n"
  "请记住你可以通过按回车键切换到下一页。")

+S("You decide when you want to stop playing with the "
+  "current \"slide\" and go to the next one, by pressing Enter. You can also "
+  "press ESC to see a "
+  "menu with other options.",
+
+  "由你来决定何时结束游玩当前的“一页”，按回车切换到下一页。你也可以按ESC检视有其他选项的菜单。")
+
 S("Introduction", "介绍")
 S("Welcome to the HyperRogue Guided Tour!", "欢迎来到HyperRogue指南游览！")
+
+
 S(
  "This tour is mostly aimed to show what is "
  "special about the geometry used by HyperRogue. "
  "It also shows the basics of gameplay, and "
-  "how is it affected by geometry.\n\n"
-  "You decide when you want to stop playing with the "
-  "current \"slide\" and go to the next one, by pressing Enter. You can also "
-  "press ESC to see a "
-  "menu with other options.",
+  "how is it affected by geometry.",
  
-  "这场旅行主要是想向你展示HyperRogue所使用几何的特别之处。它也包括基本的游戏内容，以及游戏内容是如何受到几何影响的。\n\n"
-  "由你来决定何时结束游玩当前的“一页”，按回车切换到下一页。你也可以按ESC检视有其他选项的菜单。")
+  "这场旅行主要是想向你展示HyperRogue所使用几何的特别之处。它也包括基本的游戏内容，以及游戏内容是如何受到几何影响的。")

 S("Basics of gameplay", "游戏基础")
 S("gain Ice Diamonds", "获取冰钻")
--- a/tour.cpp
+++ b/tour.cpp
@@ -78,8 +78,8 @@ static constexpr flagtype NOTITLE = 256;
 static constexpr flagtype ALWAYS_TEXT = 256;
 /** \brief add a sidescreen to a normal screen */
 static constexpr flagtype SIDE = 512;
-/** \brief deck controls */
-static constexpr flagtype DECK_CONTROLS = 1024;
+/** \brief add a sidescreen to a normal screen */
+static constexpr flagtype TOUR_CONTROLS = 1024;
 #endif

 EX vector<reaction_t> restorers;
@@ -233,11 +233,17 @@ EX void slidehelp() {
    helptitle(XLAT(slidename), 0xFF8000) +
    XLAT(slides[currentslide].help);

-  if(dialog::display_keys == 3 && slides[currentslide].flags & DECK_CONTROLS)
-    help += "\n\n" + XLAT(
-      "This tour typically displays keys on the keyboard. "
-      "On the SteamDeck, you can press the Menu button to move to the next slide, "
-      "or the Ⓑ button to see a menu with other options.");
+  if(slides[currentslide].flags & TOUR_CONTROLS) {
+    if(dialog::display_keys == 3)
+      help += "\n\n" + XLAT(
+        "Press the Menu button to move to the next slide, "
+        "or the Ⓑ button to see a menu with other options.");
+    else help +=  "\n\n" + XLAT(
+     "You decide when you want to stop playing with the "
+     "current \"slide\" and go to the next one, by pressing Enter. You can also "
+     "press ESC to see a "
+     "menu with other options.");
+    }

  gotoHelp(help);
  presentation(pmHelpEx);
@@ -645,15 +651,11 @@ EX slide default_slides[] = {
      }
    },
 #endif
-  {"Introduction", 10, LEGAL::NONE | QUICKSKIP | DECK_CONTROLS,
+  {"Introduction", 10, LEGAL::NONE | QUICKSKIP | TOUR_CONTROLS,
    "This tour is mostly aimed to show what is "
    "special about the geometry used by HyperRogue. "
    "It also shows the basics of gameplay, and "
-    "how is it affected by geometry.\n\n"
-    "You decide when you want to stop playing with the "
-    "current \"slide\" and go to the next one, by pressing Enter. You can also "
-    "press ESC to see a "
-    "menu with other options.",
+    "how is it affected by geometry.",
    [] (presmode mode) {
      if(mode == pmStartAll) firstland = specialland = laIce;
      if(mode == 1) {