Merge pull request #5 from pigdevstudio/development

Fixed transition making game crash

Author: henriiquecampos

Actors/Astromouse/Astromouse.tscn

@@ -9,7 +9,7 @@
 custom_solver_bias = 0.0
 extents = Vector2( 24.8363, 35.3636 )
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=2]
 
 length = 1.0
 loop = false
@@ -35,7 +35,7 @@ tracks/1/keys = {
 "values": [ Vector2( 0.7, 0.7 ), Vector2( 1e-05, 1e-05 ) ]
 }
 
-[sub_resource type="Animation" id=4]
+[sub_resource type="Animation" id=3]
 
 length = 0.5
 loop = false
@@ -51,7 +51,7 @@ tracks/0/keys = {
 "values": [ 2, 4, 3 ]
 }
 
-[sub_resource type="Animation" id=5]
+[sub_resource type="Animation" id=4]
 
 length = 0.4
 loop = true
@@ -121,23 +121,23 @@ _update_shape_index = 0
 playback/process_mode = 1
 playback/default_blend_time = 0.0
 root/root = NodePath("..")
-anims/death = SubResource( 3 )
-anims/jumping = SubResource( 4 )
-anims/walking = SubResource( 5 )
+anims/death = SubResource( 2 )
+anims/jumping = SubResource( 3 )
+anims/walking = SubResource( 4 )
 playback/active = true
 playback/speed = 0.9
 blend_times = [  ]
 autoplay = ""
 
-[node name="Invulnerability" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="."]
 
 process_mode = 1
 wait_time = 1.3
 one_shot = true
-autostart = false
+autostart = true
 
 [connection signal="body_enter" from="." to="." method="_body_enter"]
 
-[connection signal="timeout" from="Invulnerability" to="." method="_on_invulnerability_timeout"]
+[connection signal="timeout" from="Timer" to="." method="_invulnerability"]
 
 

Actors/Astromouse/astromouse.gd

@@ -4,15 +4,13 @@ signal died
 signal finished_sfx
 export (float) var jump_force = 300
 var can_jump = true
-var invulnerable = false
+var invulnerable = true
 var jump_normal = Vector2(0, -1)
 onready var default_gravity_scale = get_gravity_scale()
 
 func _ready():
 	if acheesements.dict["mooncheeser"].accomplished >= acheesements.dict["mooncheeser"].total:
 		get_node("Sprite").set_texture(load("res://Actors/Astromouse/true_astro_spritesheet.png"))
-	invulnerable = true
-	get_node("Invulnerability").start()
 	set_fixed_process(true)
 	connect("died", get_parent().get_parent(), "change_to_next_scene", ["res://Screens/Score_Screen/ScoreScreen.tscn"])
 
@@ -52,7 +50,6 @@ func _body_enter( body ):
 		get_node("SFX").emit_signal("is_playing", "pickup")
 		body.increase_score()
 
-		
 func is_falling():
 	if get_parent().get_game_state() == 0:
 		var normal = (get_node("../Moon").get_pos() - get_pos()).normalized()
@@ -67,5 +64,5 @@ func is_falling():
 		else:
 			return(false)
 
-func _on_invulnerability_timeout():
-	invulnerable = false
+func _invulnerability():
+	invulnerable = false

Levels/level_0-0.tscn

@@ -284,3 +284,4 @@ layer = -2
 [connection signal="timeout" from="RightCometSpawner/Timer" to="RightCometSpawner" method="_spawn"]
 
 
+[editable path="Astromouse"]

Screens/Achievements_Screen/dialog_handler.gd

@@ -2,7 +2,6 @@ extends Control
 onready var popup = get_parent().get_node("Panel")
 func _ready():
 	acheesements.read_achievements()
-	skins.read_skins()
 
 func call_popup(achievement):
 	var title = acheesements.dict[achievement].name

Screens/Play_Screen/PlayScreen.tscn

@@ -40,7 +40,6 @@ transform/pos = Vector2( 0, 1.36035 )
 
 [node name="Astromouse" parent="Level_0-0"]
 
-editor/display_folded = true
 transform/pos = Vector2( 640.77, 309.149 )
 z/z = 1
 

Screens/Title_Screen/TitleScreen.tscn

@@ -35,7 +35,6 @@ script/script = ExtResource( 2 )
 
 [node name="ScreenMargin" type="MarginContainer" parent="."]
 
-editor/display_folded = true
 anchor/left = 3
 anchor/top = 3
 anchor/right = 3
@@ -66,7 +65,6 @@ visibility/visible = false
 
 [node name="ScreenPortions" type="HBoxContainer" parent="ScreenMargin"]
 
-editor/display_folded = true
 focus/ignore_mouse = false
 focus/stop_mouse = false
 size_flags/horizontal = 2

Screens/Transition.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://icon.png" type="Texture" id=1]
 
-[sub_resource type="Animation" id=6]
+[sub_resource type="Animation" id=1]
 
 resource/name = "fade"
 length = 1.0
@@ -21,6 +21,7 @@ tracks/0/keys = {
 
 [node name="Transition" type="Sprite"]
 
+visibility/opacity = 0.0
 transform/pos = Vector2( -162.378, -95.769 )
 transform/scale = Vector2( 25.0618, 14.7812 )
 z/z = 10
@@ -33,10 +34,10 @@ modulate = Color( 0, 0, 0, 1 )
 playback/process_mode = 1
 playback/default_blend_time = 0.0
 root/root = NodePath("..")
-anims/fade = SubResource( 6 )
+anims/fade = SubResource( 1 )
 playback/active = true
 playback/speed = 1.0
 blend_times = [  ]
-autoplay = "fade"
+autoplay = ""
 
 

Screens/abstract_screen.gd

@@ -3,14 +3,10 @@ extends Control
 var s = load("res://Screens/Title_Screen/TitleScreen.tscn")
 
 func _ready():
-	transition.get_node("Animator").play_backwards("fade")
-	yield(transition.get_node("Animator"), "finished")
-	transition.hide()
 	set_aspect()
 
 func change_to_next_scene(scene = s):
-	transition.show()
-	transition.get_node("Animator").play("fade")
+	transition.get_node("Animator").play_backwards("fade")
 	if typeof(scene) == TYPE_STRING:
 		get_tree().change_scene(scene)
 	else:

Skins.tscn

@@ -35,7 +35,6 @@ func write_achievements():
 		file.open("user://achievements.json", file.WRITE)
 		file.store_string(dict.to_json())
 		file.close()
-	skins.write_skins()
 
 func modify_achievement(achievement, value):
 	if value == 0: