Merge branch 'imp/color-death'

Resources/Images/crash.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/crash.png-980821fbf9675e1af92728e819feef06.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Resources/Images/crash.png"
+dest_files=[ "res://.import/crash.png-980821fbf9675e1af92728e819feef06.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Resources/TileSetClassic.tres

@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=5 format=2]
+[gd_resource type="TileSet" load_steps=4 format=2]
 
 [ext_resource path="res://Resources/Images/tiles_classic.png" type="Texture" id=1]
 
@@ -6,9 +6,6 @@
 points = PoolVector2Array( 0, 0, 64, 0, 64, 64, 0, 64 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
-points = PoolVector2Array( 64, 64, 0, 64, 0, 0, 64, 0 )
-
-[sub_resource type="ConvexPolygonShape2D" id=3]
 points = PoolVector2Array( 0, 0, 64, 0, 64, 64, 0, 64 )
 
 [resource]
@@ -38,22 +35,6 @@ points = PoolVector2Array( 0, 0, 64, 0, 64, 64, 0, 64 )
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 1/z_index = 0
-2/name = "death"
-2/texture = ExtResource( 1 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 0, 64, 64, 64 )
-2/tile_mode = 0
-2/occluder_offset = Vector2( 0, 0 )
-2/navigation_offset = Vector2( 0, 0 )
-2/shapes = [ {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 2 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-2/z_index = 0
 3/name = "slow"
 3/texture = ExtResource( 1 )
 3/tex_offset = Vector2( 0, 0 )
@@ -66,7 +47,7 @@ points = PoolVector2Array( 0, 0, 64, 0, 64, 64, 0, 64 )
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
-"shape": SubResource( 3 ),
+"shape": SubResource( 2 ),
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 3/z_index = 0

Scenes/Player.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Scripts/Player.gd" type="Script" id=1]
 [ext_resource path="res://Scripts/CharTween.gd" type="Script" id=2]
 [ext_resource path="res://Resources/Images/player.png" type="Texture" id=3]
+[ext_resource path="res://Resources/Images/crash.png" type="Texture" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 16, 16 )
@@ -12,13 +13,21 @@ extents = Vector2( 16, 16 )
 ]]
 script = ExtResource( 1 )
 
-[node name="Sprite" type="Sprite" parent="."]
+[node name="Liner" type="Sprite" parent="."]
 z_index = 1
 texture = ExtResource( 3 )
 __meta__ = {
 "_edit_lock_": true
 }
 
+[node name="Crash" type="Sprite" parent="."]
+visible = false
+z_index = 1
+texture = ExtResource( 4 )
+__meta__ = {
+"_edit_lock_": true
+}
+
 [node name="HitBox" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
 __meta__ = {
@@ -27,4 +36,8 @@ __meta__ = {
 
 [node name="Tween" type="Tween" parent="."]
 script = ExtResource( 2 )
+[connection signal="arena_removed" from="." to="Crash" method="hide"]
+[connection signal="arena_removed" from="." to="Liner" method="show"]
 [connection signal="body_entered" from="." to="." method="_on_crash"]
+[connection signal="crash" from="." to="Crash" method="show"]
+[connection signal="crash" from="." to="Liner" method="hide"]

Scripts/Player.gd

@@ -2,6 +2,7 @@ extends Area2D
 # Handle player logic and events
 
 signal crash
+signal arena_removed
 
 enum Direction {
 	UP = 0
@@ -73,6 +74,7 @@ func _on_round_won():
 func _on_arena_removed():
 	grid = null
 	landed = false
+	emit_signal("arena_removed")
 
 
 func _on_tween_completed(_o, key):
@@ -83,8 +85,6 @@ func _on_tween_completed(_o, key):
 func _on_crash(body):
 	if landed and running:
 		stop()
-		# TODO : use enum for blocks
-		grid.set_cell(posix, posiy, 2)
 		emit_signal("crash")