From 4ce465effb6153ebb5b7b72574bc2f62b323c39e Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Thu, 20 Aug 2020 21:57:34 +0200
Subject: [PATCH] Flatfish rotation bug fix attempt

---
 scenes/game1.tscn            | 8 ++++----
 scripts/game1/Game1Script.gd | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scenes/game1.tscn b/scenes/game1.tscn
index c3d7605..945422a 100644
--- a/scenes/game1.tscn
+++ b/scenes/game1.tscn
@@ -34,7 +34,7 @@ extents = Vector2( 13.4499, 41.9587 )
 [sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 6.44203, 23.0973 )
 
-[sub_resource type="Shader" id=14]
+[sub_resource type="Shader" id=5]
 code = "shader_type canvas_item;
 uniform sampler2D tex_frg_3;
 uniform sampler2D tex_frg_7;
@@ -100,8 +100,8 @@ void light() {
 "
 custom_defines = ""
 
-[sub_resource type="ShaderMaterial" id=13]
-shader = SubResource( 14 )
+[sub_resource type="ShaderMaterial" id=6]
+shader = SubResource( 5 )
 
 [node name="Node2D" type="Node2D"]
 script = ExtResource( 3 )
@@ -207,7 +207,7 @@ frames = ExtResource( 12 )
 centered = false
 
 [node name="OpeningOver" type="AnimatedSprite" parent="Opening1"]
-material = SubResource( 13 )
+material = SubResource( 6 )
 frames = ExtResource( 1 )
 centered = false
 
diff --git a/scripts/game1/Game1Script.gd b/scripts/game1/Game1Script.gd
index c76ffc3..014566b 100644
--- a/scripts/game1/Game1Script.gd
+++ b/scripts/game1/Game1Script.gd
@@ -33,6 +33,7 @@ func _ready():
 	assert(dialogue != null)
 	
 	if skipToLevel != '':
+		can_leave = true
 		$Opening1.queue_free()
 		start_game()
 		while levels[current_level] != skipToLevel:
@@ -296,5 +297,7 @@ func interact():
 		
 		fish.disappear()
 	
+	player.rotation_degrees = fmod(player.rotation_degrees, 360.0)
+	
 	is_interacting = false
 	if fish != null: interact()