Merge pull request #299 from TruncateGame/feat/rule-events

Rule events + return of the tutorial menu

Author: bglw

truncate_client/src/regions/rules.rs

@@ -398,6 +398,8 @@ impl RulesState {
                 .centered_button(theme.button_emphasis, theme.text, &self.map_texture, ui)
                 .clicked()
             {
+                self.event_dispatcher
+                    .event(format!("tutorial_core_rules_go_puzzle"));
                 action = Some(RuleCardAction::DailyPuzzle);
             }
             ui.add_space(text_padding * 2.0);
@@ -407,6 +409,8 @@ impl RulesState {
                 .centered_button(theme.water.lighten(), theme.text, &self.map_texture, ui)
                 .clicked()
             {
+                self.event_dispatcher
+                    .event(format!("tutorial_core_rules_go_tutorial"));
                 action = Some(RuleCardAction::Tutorial);
             }
 
@@ -415,6 +419,8 @@ impl RulesState {
                 .centered_button(theme.water.lighten(), theme.text, &self.map_texture, ui)
                 .clicked()
             {
+                self.event_dispatcher
+                    .event(format!("tutorial_core_rules_go_menu"));
                 back_to_menu();
             }
             ui.add_space(text_padding);

web_client/src/_includes/page.html

@@ -560,27 +560,23 @@ <h2>Many thanks to the word data sources:</h2>
                         });
 
                         if (has_played_tut) {
-                          this.button("Learn To Play", () => {
-                              localStorage.setItem("tutorial_played", "true");
-                              truncate_runner.join_game('RULE_CARD');
+                          this.button("Tutorials", () => {
+                              this.learnStage();
                           });
-                          // Uncomment if adding back a second tutorial
-                          // this.button("Tutorials", () => {
-                          //     this.learnStage();
-                          // });
                         }
                     }
 
                     learnStage() {
                         this.reset();
 
-                        this.button("Learn To Play", () => {
+                        this.button("Quick Start", () => {
                             localStorage.setItem("tutorial_played", "true");
-                            truncate_runner.join_game('TUTORIAL_RULES');
+                            truncate_runner.join_game('RULE_CARD');
                         });
 
-                        this.button("Example Game", () => {
-                            truncate_runner.join_game('TUTORIAL_EXAMPLE');
+                        this.button("Interactive Tutorial", () => {
+                            localStorage.setItem("tutorial_played", "true");
+                            truncate_runner.join_game('TUTORIAL_RULES');
                         });
 
                         this.backButton();