From 0265751bd5027a400fc80805b5f9dae4bc498356 Mon Sep 17 00:00:00 2001
From: Harmony Honey <HarmonyMonroe97@gmail.com>
Date: Thu, 4 Nov 2021 13:46:03 -0400
Subject: [PATCH] spike floor artifacts fixed! mask image altered(:

---
 media/image/spike.png       | Bin 2662 -> 2662 bytes
 media/image/spike_floor.png | Bin 1301 -> 1366 bytes
 project.godot               |   2 +-
 src/actor/Player.tscn       |  13 +++----
 src/actor/Spike.tscn        |  11 +++---
 src/map/2.tscn              |  23 ------------
 src/map/3.tscn              |  23 ------------
 src/map/4.tscn              |  73 ------------------------------------
 src/map/{ => _test}/0.tscn  |  72 +++++++++++++++++------------------
 src/map/{ => world1}/1.tscn |   2 +-
 src/stage/SolidTileMap.gd   |  10 ++---
 src/stage/SolidTileMap.tscn |   5 ++-
 12 files changed, 58 insertions(+), 176 deletions(-)
 delete mode 100644 src/map/2.tscn
 delete mode 100644 src/map/3.tscn
 delete mode 100644 src/map/4.tscn
 rename src/map/{ => _test}/0.tscn (88%)
 rename src/map/{ => world1}/1.tscn (76%)

diff --git a/media/image/spike.png b/media/image/spike.png
index c70d359df70cb35296d5b9e8b54fbb7c9c24020a..9de03c3bd48df80d071543a776c2436c13c61212 100644
GIT binary patch
delta 374
zcmV-+0g3+R6y_9=M}G#9A0ZYN7L$gJ9}Q|^V=-bVEXGrQZQeX@X4L$6z4s<fw#s&j
z5*xo3`~_^4wNgY%cFLOApyxa@HIg~EbI<2~?>(n`&jpW?(2`b#ACf8C42Oc=x%mZe
z)f2T;(1edJRkMt#nK6Zu_I^v58?SrZTBXnZYqiU|r9oM>@PDvon6~h^@Z_p(xV$CY
zqQ%u^;S=F*Q!Xfc<LZ$-Kf4^u^QX(E5*`6hqp&yjizB~Si<?Pdc{#phBBK@V<G!R$
zPtDFqY!`3CB20)NUM3i2gaCaE$sC}EetKm^iG2T0{xoUH)nqovVzNSvI5yp)W~90<
zF)F$)BSF^f|7zd9TG4_2eD%5@R6aV+YX?+q!dK35J`Nn`>k!Hx;5=2#Pw&Ivo9MZs
z=G%jYbvV5!YLRU?+kn=4Lp9YOsa)I>jl#<@)Xzin71S)|dsf)z=nj-M`Kn9U*@aFy
U->~!zh1+NJ0qT5)v#$ZS2sA;y;s5{u

delta 374
zcmV-+0g3+R6y_9=M}IRzG)9PIVKHgQ0x@c0V=<Fog~iM$gU!sFUuu55-kV92t+G{=
z*!Z>JFJP;zl_FBIQ`W==J?G6#jbzU4-1E8Ld(Y|KbHN%+DQUfC5Ym~P=AZOB7eb59
zx@YXP(?Tzvu%fH8fr%hh?c)xM8E^W{TGh|}YYowuu7IUpcz;Y$wVd#j@XTsXHF;aO
zO-Y8M!l%N0np{x$*3=^<ela;w;xCi6px+19W?^UI7e{`vlGM_|@^W11R9-3H$9#z+
zmYEMo>=N%p$Im2QoJ=#04-Z3(%Iu*ZHv_VwO8#Ime~zr=Dl)4S&{!csk{o@a=B0W}
zVqEl?j1&d4|7w5xs>g@jrRokZ)IJ%;TQ}5g!S|+Nd>$Ic_Yv40;UZJX&mO?YyXc!0
z&9x6r>u`2i(IPu=z5yK%YFG;wC7ZZ49*5TxXbeH?HQ1L*JuB~Xd=J4j`Kl|}-Gd%E
U-?aP#%x7p6!(Ob%v#$ZS2)oF>Q~&?~

