From b2ca7f699ed175a14b4dbf64ca6a44da954609bd Mon Sep 17 00:00:00 2001
From: Michael Redford <michaeliredford@gmail.com>
Date: Wed, 27 Sep 2017 17:11:40 -0600
Subject: [PATCH] added switch. fixed #8

---
 game.tscn            | 37 ++++++++++++++++++++++++++++++-------
 player.gd            |  5 ++++-
 tilesets/level1.tres | 12 ++++++------
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/game.tscn b/game.tscn
index 394d785..fe918d9 100644
--- a/game.tscn
+++ b/game.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=1]
+[gd_scene load_steps=20 format=1]
 
 [ext_resource path="res://tilesets/level1.tres" type="TileSet" id=1]
 [ext_resource path="res://player.gd" type="Script" id=2]
@@ -134,6 +134,11 @@ tracks/0/keys = {
 "values": [ 0.0, 1.0 ]
 }
 
+[sub_resource type="RectangleShape2D" id=9]
+
+custom_solver_bias = 0.0
+extents = Vector2( 15.8633, 15.5607 )
+
 [node name="Game" type="Node"]
 
 [node name="TileMap" type="TileMap" parent="."]
@@ -286,7 +291,7 @@ texture = ExtResource( 6 )
 
 [node name="Tutorial" type="Node2D" parent="Game/Player/UI"]
 
-transform/pos = Vector2( 146.16, 511.111 )
+transform/pos = Vector2( 146.254, 511.3 )
 transform/scale = Vector2( 9.0864, 5.71754 )
 script/script = ExtResource( 7 )
 
@@ -374,19 +379,20 @@ playback/speed = 1.0
 blend_times = [  ]
 autoplay = ""
 
-[node name="Switches" type="Node2D" parent="."]
+[node name="Switches" type="Node2D" parent="Game"]
 
-[node name="Level 2 Stairs" type="Node2D" parent="Switches" groups=[
+transform/scale = Vector2( 0.629125, 1.26202 )
+
+[node name="Level 2 Stairs" type="Node2D" parent="Game/Switches" groups=[
 "stairs",
 ]]
 
-[node name="stairs" type="Sprite" parent="Switches/Level 2 Stairs"]
+[node name="stairs" type="Sprite" parent="Game/Switches/Level 2 Stairs"]
 
-visibility/opacity = 0.0
 transform/pos = Vector2( 409.056, 559.319 )
 texture = ExtResource( 10 )
 
-[node name="anim" type="AnimationPlayer" parent="Switches/Level 2 Stairs"]
+[node name="anim" type="AnimationPlayer" parent="Game/Switches/Level 2 Stairs"]
 
 playback/process_mode = 1
 playback/default_blend_time = 0.0
@@ -397,4 +403,21 @@ playback/speed = 1.0
 blend_times = [  ]
 autoplay = ""
 
+[node name="KinematicBody2D" type="KinematicBody2D" parent="Game/Switches/Level 2 Stairs"]
+
+transform/pos = Vector2( 409.056, 559.319 )
+input/pickable = false
+shapes/0/shape = SubResource( 9 )
+shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 )
+shapes/0/trigger = false
+collision/layers = 1
+collision/mask = 1
+collision/margin = 0.08
+
+[node name="Coll" type="CollisionShape2D" parent="Game/Switches/Level 2 Stairs/KinematicBody2D"]
+
+shape = SubResource( 9 )
+trigger = false
+_update_shape_index = 0
+
 
diff --git a/player.gd b/player.gd
index a5c8f30..cca96fb 100644
--- a/player.gd
+++ b/player.gd
@@ -29,9 +29,12 @@ func _fixed_process(delta):
 				var other = get_collider()
 				if( other.is_in_group("tut_char")):
 					print("detected")
+					get_parent().get_node("Switches/Level 2 Stairs/anim").play("Fade In")
 					tutorial.display("decend to begin...")
 					hero.control = LOCKED
-					
+				elif(other.is_in_group("stairs"):
+					#LOAD level 2
+					pass
 					#TODO: enable player to proceed down stairs.
 	
 		if Input.is_action_pressed("ui_right"):
diff --git a/tilesets/level1.tres b/tilesets/level1.tres
index e1d24a8..64b659f 100644
--- a/tilesets/level1.tres
+++ b/tilesets/level1.tres
@@ -17,12 +17,12 @@
 [ext_resource path="res://gfx/Endless/level1_02.png" type="Texture" id=15]
 [ext_resource path="res://gfx/Endless/level1_08.png" type="Texture" id=16]
 
-[sub_resource type="RectangleShape2D" id=2]
+[sub_resource type="RectangleShape2D" id=1]
 
 custom_solver_bias = 0.0
 extents = Vector2( 32, 32 )
 
-[sub_resource type="RectangleShape2D" id=4]
+[sub_resource type="RectangleShape2D" id=2]
 
 custom_solver_bias = 0.0
 extents = Vector2( 32, 32 )
@@ -32,7 +32,7 @@ extents = Vector2( 32, 32 )
 custom_solver_bias = 0.0
 extents = Vector2( 32.0001, 32 )
 
-[sub_resource type="RectangleShape2D" id=1]
+[sub_resource type="RectangleShape2D" id=4]
 
 custom_solver_bias = 0.0
 extents = Vector2( 10.4, 14.2105 )
@@ -124,7 +124,7 @@ extents = Vector2( 10.4, 14.2105 )
 7/occluder_offset = Vector2( 16, 16 )
 7/navigation_offset = Vector2( 16, 16 )
 7/shape_offset = Vector2( 16, 16 )
-7/shapes = [ SubResource( 4 ) ]
+7/shapes = [ SubResource( 2 ) ]
 7/one_way_collision_direction = Vector2( 0, 0 )
 7/one_way_collision_max_depth = 0.0
 8/name = "level1_02"
@@ -146,7 +146,7 @@ extents = Vector2( 10.4, 14.2105 )
 9/occluder_offset = Vector2( 16, 16 )
 9/navigation_offset = Vector2( 16, 16 )
 9/shape_offset = Vector2( 16, 16 )
-9/shapes = [ SubResource( 1 ) ]
+9/shapes = [ SubResource( 4 ) ]
 9/one_way_collision_direction = Vector2( 0, 0 )
 9/one_way_collision_max_depth = 0.0
 10/name = "level1_11"
@@ -212,7 +212,7 @@ extents = Vector2( 10.4, 14.2105 )
 15/occluder_offset = Vector2( 16, 16 )
 15/navigation_offset = Vector2( 16, 16 )
 15/shape_offset = Vector2( 16, 16 )
-15/shapes = [ SubResource( 2 ) ]
+15/shapes = [ SubResource( 1 ) ]
 15/one_way_collision_direction = Vector2( 0, 0 )
 15/one_way_collision_max_depth = 0.0