Update Tutorial Structure

.idea/workspace.xml

@@ -3,10 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/Replay.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/Replay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/GameTutorial.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameTutorial.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -213,7 +213,7 @@
       <workItem from="1677563906178" duration="5318000" />
       <workItem from="1677572224495" duration="2432000" />
       <workItem from="1677595224096" duration="799000" />
-      <workItem from="1677674512203" duration="2230000" />
+      <workItem from="1677674512203" duration="3759000" />
     </task>
     <servers />
   </component>

Mario-AI-Interface/src/Play.java

@@ -26,6 +26,7 @@ public class Play {
         //FIXME: Debug Use
         //playGameMain("lvl1");
 
+
         playJavaGame();
         System.out.println("Java: Play Java Main Function Done");
     }

Mario-AI-Interface/src/engine/helper/Replay.java

@@ -29,7 +29,6 @@ public class Replay {
         byte[] content = new byte[events.size()];
         for (int i = 0; i < events.size(); i++) {
             boolean[] action = events.get(i).getActions();
-//            System.out.println(action);
             content[i] = serializeAction(action);
         }
         return content;

data/questionare.csv

@@ -208,3 +208,4 @@ IP,Style,Frequency,Age,Gender
 1,A,A,A,B,A,A,,
 2,A,A,A,A,A,A,,
 1,A,A,A,A,A,A,,
+1,A,A,A,A,A,A,,

main.py

@@ -53,7 +53,7 @@ def gamepreplay():
 
 @app.route('/gametutorial/<id>')
 def gametutorial(id):
-    return render_template('GameTutorial.html', tutorial=idm.addTutorial(id), next=idm.hasNextTutorial(id),
+    return render_template('GameTutorial.html', tutorial=idm.addTutorial(id), next=idm.hasNextTutorial(id),maxT=idm.tutorialMax,
                            control=idm.getControl(id))
 
 

templates/GameTutorial.html

@@ -213,9 +213,36 @@
         
         <div class="col-md-6" align="center" style="visibility: hidden;" id = "next">
           <br>
-          <button onclick="
+          <button onclick='
-          window.location.href = window.location.href; 
+                  //Init Cheerpj Framework
-          " class="cirButton"><h3>Repeat Tutorial</h3></button>
+            document.getElementById("game").style.visibility = "hidden";
+            document.getElementById("next").style.visibility = "hidden";
+
+
+          //var divElement = document.getElementById("GameWindow");
+          tutorialId = tutorialId+1
+          var level = "t"+tutorialId;
+          var img=document.getElementById("windowshow");
+
+          GameLoad().then(function(){
+              console.log("Cheerpj Initialize Succeed!");
+              document.getElementById("loading").style.visibility = "hidden";
+          })
+
+          var control = ("{{control}}" == "1");
+
+        PlayLevel(level,control)
+          .then(function (){
+            //play next?
+            if (tutorialId<parseInt("{{maxT}}")){
+              document.getElementById("next").style.visibility = "visible";
+            }
+              document.getElementById("game").style.visibility = "visible";
+
+          });
+
+
+          ' class="cirButton"><h3>Repeat Tutorial</h3></button>
         </div>
         <div class="col-md-6" align="center" style="visibility: hidden;" id = "game">
           <br>
@@ -226,20 +253,13 @@
 
         <script>
           //Init Cheerpj Framework
-
-
           cheerpjInit();
+
           var divElement = document.getElementById("GameWindow");
+          var tutorialId = parseInt("{{tutorial}}")
           var level = "t"+"{{tutorial}}";
           var img=document.getElementById("windowshow");
 
-            if ("{{next}}"=="1"){
-              img.style.visibility= "visible";
-            }else{
-              img.style.visibility= "hidden";
-            }
-         
-
           cheerpjCreateDisplay(500,500,divElement);
           cheerpjRunMain("Play", "/app/Mario-AI-Interface.jar", "0", "f_l");
 
@@ -253,7 +273,7 @@
         PlayLevel(level,control)
           .then(function (){
             //play next?
-            if ("{{next}}"=="1"){
+            if (tutorialId<parseInt("{{maxT}}")){
               document.getElementById("next").style.visibility = "visible";
             }
               document.getElementById("game").style.visibility = "visible";