From f76b5c0eabd284fc2faec51a27adfbc8f092e5fa Mon Sep 17 00:00:00 2001
From: maylokana <88361930+maylokana@users.noreply.github.com>
Date: Sun, 2 Oct 2022 00:34:42 -0500
Subject: [PATCH] v0.3.1

---
 AM2R.project.gmx                 |  1 +
 objects/oDemoPlayback.object.gmx | 56 ++++++++++++++++++++++++++++++++
 objects/oSkipMain.object.gmx     |  2 +-
 objects/oTTSpace.object.gmx      |  2 ++
 scripts/convert_level.gml        | 10 +++---
 scripts/split_object_string.gml  |  2 +-
 6 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 objects/oDemoPlayback.object.gmx

diff --git a/AM2R.project.gmx b/AM2R.project.gmx
index 14f7783..d560d52 100644
--- a/AM2R.project.gmx
+++ b/AM2R.project.gmx
@@ -5455,6 +5455,7 @@
       <object>objects\oEditorInfo</object>
       <object>objects\oEditorHelp</object>
       <object>objects\oDemoRecord</object>
+      <object>objects\oDemoPlayback</object>
       <object>objects\oTTAmmoField</object>
       <object>objects\oTTHealField</object>
     </objects>
diff --git a/objects/oDemoPlayback.object.gmx b/objects/oDemoPlayback.object.gmx
new file mode 100644
index 0000000..bb7208e
--- /dev/null
+++ b/objects/oDemoPlayback.object.gmx
@@ -0,0 +1,56 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<object>
+  <spriteName>&lt;undefined&gt;</spriteName>
+  <solid>0</solid>
+  <visible>-1</visible>
+  <depth>0</depth>
+  <persistent>0</persistent>
+  <parentName>&lt;undefined&gt;</parentName>
+  <maskName>&lt;undefined&gt;</maskName>
+  <events>
+    <event eventtype="0" enumb="0">
+      <action>
+        <libid>1</libid>
+        <id>603</id>
+        <kind>7</kind>
+        <userelative>0</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>2</exetype>
+        <functionname></functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>0</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>1</kind>
+            <string>demo_valid = 1;
+demo_inputs = 0;
+
+demo_uppr = 0;
+demo_dnpr = 0;
+demo_rtpr = 0;
+demo_lfpr = 0;
+
+demo_frpr = 0;
+demo_jppr = 0;
+</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+  </events>
+  <PhysicsObject>0</PhysicsObject>
+  <PhysicsObjectSensor>0</PhysicsObjectSensor>
+  <PhysicsObjectShape>0</PhysicsObjectShape>
+  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
+  <PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
+  <PhysicsObjectGroup>0</PhysicsObjectGroup>
+  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
+  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
+  <PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
+  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
+  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
+  <PhysicsShapePoints/>
+</object>
diff --git a/objects/oSkipMain.object.gmx b/objects/oSkipMain.object.gmx
index 8fb7001..e6eb77c 100644
--- a/objects/oSkipMain.object.gmx
+++ b/objects/oSkipMain.object.gmx
@@ -25,7 +25,7 @@
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>global.tt_vers = "v0.3";
+            <string>global.tt_vers = "v0.3.1";
 global.tt_verr = 2;
 if (global.skip_mMenu == 1){ // skip to trial select
     room_change(trialselectroom,0);
diff --git a/objects/oTTSpace.object.gmx b/objects/oTTSpace.object.gmx
index c79de4b..2f3a6f8 100644
--- a/objects/oTTSpace.object.gmx
+++ b/objects/oTTSpace.object.gmx
@@ -49,6 +49,8 @@
           <argument>
             <kind>1</kind>
             <string>audio_stop_sound(sndMessage);
+audio_stop_sound(sndSpinJump);
+audio_stop_sound(sndScrewAttack);
 sfx_play(sndMessage);
 make_notification("New Item","Space Jump Acquired",140,"","");
 global.spacejump = 1;
diff --git a/scripts/convert_level.gml b/scripts/convert_level.gml
index 0c5dfea..06d8846 100644
--- a/scripts/convert_level.gml
+++ b/scripts/convert_level.gml
@@ -1,5 +1,5 @@
 //convert_level(filename);
-show_debug_message("Attempting to convert level "+string(argument0));
+//show_debug_message("Attempting to convert level "+string(argument0));
 var ver_num = -1;
 var file_check = file_text_open_read("stages/"+argument0); // open file for checking version
 if (file_text_read_string(file_check) == "==== AM2R TIME TRIALS ===="){ // v0.3+
@@ -11,17 +11,17 @@ if (file_text_read_string(file_check) == "==== AM2R TIME TRIALS ===="){ // v0.3+
 file_text_close(file_check);
 
 if (ver_num > global.tt_verr){
-    show_debug_message("Level version is higher than game version! Aborting..");
+    //show_debug_message("Level version is higher than game version! Aborting..");
     exit;
 }
 
 if (ver_num == global.tt_verr){
-    show_debug_message("Level version is same as game version. Aborting..");
+    //show_debug_message("Level version is same as game version. Aborting..");
     exit;
 }
 
 if (ver_num < 2){ // v0.1/v0.2 conversions
-    show_debug_message("Converting file using v0.1/v0.2 to v0.3 conversion");
+    //show_debug_message("Converting file using v0.1/v0.2 to v0.3 conversion");
     var file1 = file_text_open_read("stages/"+argument0); // read file (for file 2)
     var file2 = file_text_open_write("stages/"+argument0); // write file
     
@@ -66,4 +66,4 @@ if (ver_num < 2){ // v0.1/v0.2 conversions
     file_text_close(file2); // overwrite file1 with file2
 }
 
-show_debug_message("Conversion complete");
+//show_debug_message("Conversion complete");
diff --git a/scripts/split_object_string.gml b/scripts/split_object_string.gml
index 071ad76..a36191d 100644
--- a/scripts/split_object_string.gml
+++ b/scripts/split_object_string.gml
@@ -11,4 +11,4 @@ for (var i = 1; i < string_length(argument0)+1; ++i;){
     }
 }
 
-show_debug_message(argument0+" -> '"+s_part[0]+","+s_part[1]+","+s_part[2]+"'");
+//show_debug_message(argument0+" -> '"+s_part[0]+","+s_part[1]+","+s_part[2]+"'");