fix: logChoices was not being used

lunafromthemoon · Feb 15, 2022 · d5c541f · d5c541f
1 parent 561fbd5
commit d5c541f
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 7 deletions.
diff --git a/dev-only/assets/gui/en/langbtn.png b/dev-only/assets/gui/en/langbtn.png
diff --git a/dev-only/assets/gui/es/langbtn.png b/dev-only/assets/gui/es/langbtn.png
diff --git a/dev-only/i18n.html b/dev-only/i18n.html
@@ -5,6 +5,7 @@
 		<title> RenJS </title>
 		<script type="text/javascript" src="renjs.js"></script>
 		<script src="story/i18n/boot.js"></script>
+		<script src="plugins/ChangeLang.js"></script>
 	</head>
 	<body style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px;margin-right: 0px;">
 	</body>

diff --git a/dev-only/plugins/ChangeLang.js b/dev-only/plugins/ChangeLang.js
@@ -0,0 +1,12 @@
+class ChangeLang extends RenJS.Plugin {
+
+	onInit(params) {
+		this.game.gui.bindingActions['changeLang'] = async ()=>{
+            // remove saved lang setting and reload page
+			localStorage.removeItem('RenJS_I18N' + this.game.config.name);
+			location.reload(); 
+        }
+	}
+}
+
+RenJSGame.addPlugin('ChangeLang',ChangeLang)
diff --git a/dev-only/story/i18n/en/Accessibility.yaml b/dev-only/story/i18n/en/Accessibility.yaml
@@ -3,6 +3,7 @@
 buttons:
   openMenu saveload: save/load
   openMenu settings: settings
+  changeLang: change language
 # Replacements for accessible slider labels
 # the default labels will be the internal binding + user preference keys
 sliders:

diff --git a/dev-only/story/i18n/en/GUI.yaml b/dev-only/story/i18n/en/GUI.yaml
@@ -93,6 +93,15 @@ config:
         'y': 506
         x: 616
         assetType: spritesheets
+      - id: langbtn
+        sfx: none
+        slot: '0'
+        binding: changeLang
+        height: '82'
+        width: '313'
+        'y': 506
+        x: 266
+        assetType: spritesheets
     sliders:
       - id: asset12
         binding: bgmv
@@ -388,6 +397,11 @@ assets:
       fileName: saveloadasset17.png
       w: 163
       h: 82
+    langbtn:
+      name: langbtn
+      fileName: en/langbtn.png
+      w: 313
+      h: 82
     asset21:
       name: asset21
       fileName: hudasset21.png

diff --git a/dev-only/story/i18n/es/Accessibility.yaml b/dev-only/story/i18n/es/Accessibility.yaml
@@ -6,6 +6,7 @@ buttons:
   start: iniciar
   return: volver
   skip: saltarse
+  changeLang: cambiar idioma
   save 0: guardar 0
   save 1: guardar 1
   save 2: guardar 2

diff --git a/dev-only/story/i18n/es/GUI.yaml b/dev-only/story/i18n/es/GUI.yaml
@@ -100,6 +100,15 @@ config:
         'y': '506'
         x: '616'
         assetType: spritesheets
+      - id: langbtn
+        sfx: none
+        slot: '0'
+        binding: changeLang
+        height: '82'
+        width: '313'
+        'y': 506
+        x: 266
+        assetType: spritesheets
     sliders:
       - id: asset12
         binding: bgmv
@@ -443,6 +452,11 @@ assets:
       fileName: es/saveloadasset53.png
       w: 145
       h: 52
+    langbtn:
+      name: langbtn
+      fileName: es/langbtn.png
+      w: 313
+      h: 82
   fonts:
     fontsaudimat-mono:
       fileName: fontsfontsaudimat-mono.ttf

diff --git a/docs/examples/assets/gui/en/langbtn.png b/docs/examples/assets/gui/en/langbtn.png
diff --git a/docs/examples/assets/gui/es/langbtn.png b/docs/examples/assets/gui/es/langbtn.png
diff --git a/docs/examples/i18n.html b/docs/examples/i18n.html
@@ -267,5 +267,6 @@ <h4 class="accordion-item__label"></h4>
 	<script type="text/javascript" src="../assets/js/tabs.js"></script>
 	<script src="/downloads/releases/renjs.js"></script>
 	<script src="i18n/boot.js"></script>
