Merge branch 'collisions'

Enable collisions and death logic.

Enemy.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://Enemy.gd" type="Script" id=1]
 [ext_resource path="res://dodge_assets/art/enemySwimming_1.png" type="Texture" id=2]
@@ -8,6 +8,10 @@
 [ext_resource path="res://dodge_assets/art/enemyWalking_1.png" type="Texture" id=6]
 [ext_resource path="res://dodge_assets/art/enemyWalking_2.png" type="Texture" id=7]
 
+[sub_resource type="PhysicsMaterial" id=3]
+friction = 0.1
+bounce = 1.0
+
 [sub_resource type="SpriteFrames" id=1]
 animations = [ {
 "frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
@@ -31,7 +35,7 @@ radius = 24.0469
 height = 52.8654
 
 [node name="Enemy" type="RigidBody2D"]
-collision_mask = 0
+physics_material_override = SubResource( 3 )
 gravity_scale = 0.0
 script = ExtResource( 1 )
 __meta__ = {

Main.tscn

@@ -39,4 +39,5 @@ rotation = -6.07153e-08
 position = Vector2( 245.983, 380.055 )
 [connection signal="timeout" from="MobTimer" to="." method="_on_MobTimer_timeout"]
 [connection signal="timeout" from="ScoreTimer" to="." method="_on_ScoreTimer_timeout"]
+[connection signal="timeout" from="StartTimer" to="Player" method="spawn"]
 [connection signal="timeout" from="StartTimer" to="." method="_on_StartTimer_timeout"]

Player.gd

@@ -1,10 +1,21 @@
 extends Area2D
 
+signal hit
+
 export var speed = 400 # pixel / sec
-var screen_size
+var screen
+
+func spawn():
+	position = (screen.position + screen.end) / 2
+	show()
+	$CollisionShape2D.disabled = false
+
+func die():
+	hide()
 
 func _ready():
-	screen_size = get_viewport_rect().size
+	hide()
+	screen = get_viewport_rect()
 
 func _process(delta):
 	var velocity = Vector2()
@@ -25,8 +36,8 @@ func _process(delta):
 	
 	position += velocity * delta
 	
-	position.x = clamp(position.x, 0, screen_size.x)
-	position.y = clamp(position.y, 0, screen_size.y)
+	position.x = clamp(position.x, 0, screen.size.x)
+	position.y = clamp(position.y, 0, screen.size.y)
 	
 	if velocity.x != 0:
 		$AnimatedSprite.animation = "right"
@@ -35,3 +46,9 @@ func _process(delta):
 	elif velocity.y != 0:
 		$AnimatedSprite.animation = "up"
 		$AnimatedSprite.flip_v = velocity.y > 0
+
+
+func _on_Player_body_entered(body):
+	die()
+	emit_signal("hit")
+	$CollisionShape2D.set_deferred("disabled", true)

Player.tscn

@@ -39,3 +39,4 @@ __meta__ = {
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 2 )
+[connection signal="body_entered" from="." to="." method="_on_Player_body_entered"]