From 6146eed99dbbbffd19a478ba13efe2bf67306654 Mon Sep 17 00:00:00 2001
From: Arthur <arthur.mayot@univ-lyon2.fr>
Date: Mon, 26 Apr 2021 14:52:13 +0200
Subject: [PATCH] Added 2nd wall layer to do more corners

---
 Levels/Level_1.tscn | 10 ++++------
 Levels/Level_2.tscn | 10 ++++------
 Levels/Level_3.tscn |  2 --
 Levels/Level_4.tscn |  2 --
 Scenes/Level.tscn   | 18 +++++++++++-------
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Levels/Level_1.tscn b/Levels/Level_1.tscn
index 567833c..68c9cd9 100644
--- a/Levels/Level_1.tscn
+++ b/Levels/Level_1.tscn
@@ -13,20 +13,18 @@ stairs_y = 11
 [node name="Walls" parent="Floor" index="0"]
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 6, 0, 196618, 5, 0, 262151, 2, 0, 327687, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393223, 2, 0, 458759, 2, 0, 524295, 2, 0, 589831, 2, 0, 655367, 2, 0, 720903, 2, 0 )
 
-[node name="Props" parent="Floor" index="1"]
+[node name="Props" parent="Floor" index="2"]
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393224, 7, 0, 393226, 7, 0, 524297, 8, 0 )
 
-[node name="Waste" parent="Floor" index="2"]
+[node name="Waste" parent="Floor" index="3"]
 tile_data = PoolIntArray( 327689, 9, 0, 393225, 11, 0, 458761, 13, 0 )
 
-[node name="Player" parent="Floor" index="3"]
+[node name="Player" parent="Floor" index="4"]
 position = Vector2( 960, 360 )
 rest = 0.15
 reservoir = 3
 
-[node name="Stairs" parent="Floor" index="4"]
-visible = false
-modulate = Color( 1, 1, 1, 1 )
+[node name="Stairs" parent="Floor" index="5"]
 position = Vector2( 640, 880 )
 
 [editable path="Floor"]
diff --git a/Levels/Level_2.tscn b/Levels/Level_2.tscn
index 53993ec..b903bee 100644
--- a/Levels/Level_2.tscn
+++ b/Levels/Level_2.tscn
@@ -14,20 +14,18 @@ stairs_y = 6
 [node name="Walls" parent="Floor" index="0"]
 tile_data = PoolIntArray( 196616, 4, 0, 196617, 6, 0, 196618, 5, 0, 262151, 2, 0, 327687, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393223, 3, 0, 458759, 2, 0, 524295, 2, 0, 589831, 3, 0, 655367, 2, 0, 720903, 2, 0 )
 
-[node name="Props" parent="Floor" index="1"]
+[node name="Props" parent="Floor" index="2"]
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 524296, 7, 0, 524297, 8, 0 )
 
-[node name="Waste" parent="Floor" index="2"]
+[node name="Waste" parent="Floor" index="3"]
 tile_data = PoolIntArray( 262154, 14, 0, 327690, 13, 0, 393226, 12, 0, 458762, 11, 0, 589833, 10, 0, 655369, 15, 0 )
 
-[node name="Player" parent="Floor" index="3"]
+[node name="Player" parent="Floor" index="4"]
 position = Vector2( 680, 920 )
 rest = 0.15
 reservoir = 3
 
-[node name="Stairs" parent="Floor" index="4"]
-visible = false
-modulate = Color( 1, 1, 1, 1 )
+[node name="Stairs" parent="Floor" index="5"]
 position = Vector2( 960, 480 )
 
 [editable path="Floor"]
diff --git a/Levels/Level_3.tscn b/Levels/Level_3.tscn
index fe6fcfb..8d94e84 100644
--- a/Levels/Level_3.tscn
+++ b/Levels/Level_3.tscn
@@ -25,8 +25,6 @@ position = Vector2( 960, 360 )
 rest = 0.15
 
 [node name="Stairs" parent="Floor" index="4"]
-visible = false
-modulate = Color( 1, 1, 1, 1 )
 position = Vector2( 760, 880 )
 
 [editable path="Floor"]
diff --git a/Levels/Level_4.tscn b/Levels/Level_4.tscn
index 34d2b67..31c75d8 100644
--- a/Levels/Level_4.tscn
+++ b/Levels/Level_4.tscn
@@ -26,8 +26,6 @@ rest = 0.15
 reservoir = 7
 
 [node name="Stairs" parent="Floor" index="4"]
-visible = false
-modulate = Color( 1, 1, 1, 1 )
 position = Vector2( 960, 480 )
 
 [editable path="Floor"]
diff --git a/Scenes/Level.tscn b/Scenes/Level.tscn
index 0a7fb6f..1e0660d 100644
--- a/Scenes/Level.tscn
+++ b/Scenes/Level.tscn
@@ -20,20 +20,24 @@ stairs_y = 7
 cell_y_sort = false
 tile_data = PoolIntArray( 196613, 4, 0, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 196617, 6, 0, 196618, 5, 0, 196619, 5, 0, 196620, 5, 0, 262148, 2, 0, 327684, 2, 0, 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 2, 0, 458756, 2, 0, 524292, 3, 0, 589828, 2, 0, 655364, 2, 0, 720900, 2, 0 )
 
-[node name="Props" parent="." index="1" instance=ExtResource( 1 )]
+[node name="Walls2" parent="." index="1" instance=ExtResource( 1 )]
+cell_y_sort = false
+tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0 )
+
+[node name="Props" parent="." index="2" instance=ExtResource( 1 )]
 z_index = 1
 tile_data = PoolIntArray( 393216, 0, 0, 393217, 0, 0, 393219, 0, 0, 393220, 0, 0, 524299, 8, 0, 655366, 7, 0 )
 
-[node name="Waste" parent="." index="2" instance=ExtResource( 1 )]
+[node name="Waste" parent="." index="3" instance=ExtResource( 1 )]
 tile_data = PoolIntArray( 327691, 15, 0, 524295, 14, 0, 655370, 11, 0 )
 
-[node name="Player" parent="." index="3" instance=ExtResource( 2 )]
+[node name="Player" parent="." index="4" instance=ExtResource( 2 )]
 position = Vector2( 880, 520 )
 speed = 10.0
 speed_dash = 70.0
 reservoir = 6
 
-[node name="Stairs" type="AnimatedSprite" parent="." index="4"]
+[node name="Stairs" type="AnimatedSprite" parent="." index="5"]
 visible = false
 show_behind_parent = true
 position = Vector2( 800, 560 )
@@ -41,17 +45,17 @@ frames = ExtResource( 7 )
 frame = 4
 offset = Vector2( -20, 0 )
 
-[node name="Drum" type="AudioStreamPlayer" parent="." index="5"]
+[node name="Drum" type="AudioStreamPlayer" parent="." index="6"]
 stream = ExtResource( 6 )
 autoplay = true
 bus = "drum"
 
-[node name="Bass" type="AudioStreamPlayer" parent="." index="6"]
+[node name="Bass" type="AudioStreamPlayer" parent="." index="7"]
 stream = ExtResource( 5 )
 autoplay = true
 bus = "drum"
 
-[node name="Lead" type="AudioStreamPlayer" parent="." index="7"]
+[node name="Lead" type="AudioStreamPlayer" parent="." index="8"]
 stream = ExtResource( 4 )
 autoplay = true
 bus = "drum"