+  <script src="i18n/ChangeLang.js"></script>
 
 </html>
diff --git a/docs/examples/i18n/ChangeLang.js b/docs/examples/i18n/ChangeLang.js
@@ -0,0 +1,12 @@
+class ChangeLang extends RenJS.Plugin {
+
+	onInit(params) {
+		this.game.gui.bindingActions['changeLang'] = async ()=>{
+            // remove saved lang setting and reload page
+			localStorage.removeItem('RenJS_I18N' + this.game.config.name);
+			location.reload(); 
+        }
+	}
+}
+
+RenJSGame.addPlugin('ChangeLang',ChangeLang)
diff --git a/docs/examples/i18n/en/GUI.yaml b/docs/examples/i18n/en/GUI.yaml
@@ -93,6 +93,15 @@ config:
         'y': 506
         x: 616
         assetType: spritesheets
+      - id: langbtn
+        sfx: none
+        slot: '0'
+        binding: changeLang
+        height: '82'
+        width: '313'
+        'y': 506
+        x: 266
+        assetType: spritesheets
     sliders:
       - id: asset12
         binding: bgmv
@@ -388,6 +397,11 @@ assets:
       fileName: saveloadasset17.png
       w: 163
       h: 82
+    langbtn:
+      name: langbtn
+      fileName: en/langbtn.png
+      w: 313
+      h: 82
     asset21:
       name: asset21
       fileName: hudasset21.png

diff --git a/docs/examples/i18n/es/GUI.yaml b/docs/examples/i18n/es/GUI.yaml
@@ -100,6 +100,15 @@ config:
         'y': '506'
         x: '616'
         assetType: spritesheets
+      - id: langbtn
+        sfx: none
+        slot: '0'
+        binding: changeLang
+        height: '82'
+        width: '313'
+        'y': 506
+        x: 266
+        assetType: spritesheets
     sliders:
       - id: asset12
         binding: bgmv
@@ -133,8 +142,8 @@ config:
     message-box:
       id: asset19
       text-width: '540'
-      offset-y: '24'
-      offset-x: '24'
+      offset-y: '16'
+      offset-x: '16'
       align: left
       color: '#89BAA8'
       font: fontsaudimat-mono
@@ -443,6 +452,11 @@ assets:
       fileName: es/saveloadasset53.png
       w: 145
       h: 52
+    langbtn:
+      name: langbtn
+      fileName: es/langbtn.png
+      w: 313
+      h: 82
   fonts:
     fontsaudimat-mono:
       fileName: fontsfontsaudimat-mono.ttf

diff --git a/src/gui/RJSHUD.ts b/src/gui/RJSHUD.ts
@@ -148,8 +148,8 @@ export default class RJSHUD extends RJSMenu {
         visualChoice.anchor.set(0.5);
         visualChoice.updateTransform();
         this.visualChoices.addChild(visualChoice);
-        if (choice.previouslyChosen){
-            visualChoice.tint = Color.hexToRGB(defaultChoicesConfig.chosenColor);
+        if (this.game.storyConfig.logChoices && defaultChoicesConfig.chosenColor && choice.previouslyChosen){
+            visualChoice.tint = Color.hexToColor(this.config.chosenColor).color;
         }
         return visualChoice;
     }

diff --git a/src/gui/elements/ChoiceHandler.ts b/src/gui/elements/ChoiceHandler.ts
@@ -103,8 +103,8 @@ export default class ChoiceHandler extends Graphics {
         text.setText(setTextStyles(choice.choiceText,text), true);
         chBox.addChild(text);
 
-        if (choice.previouslyChosen){
-            chBox.tint = Color.hexToRGB(this.config.chosenColor);
+        if (this.game.storyConfig.logChoices && this.config.chosenColor && choice.previouslyChosen){
+            chBox.tint = Color.hexToColor(this.config.chosenColor).color;
         }
         return chBox;
     }

diff --git a/src/gui/elements/NameBox.ts b/src/gui/elements/NameBox.ts
@@ -40,7 +40,7 @@ export default class NameBox extends Sprite {
         this.text.setText(text, true);
         this.text.updateTransform();
         if (this.config.tintStyle === 'box'){
-            this.tint = Color.hexToRGB(color);
+            this.tint = Color.hexToColor(color).color;
         } else {
             // change name color
             this.text.fill = color;