Fix Incorrect Game Selection

Fix incorrect game being selected occasionally when returning from a game.
Occurs because the game selection animations' path changes persist on reloading a scene.

Author: LifeHckr

HellHole/HellHole.tscn

@@ -0,0 +1,3 @@
+[gd_scene format=3 uid="uid://do3jinnfccsjs"]
+
+[node name="HellHole" type="Node2D"]

TitleScreen/GameTurnTable.cs

@@ -31,6 +31,7 @@ public override void _Ready()
             sprite.Play();
         }
 
+        ResetAnimPaths();
         _animationPlayer.AnimationFinished += OnAnimFinished;
     }
 
@@ -88,4 +89,15 @@ public void OnAnimFinished(StringName animName)
         _sliding = false;
         GD.Print("Current Selection is " + _animatedNames[_currentSelection]);
     }
+
+    private void ResetAnimPaths() //I feel like animation path changes shouldn't persist on reloading a scene. Workaround for now.
+    {
+        for (int i = 0; i < _animationPlayer.GetAnimation("Master").GetTrackCount(); i++)
+        {
+            NodePath path = _animationPlayer.GetAnimation("Master").TrackGetPath(i);
+            _animationPlayer.GetAnimation("GameSlidesRev").TrackSetPath(i, path);
+            _animationPlayer.GetAnimation("GameSlidesFor").TrackSetPath(i, path);
+        }
+    }
+
 }

TitleScreen/TitleScreen.cs

@@ -31,6 +31,8 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
+        _timer.Start();
+
         if (@event.IsActionPressed("ButtonA") && !_isScreensaverActive)
         {
             GetTree().ChangeSceneToFile( _buttonSceneMap[_gameTurnTable.GetCurrentSelection()]);
@@ -41,6 +43,10 @@ public override void _Input(InputEvent @event)
             return; // These are the only events that should reset the screensaver. Doing this bc I think the touch screen is causing issues
         }
 
+        if (@event.IsActionPressed("Mute")) //Non-reversible, mainly to not go insane while testing.
+        {
+            AudioServer.SetBusMute(AudioServer.GetBusIndex("Master"), true);
+        }
 
         if (_isScreensaverActive)
         {
@@ -49,7 +55,6 @@ public override void _Input(InputEvent @event)
             _screensaverNode.Visible = false;
         }
 
-        _timer.Start();
     }
 
     private void _startScreensaver()

TitleScreen/TitleScreen.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=3 uid="uid://nd7ukwmx7jhi"]
+[gd_scene load_steps=18 format=3 uid="uid://nd7ukwmx7jhi"]
 
 [ext_resource type="Script" uid="uid://b1wukt21q1qto" path="res://TitleScreen/TitleScreen.cs" id="1_uidrc"]
 [ext_resource type="Shader" uid="uid://c24kwaabn8wdb" path="res://TitleScreen/TitleScreen.gdshader" id="2_g0pfn"]
@@ -19,7 +19,58 @@ shader_parameter/scanline_intensity = 0.5
 shader_parameter/chromatic_aberration_strength = 0.005
 shader_parameter/chromatic_aberration_direction = Vector2(1, 0)
 
-[sub_resource type="Animation" id="Animation_4x3tk"]
+[sub_resource type="Animation" id="Animation_70hon"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("CurrentGame:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(640, 480)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("PrevGame:position")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(-130, 480)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("NextGame:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(1410, 480)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("SlideIn:position")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(2180, 480)]
+}
+
+[sub_resource type="Animation" id="Animation_mhd54"]
 resource_name = "GameSlides"
 length = 0.5
 step = 0.5
@@ -72,7 +123,7 @@ tracks/3/keys = {
 "values": [Vector2(-130, 480), Vector2(-900, 480)]
 }
 
-[sub_resource type="Animation" id="Animation_j3fyg"]
+[sub_resource type="Animation" id="Animation_j8ysg"]
 resource_name = "GameSlidesRev"
 length = 0.5
 step = 0.5
@@ -125,61 +176,64 @@ tracks/3/keys = {
 "values": [Vector2(-130, 480), Vector2(640, 480)]
 }
 
-[sub_resource type="Animation" id="Animation_70hon"]
-length = 0.001
+[sub_resource type="Animation" id="Animation_eufha"]
+resource_name = "GameSlides"
+length = 0.5
+step = 0.5
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/path = NodePath("CurrentGame:position")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(640, 480)]
+"values": [Vector2(640, 480), Vector2(-130, 480)]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
 tracks/1/enabled = true
-tracks/1/path = NodePath("PrevGame:position")
+tracks/1/path = NodePath("NextGame:position")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(-130, 480)]
+"values": [Vector2(1410, 480), Vector2(640, 480)]
 }
 tracks/2/type = "value"
 tracks/2/imported = false
 tracks/2/enabled = true
-tracks/2/path = NodePath("NextGame:position")
+tracks/2/path = NodePath("SlideIn:position")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(1410, 480)]
+"values": [Vector2(2180, 480), Vector2(1410, 480)]
 }
 tracks/3/type = "value"
 tracks/3/imported = false
 tracks/3/enabled = true
-tracks/3/path = NodePath("SlideIn:position")
+tracks/3/path = NodePath("PrevGame:position")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
+"times": PackedFloat32Array(0, 0.5),
+"transitions": PackedFloat32Array(1, 1),
 "update": 0,
-"values": [Vector2(2180, 480)]
+"values": [Vector2(-130, 480), Vector2(-900, 480)]
 }
 
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_70hon"]
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_eufha"]
 _data = {
-&"GameSlidesFor": SubResource("Animation_4x3tk"),
-&"GameSlidesRev": SubResource("Animation_j3fyg"),
+&"GameSlidesFor": SubResource("Animation_mhd54"),
+&"GameSlidesRev": SubResource("Animation_j8ysg"),
+&"Master": SubResource("Animation_eufha"),
 &"RESET": SubResource("Animation_70hon")
 }
 
@@ -336,7 +390,7 @@ frame_progress = 0.567812
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="GameTurnTable"]
 libraries = {
-&"": SubResource("AnimationLibrary_70hon")
+&"": SubResource("AnimationLibrary_eufha")
 }
 
 [node name="Timer" type="Timer" parent="."]

project.godot

@@ -95,6 +95,11 @@ prank={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":80,"key_label":0,"unicode":112,"location":0,"echo":false,"script":null)
 ]
 }
+Mute={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":77,"key_label":0,"unicode":109,"location":0,"echo":false,"script":null)
+]
+}
 
 [rendering]