diff --git a/media/image/spike_floor.png b/media/image/spike_floor.png
index 43a221f17a44cc58c15892fdabbc5c02a5031a63..723f371126d982f0b6089e402b24f5510a8707a9 100644
GIT binary patch
delta 988
zcmV<210(#E3f2mcM}G#9A0ZYN7L$gJ9}Q|^V=-bVEXGrQZQeX@X4L$6z4s<fw#s&j
z5*xo3`~_^4wNgY%cFLOApyxa@HIg~EbI<2~?>(n`&jpW?(2`b#ACf8C42Oc=x%mZe
z)f2T;(1edJRkMt#nK6Zu_I^v58?SrZTBXnZYqiU|r9oM>@PDvon6~h^@Z_p(xV$CY
zqQ%u^;S=F*Q!Xfc<LZ$-Kf4^u^QX(E5*`6hqp&yjizB~Si<?Pdc{#phBBK@V<G!R$
zPtDFqY!`3CB20)NUM3i2gaCaE$sC}EetKm^iG2T0{xoUH)nqovVzNSvI5yp)W~90<
zF)F$)BSF^f|7zd9TG4_2eD%5@R6aV+YX?+q!dK35J`Nn`>k!Hx;5=2#Pw&Ivo9MZs
z=G%jYbvV5!YLRU?+kn=4Lp9YOsa)I>jl#<@)Xzin71S)|dsf)z=nj-M`Kn9U*@aFy
z->~!zh1+NJ0qT5)ldl07V|qzMK~#90?cBYJRaY1W;CE>zWMq=ULGcgr#}wXx<=9w^
zjR=WJBZ7CJVCp1IasggI5V6oo(u{?TmU9JSECSI{1XGAbFu~8_oJtZiGiR^kIOlm_
zcV~a!D%N|xwc+fOvmpX90h2HS1b?uTwcZV?YFCnDz56he)>><?dN!CwK#nB&qjw)>
z(&5(Hdd~*CdKMr1d<s37O<(kGARxTYy6>%N1f+Y)nOQp`AYV?Q2eWCZcZ04E=~eYX
zlJz9}diG&vJ<aGr{hwY9dQXt!5f1v<pJcgbgWdu8wsU>xy2rX5v8rk=$$#S{i@kb4
zl4nT{^g3qsoFHFCIOuONqrKKemkCl;A0@e$<kKGY;SIkhIoewLYv{tgCdkDI2h;Oe
zk_$Zw4?aPv>R^)lNfw5#4R7%x$x>_W$&f_{ogm|1?p}^?FntS2E?3o{U;0BIv3^L$
z2PXI*UuU!j2QygOs_I;lD}O`Pg9)5#tz8|W&>#V+s^uiNlgtfK4<__?k`t}9yOS20
z_=r_i-y~U$aIk&MC0VViGm{qDazLtTcUAqI<a&}llP&}XwkOGrs`{y_c5k)FmX26e
zwKvJNBr98O3{$k4<ZNs0&&}SrsR>e5^Hud-k_QnE-XABE{8m+$s(EUDGdFH%f{fqm
zIG^PEB!@S@KG-%MCHXPQFB|!R<9`OEsy@u<eU4K}PA54s)Cyr6c$nm7l3$bDX|28d
zw-2?d`Z&p<BnQXWp^W~=Y9+}h(^)ILQ_qv!O0t&G8?cYZ*ZONwtA8h5-9rNa0000<
KMNUMnLSTYpgXnMo

delta 923
zcmV;M17!Tx3Y7|wM}IRzG)9PIVKHgQ0x@c0V=<Fog~iM$gU!sFUuu55-kV92t+G{=
z*!Z>JFJP;zl_FBIQ`W==J?G6#jbzU4-1E8Ld(Y|KbHN%+DQUfC5Ym~P=AZOB7eb59
zx@YXP(?Tzvu%fH8fr%hh?c)xM8E^W{TGh|}YYowuu7IUpcz;Y$wVd#j@XTsXHF;aO
zO-Y8M!l%N0np{x$*3=^<ela;w;xCi6px+19W?^UI7e{`vlGM_|@^W11R9-3H$9#z+
zmYEMo>=N%p$Im2QoJ=#04-Z3(%Iu*ZHv_VwO8#Ime~zr=Dl)4S&{!csk{o@a=B0W}
zVqEl?j1&d4|7w5xs>g@jrRokZ)IJ%;TQ}5g!S|+Nd>$Ic_Yv40;UZJX&mO?YyXc!0
z&9x6r>u`2i(IPu=z5yK%YFG;wC7ZZ49*5TxXbeH?HQ1L*JuB~Xd=J4j`Kl|}-Gd%E
z-?aP#%x7p6!(Ob%ldl07Ryj#TK~#90?c70&jZqi}@c%)kri_Iwn1zM%0oW>(l??W#
z<O{I2k|MqZg}o@NSy)*60!lX5MixdXN{_|83#rk#_dU0nxxZh%+vnMwf6uw+J?~Ak
zF#<0ElRyFof7r`f?*>(MD9L8;J}jh_*4nq84fgdcK5={wJy=Y~dN&XdcC+qlOF-Do
z1O)zJPXy%j9D1;r&h&23^%SeB4kr1WWTj^x7S?8xqph`{y&CkMAm<|-^s|!WT+ar*
z19Gi%edxNzx^1zl>Ohi@NmhIHfFz?NCt7R2dKB+De?e|UIOuOR<F(dBmkCl;%SqnH
z5ij#GN^+{T_I>EWy(Y-*2nX}Cn&eiG!h=tcsydS7L!4eQUtg1)Y^{A6vgn`_q^kBO
zc@p7Z{thR3JXwQ-8G4KLAj#!{Yr=M|CAmLj!NImzRkfbv=}`4x2J5Z0=R*`4Bp_9F
zHpxbkf2ASn!Hj++x!78JJ8Pktw^)<OAsp-^OG!4W>iVpOrVdC|?XRjw8E>nEgPmq6
z$+N0@SXEQ6^QpF2lcU_n8UHAPo$ghVo6{Tt|5viAYPqWJWc;2(IM^-Ll6<JDJCj=;
z+qSI<GP!toBgwtEU&Zb=N^&>JlkHq^+%h1OMUR~>B)OX8N(6(wWt8M)k{3zdZ1vGq
xoBVIp@xPwaNiM}3aTdd7lGjPzCHeH{^BX<TdWouwub=<`002ovPDHLkV1h6))Xx9_

diff --git a/project.godot b/project.godot
index 4cef20e..2cede3d 100644
--- a/project.godot
+++ b/project.godot
@@ -27,7 +27,7 @@ _global_script_class_icons={
 [application]
 
 config/name="gdRota"
-run/main_scene="res://src/map/0.tscn"
+run/main_scene="res://src/map/_test/0.tscn"
 config/icon="res://media/image/gobot.png"
 
 [autoload]
diff --git a/src/actor/Player.tscn b/src/actor/Player.tscn
index cb16246..4479556 100644
--- a/src/actor/Player.tscn
+++ b/src/actor/Player.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=19 format=2]
 
 [ext_resource path="res://media/image/player/mouth.png" type="Texture" id=1]
 [ext_resource path="res://src/actor/Player.gd" type="Script" id=2]
@@ -13,9 +13,6 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 30, 30 )
 
-[sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 40, 40 )
-
 [sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 25, 25 )
 
@@ -318,7 +315,7 @@ tracks/12/loop_wrap = true
 tracks/12/imported = false
 tracks/12/enabled = true
 tracks/12/keys = {
-"points": PoolRealArray( 1, -0.25, 0, 0.25, 0, 1.25, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0 ),
+"points": PoolRealArray( 1.25, -0.25, 0, 0.25, 0, 1.5, -0.25, 0, 0.25, 0, 1.25, -0.25, 0, 0.25, 0 ),
 "times": PoolRealArray( 0, 0.3, 0.6 )
 }
 tracks/13/type = "bezier"
@@ -328,7 +325,7 @@ tracks/13/loop_wrap = true
 tracks/13/imported = false
 tracks/13/enabled = true
 tracks/13/keys = {
-"points": PoolRealArray( 1, -0.25, 0, 0.25, 0, 1.25, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0 ),
+"points": PoolRealArray( 1.25, -0.25, 0, 0.25, 0, 1.5, -0.25, 0, 0.25, 0, 1.25, -0.25, 0, 0.25, 0 ),
 "times": PoolRealArray( 0, 0.3, 0.6 )
 }
 tracks/14/type = "bezier"
@@ -927,7 +924,7 @@ collision_layer = 3
 collision_mask = 8
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="BodyArea"]
-shape = SubResource( 2 )
+shape = SubResource( 1 )
 
 [node name="Areas" type="Node2D" parent="."]
 
@@ -937,6 +934,7 @@ collision_layer = 0
 collision_mask = 4
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Areas/HitArea"]
+position = Vector2( 1.88773, 0.471939 )
 shape = SubResource( 3 )
 
 [node name="ColorRect" type="ColorRect" parent="Areas/HitArea/CollisionShape2D"]
@@ -1017,7 +1015,6 @@ texture = ExtResource( 8 )
 
 [node name="mouth" type="Sprite" parent="Sprites/Node2D/body"]
 position = Vector2( 31, 44 )
-scale = Vector2( 1.25, 1.25 )
 texture = ExtResource( 1 )
 
 [node name="leg" type="Sprite" parent="Sprites/Node2D"]
diff --git a/src/actor/Spike.tscn b/src/actor/Spike.tscn
index 0106dbd..ebf1994 100644
--- a/src/actor/Spike.tscn
+++ b/src/actor/Spike.tscn
@@ -15,7 +15,7 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"points": PoolRealArray( 0.1, -0.25, 0, 0.25, 0, 0.46, -0.25, 0, 0.25, 0, 0.1, -0.25, 0, 0.25, 0 ),
+"points": PoolRealArray( 0.3, -0.25, 0, 0.25, 0, 0.46, -0.25, 0, 0.25, 0, 0.3, -0.25, 0, 0.25, 0 ),
 "times": PoolRealArray( 0, 0.5, 1 )
 }
 tracks/1/type = "bezier"
@@ -25,18 +25,18 @@ tracks/1/loop_wrap = true
 tracks/1/imported = false
 tracks/1/enabled = true
 tracks/1/keys = {
-"points": PoolRealArray( 0.46, -0.25, 0, 0.25, 0, 0.1, -0.25, 0, 0.25, 0, 0.46, -0.25, 0, 0.25, 0 ),
+"points": PoolRealArray( 0.46, -0.25, 0, 0.25, 0, 0.3, -0.25, 0, 0.25, 0, 0.46, -0.25, 0, 0.25, 0 ),
 "times": PoolRealArray( 0, 0.5, 1 )
 }
 
 [sub_resource type="ShaderMaterial" id=2]
 shader = ExtResource( 1 )
-shader_param/offset_y = 0.191044
+shader_param/offset_y = 0.3
 shader_param/mask = ExtResource( 3 )
 
 [sub_resource type="ShaderMaterial" id=3]
 shader = ExtResource( 1 )
-shader_param/offset_y = 0.368956
+shader_param/offset_y = 0.46
 shader_param/mask = ExtResource( 3 )
 
 [node name="Spike" type="Node2D" groups=[
@@ -68,9 +68,10 @@ texture = ExtResource( 2 )
 centered = false
 
 [node name="Area2D" type="Area2D" parent="."]
+visible = false
 position = Vector2( -50, 50 )
 collision_layer = 8
 collision_mask = 0
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Area2D"]
-polygon = PoolVector2Array( 0, 0, 25, -50, 50, 0, 75, -50, 100, 0 )
+polygon = PoolVector2Array( 0, 0, 25, -40, 50, 0, 75, -40, 100, 0 )
diff --git a/src/map/2.tscn b/src/map/2.tscn
deleted file mode 100644
index ba0ab0e..0000000
--- a/src/map/2.tscn
+++ /dev/null
@@ -1,23 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://src/stage/Camera2D.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4]
-
-[node name="Node2D" type="Node2D"]
-
-[node name="Camera2D" parent="." groups=[
-"game_camera",
-] instance=ExtResource( 1 )]
-
-[node name="SolidTileMap" parent="." instance=ExtResource( 2 )]
-tile_data = PoolIntArray( 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 458753, 0, 0, 458754, 0, 0, 458755, 0, 0, 458756, 0, 0, 458757, 0, 0, 458758, 0, 0, 458759, 0, 0, 524289, 0, 0, 524290, 0, 0, 524291, 0, 0, 524292, 0, 0, 524293, 0, 0, 524294, 0, 0, 524295, 0, 0, 589825, 0, 0, 589826, 0, 0, 589827, 0, 0, 589828, 0, 0, 589829, 0, 0, 589830, 0, 0, 589831, 0, 0, 655363, 0, 0, 655364, 0, 0, 655365, 0, 0, 720899, 0, 0, 720900, 0, 0, 720901, 0, 0, 786435, 0, 0, 786436, 0, 0, 786437, 0, 0, 983043, 0, 0, 983044, 0, 0, 983045, 0, 0, 1048579, 0, 0, 1048580, 0, 0, 1048581, 0, 0, 1114115, 0, 0, 1114116, 0, 0, 1114117, 0, 0 )
-
-[node name="Actors" type="Node2D" parent="."]
-
-[node name="Player" parent="Actors" instance=ExtResource( 3 )]
-position = Vector2( 447.272, 148.671 )
-
-[node name="Exit" parent="Actors" instance=ExtResource( 4 )]
-position = Vector2( 450, 1900 )
diff --git a/src/map/3.tscn b/src/map/3.tscn
deleted file mode 100644
index ab4ff3c..0000000
--- a/src/map/3.tscn
+++ /dev/null
@@ -1,23 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://src/stage/Camera2D.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4]
-
-[node name="Node2D" type="Node2D"]
-
-[node name="Camera2D" parent="." groups=[
-"game_camera",
-] instance=ExtResource( 1 )]
-
-[node name="SolidTileMap" parent="." instance=ExtResource( 2 )]
-tile_data = PoolIntArray( -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, 9, 0, 0, 10, 0, 0, 11, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 196610, 0, 0, 196611, 0, 0, 196612, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0 )
-
-[node name="Actors" type="Node2D" parent="."]
-
-[node name="Player" parent="Actors" instance=ExtResource( 3 )]
-position = Vector2( 354.039, 142.314 )
-
-[node name="Exit" parent="Actors" instance=ExtResource( 4 )]
-position = Vector2( 1300, 50 )
diff --git a/src/map/4.tscn b/src/map/4.tscn
deleted file mode 100644
index a28adef..0000000
--- a/src/map/4.tscn
+++ /dev/null
@@ -1,73 +0,0 @@
-[gd_scene load_steps=9 format=2]
-
-[ext_resource path="res://src/stage/Camera2D.tscn" type="PackedScene" id=1]
-[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2]
-[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=3]
-[ext_resource path="res://src/actor/Button.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/actor/SwitchBlock.tscn" type="PackedScene" id=5]
-[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=6]
-[ext_resource path="res://src/actor/Spike.tscn" type="PackedScene" id=7]
-[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8]
-
-[node name="Node2D" type="Node2D"]
-
-[node name="Camera2D" parent="." groups=[
-"game_camera",
-] instance=ExtResource( 1 )]
-
-[node name="SolidTileMap" parent="." instance=ExtResource( 2 )]
-tile_data = PoolIntArray( -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0, -65527, 0, 0, 5, 0, 0, 6, 0, 0, 7, 0, 0, 8, 0, 0, 9, 0, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0, 393216, 0, 0, 393217, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 0, 0 )
-
-[node name="Actors" type="Node2D" parent="."]
-
-[node name="Player" parent="Actors" instance=ExtResource( 3 )]
-position = Vector2( 550, 450 )
-
-[node name="Button" parent="Actors" instance=ExtResource( 4 )]
-position = Vector2( 250, 450 )
-
-[node name="Button2" parent="Actors" instance=ExtResource( 4 )]
-position = Vector2( 750, 150 )
-rotation = 3.14159
-dir = 2
-is_black = true
-
-[node name="SwitchBlock" parent="Actors" instance=ExtResource( 5 )]
-position = Vector2( 550, 350 )
-
-[node name="SwitchBlock2" parent="Actors" instance=ExtResource( 5 )]
-position = Vector2( 450, 350 )
-
-[node name="SwitchBlock3" parent="Actors" instance=ExtResource( 5 )]
-position = Vector2( 250, 150 )
-is_black = true
-
-[node name="SwitchBlock4" parent="Actors" instance=ExtResource( 5 )]
-position = Vector2( 150, 150 )
-is_black = true
-
-[node name="Box" parent="Actors" instance=ExtResource( 6 )]
-position = Vector2( 150, 450 )
-
-[node name="Box2" parent="Actors" instance=ExtResource( 6 )]
-position = Vector2( 550, 750 )
-dir = 2
-
-[node name="Spike" parent="Actors" instance=ExtResource( 7 )]
-position = Vector2( 450, -50 )
-rotation = 4.71239
-
-[node name="Spike2" parent="Actors" instance=ExtResource( 7 )]
-position = Vector2( 450, 50 )
-rotation = 4.71239
-
-[node name="Spike3" parent="Actors" instance=ExtResource( 7 )]
-position = Vector2( 1050, -50 )
-rotation = 1.5708
-
-[node name="Spike4" parent="Actors" instance=ExtResource( 7 )]
-position = Vector2( 1050, 50 )
-rotation = 1.5708
-
-[node name="Exit" parent="Actors" instance=ExtResource( 8 )]
-position = Vector2( 900, -200 )
diff --git a/src/map/0.tscn b/src/map/_test/0.tscn
similarity index 88%
rename from src/map/0.tscn
rename to src/map/_test/0.tscn
index 43ce83c..e687896 100644
--- a/src/map/0.tscn
+++ b/src/map/_test/0.tscn
@@ -1,25 +1,25 @@
 [gd_scene load_steps=15 format=2]
 
-[ext_resource path="res://src/stage/Camera2D.tscn" type="PackedScene" id=1]
+[ext_resource path="res://src/actor/Spike.tscn" type="PackedScene" id=1]
 [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=4]
-[ext_resource path="res://src/actor/Lock.tscn" type="PackedScene" id=5]
+[ext_resource path="res://src/actor/SwitchBlock.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/actor/Key.tscn" type="PackedScene" id=6]
-[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=7]
-[ext_resource path="res://src/actor/Spike.tscn" type="PackedScene" id=8]
-[ext_resource path="res://src/actor/Spinner.tscn" type="PackedScene" id=9]
-[ext_resource path="res://src/actor/Arrow.tscn" type="PackedScene" id=10]
-[ext_resource path="res://src/actor/Portal.tscn" type="PackedScene" id=11]
-[ext_resource path="res://src/actor/Passthrough.tscn" type="PackedScene" id=12]
-[ext_resource path="res://src/actor/Button.tscn" type="PackedScene" id=13]
-[ext_resource path="res://src/actor/SwitchBlock.tscn" type="PackedScene" id=14]
+[ext_resource path="res://src/actor/Arrow.tscn" type="PackedScene" id=7]
+[ext_resource path="res://src/actor/Passthrough.tscn" type="PackedScene" id=8]
+[ext_resource path="res://src/actor/Lock.tscn" type="PackedScene" id=9]
+[ext_resource path="res://src/actor/Spinner.tscn" type="PackedScene" id=10]
+[ext_resource path="res://src/stage/Camera2D.tscn" type="PackedScene" id=11]
+[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=12]
+[ext_resource path="res://src/actor/Portal.tscn" type="PackedScene" id=13]
+[ext_resource path="res://src/actor/Button.tscn" type="PackedScene" id=14]
 
 [node name="Node2D" type="Node2D"]
 
 [node name="Camera2D" parent="." groups=[
 "game_camera",
-] instance=ExtResource( 1 )]
+] instance=ExtResource( 11 )]
 position = Vector2( 1350, 850 )
 zoom = Vector2( 1.2, 1.2 )
 
@@ -29,7 +29,7 @@ tile_data = PoolIntArray( -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286,
 [node name="Actors" type="Node2D" parent="."]
 
 [node name="Player" parent="Actors" instance=ExtResource( 3 )]
-position = Vector2( 1450, 250 )
+position = Vector2( 500, 950 )
 
 [node name="Box" parent="Actors" instance=ExtResource( 4 )]
 position = Vector2( 250, 150 )
@@ -89,93 +89,93 @@ position = Vector2( 1850, 1450 )
 [node name="Box16" parent="Actors" instance=ExtResource( 4 )]
 position = Vector2( 1250, 1450 )
 
-[node name="Exit" parent="Actors" instance=ExtResource( 7 )]
+[node name="Exit" parent="Actors" instance=ExtResource( 12 )]
 position = Vector2( 1150, -300 )
 
-[node name="Lock" parent="Actors" instance=ExtResource( 5 )]
+[node name="Lock" parent="Actors" instance=ExtResource( 9 )]
 position = Vector2( 1650, 450 )
 
 [node name="Key" parent="Actors" instance=ExtResource( 6 )]
 position = Vector2( 1650, 250 )
 
-[node name="Spike" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 750, 650 )
 rotation = 3.14159
 dir = 2
 
-[node name="Spike2" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike2" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 650, 650 )
 rotation = 3.14159
 dir = 2
 
-[node name="Spike3" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike3" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 550, 650 )
 rotation = 3.14159
 dir = 2
 
-[node name="Spike4" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike4" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 1550, 950 )
 
-[node name="Spike5" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike5" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 950, 950 )
 
-[node name="Spike6" parent="Actors" instance=ExtResource( 8 )]
+[node name="Spike6" parent="Actors" instance=ExtResource( 1 )]
 position = Vector2( 1450, 950 )
 
-[node name="Spinner" parent="Actors" instance=ExtResource( 9 )]
+[node name="Spinner" parent="Actors" instance=ExtResource( 10 )]
 position = Vector2( 350, -350 )
 
-[node name="Arrow" parent="Actors" instance=ExtResource( 10 )]
+[node name="Arrow" parent="Actors" instance=ExtResource( 7 )]
 position = Vector2( 650, -50 )
 rotation = 1.5708
 dir = 1
 
-[node name="Arrow2" parent="Actors" instance=ExtResource( 10 )]
+[node name="Arrow2" parent="Actors" instance=ExtResource( 7 )]
 position = Vector2( 50, 750 )
 rotation = 1.5708
 dir = 1
 
-[node name="Portal" parent="Actors" instance=ExtResource( 11 )]
+[node name="Portal" parent="Actors" instance=ExtResource( 13 )]
 position = Vector2( 850, 150 )
 connection_path = NodePath("../Portal2")
 
-[node name="Portal2" parent="Actors" instance=ExtResource( 11 )]
+[node name="Portal2" parent="Actors" instance=ExtResource( 13 )]
 position = Vector2( 1350, 50 )
 connection_path = NodePath("../Portal")
 
-[node name="Passthrough" parent="Actors" instance=ExtResource( 12 )]
+[node name="Passthrough" parent="Actors" instance=ExtResource( 8 )]
 position = Vector2( 550, 1750 )
 
-[node name="Passthrough2" parent="Actors" instance=ExtResource( 12 )]
+[node name="Passthrough2" parent="Actors" instance=ExtResource( 8 )]
 position = Vector2( 550, 1650 )
 
-[node name="Passthrough3" parent="Actors" instance=ExtResource( 12 )]
+[node name="Passthrough3" parent="Actors" instance=ExtResource( 8 )]
 position = Vector2( 550, 1550 )
 
-[node name="Button" parent="Actors" instance=ExtResource( 13 )]
+[node name="Button" parent="Actors" instance=ExtResource( 14 )]
 position = Vector2( 1450, 1750 )
 is_black = true
 
-[node name="Button2" parent="Actors" instance=ExtResource( 13 )]
+[node name="Button2" parent="Actors" instance=ExtResource( 14 )]
 position = Vector2( 2050, 1750 )
 
-[node name="SwitchBlock" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1650, 1650 )
 is_black = true
 
-[node name="SwitchBlock2" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock2" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1750, 1650 )
 
-[node name="SwitchBlock3" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock3" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1850, 1650 )
 is_black = true
 
-[node name="SwitchBlock4" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock4" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1350, 1450 )
 
-[node name="SwitchBlock5" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock5" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1250, 1450 )
 is_black = true
 
-[node name="SwitchBlock6" parent="Actors" instance=ExtResource( 14 )]
+[node name="SwitchBlock6" parent="Actors" instance=ExtResource( 5 )]
 position = Vector2( 1150, 1450 )
diff --git a/src/map/1.tscn b/src/map/world1/1.tscn
similarity index 76%
rename from src/map/1.tscn
rename to src/map/world1/1.tscn
index 025b162..0e0b192 100644
--- a/src/map/1.tscn
+++ b/src/map/world1/1.tscn
@@ -12,7 +12,7 @@
 ] instance=ExtResource( 1 )]
 
 [node name="SolidTileMap" parent="." instance=ExtResource( 2 )]
-tile_data = PoolIntArray( 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0 )
+tile_data = PoolIntArray( 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 196610, 0, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 196614, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0 )
 
 [node name="Actors" type="Node2D" parent="."]
 
diff --git a/src/stage/SolidTileMap.gd b/src/stage/SolidTileMap.gd
index 20648ad..27a90cd 100644
--- a/src/stage/SolidTileMap.gd
+++ b/src/stage/SolidTileMap.gd
@@ -1,15 +1,15 @@
 extends TileMap
 
-const auto = preload("res://src/stage/AutoTileMap200px.tscn")
+onready var auto : TileMap = $AutoTileMap
 
 func _ready():
 	get_parent().connect("ready", self, "parent_ready")
 
 func parent_ready():
-	var map = auto.instance()
-	make_tiles(map)
-	get_parent().add_child(map)
-	get_parent().move_child(map, 0)
+	make_tiles(auto)
+	remove_child(auto)
+	get_parent().add_child(auto)
+	get_parent().move_child(auto, 0)
 	visible = false
 
 func make_tiles(map : TileMap):
diff --git a/src/stage/SolidTileMap.tscn b/src/stage/SolidTileMap.tscn
index 3277e72..3e8cd02 100644
--- a/src/stage/SolidTileMap.tscn
+++ b/src/stage/SolidTileMap.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://src/stage/SolidTileMap.gd" type="Script" id=1]
 [ext_resource path="res://media/image/rect-100.png" type="Texture" id=2]
+[ext_resource path="res://src/stage/AutoTileMap200px.tscn" type="PackedScene" id=3]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 100, 100, 0, 100, 0, 0, 100, 0 )
@@ -34,3 +35,5 @@ tile_set = SubResource( 2 )
 cell_size = Vector2( 100, 100 )
 format = 1
 script = ExtResource( 1 )
+
+[node name="AutoTileMap" parent="." instance=ExtResource( 3 )]