Add option to override lock symbol

otacke · Apr 10, 2024 · e8b1d84 · e8b1d84
1 parent a233dcf
commit e8b1d84
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 15 deletions.
diff --git a/language/.en.json b/language/.en.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Connected stages"
                   },

diff --git a/language/de.json b/language/de.json
@@ -112,10 +112,15 @@
                   {
                     "label": "Anzahl der Extrazeit in Sekunden",
                     "description": "Lege fest, wie viele Sekunden die Nutzenden für ihre Gesamtzeit erhalten, wenn sie diese Etappe öffnen."
-                  },                  {
+                  },
+                  {
                     "label": "Immer sichtbar",
                     "description": "Wenn gewählt, wird diese Etappe immer sichtbar sein. Dies gilt auch dann, wenn die Einstellungen zur Sichtreichweite der Karte anderes vorgeben."
                   },
+                  {
+                    "label": "Überschreibe das Schlosssymbol",
+                    "description": "Wenn gewählt, verwenden verschlossene Etappen nicht das Schlosssymbol, sondern das Symbol für den Spezialetappentyp."
+                  },
                   {
                     "label": "Verbundene Etappen"
                   },
@@ -305,8 +310,8 @@
               "description": "Wird abgespielt, wenn eine Aufgabe geöffnet wird."
             },
             {
-              "label": "Aufgabe geschlossen",
-              "description": "Wird abgespielt, wenn eine Aufgabe geschlossen wird."
+              "label": "Aufgabe verschlossen",
+              "description": "Wird abgespielt, wenn eine Aufgabeverschlossen ist."
             },
             {
               "label": "Zeige Dialog",

diff --git a/language/el.json b/language/el.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Συνδεδεμένα επίπεδα"
                   },

diff --git a/language/es-mx.json b/language/es-mx.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Etapas conectadas"
                   },

diff --git a/language/es.json b/language/es.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Etapas conectadas"
                   },

diff --git a/language/eu.json b/language/eu.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Lotutako etapak"
                   },

diff --git a/language/gl.json b/language/gl.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Etapas conectadas"
                   },

diff --git a/language/it.json b/language/it.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Connected stages"
                   },

diff --git a/language/lt.json b/language/lt.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Connected stages"
                   },

diff --git a/language/nl.json b/language/nl.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Verbonden fases"
                   },

diff --git a/language/sl.json b/language/sl.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "Povezane stopnje"
                   },

diff --git a/language/zh-cn.json b/language/zh-cn.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "连接的关卡"
                   },

diff --git a/language/zh-hans.json b/language/zh-hans.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "连接的关卡"
                   },

diff --git a/language/zh.json b/language/zh.json
@@ -117,6 +117,10 @@
                     "label": "Always visible",
                     "description": "If checked, this stage will always be visible, even if the map's visibility range settings dictate otherswise."
                   },
+                  {
+                    "label": "Override lock symbol",
+                    "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type."
+                  },
                   {
                     "label": "连接的关卡"
                   },

diff --git a/semantics.json b/semantics.json
@@ -280,6 +280,14 @@
                   "default": false,
                   "optional": true
                 },
+                {
+                  "name": "overrideSymbol",
+                  "type": "boolean",
+                  "label": "Override lock symbol",
+                  "description": "If checked, locked stages will not use the lock symbol, but the symbol for the special stage type.",
+                  "default": false,
+                  "optional": true
+                },
                 {
                   "name": "neighbors",
                   "type": "select",
@@ -1298,4 +1306,4 @@
       }
     ]
   }
-]
+]
diff --git a/src/scripts/models/stages.js b/src/scripts/models/stages.js
@@ -98,6 +98,7 @@ export default class Stages {
         visuals: this.params.visuals,
         visible: stageState?.visible,
         alwaysVisible: elementParams.alwaysVisible,
+        overrideSymbol: elementParams.overrideSymbol,
         ...(stageState?.state && { state: stageState?.state })
       };
 
@@ -127,17 +128,9 @@ export default class Stages {
         }
       };
 
-      let newStage;
-      if (!elementParams.specialStageType) {
-        newStage = new Stage(stageParams, stageCallbacks);
-      }
-      else {
-        if (stageParams.alwaysVisible) {
-          stageParams.overrideSymbol = true;
-        }
-
-        newStage = new SpecialStage(stageParams, stageCallbacks);
-      }
+      const newStage = (!elementParams.specialStageType) ?
+        new Stage(stageParams, stageCallbacks) :
+        new SpecialStage(stageParams, stageCallbacks);
 
       stages.push(newStage);
     }