From d3f6abf2f05fb61f29c5f1f14dbb4962c4bae142 Mon Sep 17 00:00:00 2001
From: Nathan Anderson <nathananderson98@gmail.com>
Date: Thu, 4 Aug 2022 19:56:18 -0600
Subject: [PATCH] Updated scenes with imports

---
 scenes/TileMap.tscn  | 213 +------------------------------------------
 scenes/UI.tscn       |   6 +-
 scenes/decor.tscn    |   2 +-
 scenes/house.tscn    |   2 +-
 scenes/neighbor.tscn |  18 ++--
 scenes/player.tscn   |  20 ++--
 scenes/pop.tscn      |   8 +-
 scenes/trolley.tscn  |   2 +-
 8 files changed, 30 insertions(+), 241 deletions(-)

diff --git a/scenes/TileMap.tscn b/scenes/TileMap.tscn
index 99c0d24..ae1b497 100644
--- a/scenes/TileMap.tscn
+++ b/scenes/TileMap.tscn
@@ -1,217 +1,6 @@
-[gd_scene load_steps=17 format=2]
-
-[ext_resource path="res://roger-roger/tilemap/streetSideTop.png" type="Texture" id=1]
-[ext_resource path="res://roger-roger/tilemap/StreetVerticalLeft.png" type="Texture" id=2]
-[ext_resource path="res://roger-roger/tilemap/streetSideBottom.png" type="Texture" id=3]
-[ext_resource path="res://roger-roger/tilemap/sidewalk.png" type="Texture" id=4]
-[ext_resource path="res://roger-roger/tilemap/StreetVerticalRight.png" type="Texture" id=5]
-[ext_resource path="res://roger-roger/tilemap/grass1.png" type="Texture" id=6]
-[ext_resource path="res://roger-roger/tilemap/justRoad.png" type="Texture" id=7]
-[ext_resource path="res://roger-roger/tilemap/sandbar2.png" type="Texture" id=8]
-[ext_resource path="res://roger-roger/tilemap/railroad.png" type="Texture" id=9]
-[ext_resource path="res://roger-roger/tilemap/ocean1.png" type="Texture" id=10]
-[ext_resource path="res://roger-roger/tilemap/ocean2.png" type="Texture" id=11]
-[ext_resource path="res://roger-roger/tilemap/sandbar1.png" type="Texture" id=12]
-
-[sub_resource type="ConvexPolygonShape2D" id=6]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=7]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
-
-[sub_resource type="ConvexPolygonShape2D" id=3]
-points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
+[gd_scene load_steps=2 format=2]
 
 [sub_resource type="TileSet" id=2]
-0/name = "StreetVerticalRight.png 0"
-0/texture = ExtResource( 5 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 16, 16 )
-0/tile_mode = 0
-0/occluder_offset = Vector2( 0, 0 )
-0/navigation_offset = Vector2( 0, 0 )
-0/shape_offset = Vector2( 0, 0 )
-0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-0/shape_one_way = false
-0/shape_one_way_margin = 0.0
-0/shapes = [  ]
-0/z_index = 0
-1/name = "StreetVerticalLeft.png 1"
-1/texture = ExtResource( 2 )
-1/tex_offset = Vector2( 0, 0 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 0, 0, 16, 16 )
-1/tile_mode = 0
-1/occluder_offset = Vector2( 0, 0 )
-1/navigation_offset = Vector2( 0, 0 )
-1/shape_offset = Vector2( 0, 0 )
-1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
-1/z_index = 0
-3/name = "sidewalk.png 3"
-3/texture = ExtResource( 4 )
-3/tex_offset = Vector2( 0, 0 )
-3/modulate = Color( 1, 1, 1, 1 )
-3/region = Rect2( 0, 0, 16, 16 )
-3/tile_mode = 0
-3/occluder_offset = Vector2( 0, 0 )
-3/navigation_offset = Vector2( 0, 0 )
-3/shape_offset = Vector2( 0, 0 )
-3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-3/shape_one_way = false
-3/shape_one_way_margin = 0.0
-3/shapes = [  ]
-3/z_index = 0
-5/name = "streetSideBottom.png 5"
-5/texture = ExtResource( 3 )
-5/tex_offset = Vector2( 0, 0 )
-5/modulate = Color( 1, 1, 1, 1 )
-5/region = Rect2( 0, 0, 16, 16 )
-5/tile_mode = 0
-5/occluder_offset = Vector2( 0, 0 )
-5/navigation_offset = Vector2( 0, 0 )
-5/shape_offset = Vector2( 0, 0 )
-5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-5/shape_one_way = false
-5/shape_one_way_margin = 0.0
-5/shapes = [  ]
-5/z_index = 0
-6/name = "streetSideTop.png 6"
-6/texture = ExtResource( 1 )
-6/tex_offset = Vector2( 0, 0 )
-6/modulate = Color( 1, 1, 1, 1 )
-6/region = Rect2( 0, 0, 16, 16 )
-6/tile_mode = 0
-6/occluder_offset = Vector2( 0, 0 )
-6/navigation_offset = Vector2( 0, 0 )
-6/shape_offset = Vector2( 0, 0 )
-6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-6/shape_one_way = false
-6/shape_one_way_margin = 0.0
-6/shapes = [  ]
-6/z_index = 0
-7/name = "grass1.png 7"
-7/texture = ExtResource( 6 )
-7/tex_offset = Vector2( 0, 0 )
-7/modulate = Color( 1, 1, 1, 1 )
-7/region = Rect2( 0, 0, 16, 16 )
-7/tile_mode = 0
-7/occluder_offset = Vector2( 0, 0 )
-7/navigation_offset = Vector2( 0, 0 )
-7/shape_offset = Vector2( 0, 0 )
-7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-7/shape = SubResource( 3 )
-7/shape_one_way = false
-7/shape_one_way_margin = 1.0
-7/shapes = [ {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 3 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-7/z_index = 0
-8/name = "justRoad.png 8"
-8/texture = ExtResource( 7 )
-8/tex_offset = Vector2( 0, 0 )
-8/modulate = Color( 1, 1, 1, 1 )
-8/region = Rect2( 0, 0, 16, 16 )
-8/tile_mode = 0
-8/occluder_offset = Vector2( 0, 0 )
-8/navigation_offset = Vector2( 0, 0 )
-8/shape_offset = Vector2( 0, 0 )
-8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-8/shape_one_way = false
-8/shape_one_way_margin = 0.0
-8/shapes = [  ]
-8/z_index = 0
-9/name = "sandbar1.png 9"
-9/texture = ExtResource( 12 )
-9/tex_offset = Vector2( 0, 0 )
-9/modulate = Color( 1, 1, 1, 1 )
-9/region = Rect2( 0, 0, 16, 16 )
-9/tile_mode = 0
-9/occluder_offset = Vector2( 0, 0 )
-9/navigation_offset = Vector2( 0, 0 )
-9/shape_offset = Vector2( 0, 0 )
-9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-9/shape_one_way = false
-9/shape_one_way_margin = 0.0
-9/shapes = [  ]
-9/z_index = 0
-10/name = "sandbar2.png 10"
-10/texture = ExtResource( 8 )
-10/tex_offset = Vector2( 0, 0 )
-10/modulate = Color( 1, 1, 1, 1 )
-10/region = Rect2( 0, 0, 16, 16 )
-10/tile_mode = 0
-10/occluder_offset = Vector2( 0, 0 )
-10/navigation_offset = Vector2( 0, 0 )
-10/shape_offset = Vector2( 0, 0 )
-10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-10/shape_one_way = false
-10/shape_one_way_margin = 0.0
-10/shapes = [  ]
-10/z_index = 0
-11/name = "railroad.png 11"
-11/texture = ExtResource( 9 )
-11/tex_offset = Vector2( 0, 0 )
-11/modulate = Color( 1, 1, 1, 1 )
-11/region = Rect2( 0, 0, 16, 16 )
-11/tile_mode = 0
-11/occluder_offset = Vector2( 0, 0 )
-11/navigation_offset = Vector2( 0, 0 )
-11/shape_offset = Vector2( 0, 0 )
-11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-11/shape_one_way = false
-11/shape_one_way_margin = 0.0
-11/shapes = [  ]
-11/z_index = 0
-12/name = "ocean1.png 12"
-12/texture = ExtResource( 10 )
-12/tex_offset = Vector2( 0, 0 )
-12/modulate = Color( 1, 1, 1, 1 )
-12/region = Rect2( 0, 0, 16, 16 )
-12/tile_mode = 0
-12/occluder_offset = Vector2( 0, 0 )
-12/navigation_offset = Vector2( 0, 0 )
-12/shape_offset = Vector2( 0, 0 )
-12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-12/shape = SubResource( 6 )
-12/shape_one_way = false
-12/shape_one_way_margin = 1.0
-12/shapes = [ {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 6 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-12/z_index = 0
-13/name = "ocean2.png 13"
-13/texture = ExtResource( 11 )
-13/tex_offset = Vector2( 0, 0 )
-13/modulate = Color( 1, 1, 1, 1 )
-13/region = Rect2( 0, 0, 16, 16 )
-13/tile_mode = 0
-13/occluder_offset = Vector2( 0, 0 )
-13/navigation_offset = Vector2( 0, 0 )
-13/shape_offset = Vector2( 0, 0 )
-13/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-13/shape = SubResource( 7 )
-13/shape_one_way = false
-13/shape_one_way_margin = 1.0
-13/shapes = [ {
-"autotile_coord": Vector2( 0, 0 ),
-"one_way": false,
-"one_way_margin": 1.0,
-"shape": SubResource( 7 ),
-"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
-} ]
-13/z_index = 0
 
 [node name="TileMap" type="TileMap"]
 scale = Vector2( 5, 5 )
diff --git a/scenes/UI.tscn b/scenes/UI.tscn
index 8f1da2e..f4fb3e5 100644
--- a/scenes/UI.tscn
+++ b/scenes/UI.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://roger-roger/fonts/8-BIT WONDER.TTF" type="DynamicFontData" id=1]
+[ext_resource path="res://assets/fonts/8-BIT WONDER.TTF" type="DynamicFontData" id=1]
 [ext_resource path="res://scripts/UI.gd" type="Script" id=2]
-[ext_resource path="res://roger-roger/ui/music-enabled.png" type="Texture" id=3]
+[ext_resource path="res://assets/ui/music-enabled.png" type="Texture" id=3]
 
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 1 )
@@ -29,7 +29,7 @@ margin_bottom = 237.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = SubResource( 2 )
-text = "Time 60"
+text = "Time fdsafdsafdsa"
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/HBoxContainer"]
 margin_left = 1231.0
diff --git a/scenes/decor.tscn b/scenes/decor.tscn
index 88bc635..bc4d6cf 100644
--- a/scenes/decor.tscn
+++ b/scenes/decor.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://roger-roger/tree.png" type="Texture" id=1]
+[ext_resource path="res://assets/tree.png" type="Texture" id=1]
 [ext_resource path="res://scripts/decor.gd" type="Script" id=2]
 
 [node name="Decor" type="Node2D"]
diff --git a/scenes/house.tscn b/scenes/house.tscn
index 78648ef..251b9f9 100644
--- a/scenes/house.tscn
+++ b/scenes/house.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://scripts/house.gd" type="Script" id=1]
-[ext_resource path="res://roger-roger/chadHouse.png" type="Texture" id=2]
+[ext_resource path="res://assets/chadHouse.png" type="Texture" id=2]
 
 [sub_resource type="CapsuleShape2D" id=3]
 radius = 12.4286
diff --git a/scenes/neighbor.tscn b/scenes/neighbor.tscn
index fd24719..f30054d 100644
--- a/scenes/neighbor.tscn
+++ b/scenes/neighbor.tscn
@@ -1,14 +1,14 @@
 [gd_scene load_steps=14 format=2]
 
-[ext_resource path="res://roger-roger/runningSprites/aberlin/AberlinFinal.png" type="Texture" id=1]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin2.png" type="Texture" id=2]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin5.png" type="Texture" id=3]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin6.png" type="Texture" id=4]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin4.png" type="Texture" id=5]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin3.png" type="Texture" id=6]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/Aberlin1.png" type="Texture" id=7]
-[ext_resource path="res://roger-roger/runningSprites/aberlin/AberlinStart.png" type="Texture" id=8]
-[ext_resource path="res://roger-roger/LadyAberlin.png" type="Texture" id=9]
+[ext_resource path="res://assets/runningSprites/aberlin/AberlinFinal.png" type="Texture" id=1]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin2.png" type="Texture" id=2]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin5.png" type="Texture" id=3]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin6.png" type="Texture" id=4]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin4.png" type="Texture" id=5]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin3.png" type="Texture" id=6]
+[ext_resource path="res://assets/runningSprites/aberlin/Aberlin1.png" type="Texture" id=7]
+[ext_resource path="res://assets/runningSprites/aberlin/AberlinStart.png" type="Texture" id=8]
+[ext_resource path="res://assets/LadyAberlin.png" type="Texture" id=9]
 [ext_resource path="res://scripts/neighbor.gd" type="Script" id=10]
 
 [sub_resource type="CircleShape2D" id=3]
diff --git a/scenes/player.tscn b/scenes/player.tscn
index 79c060d..a14e873 100644
--- a/scenes/player.tscn
+++ b/scenes/player.tscn
@@ -1,16 +1,16 @@
 [gd_scene load_steps=15 format=2]
 
-[ext_resource path="res://roger-roger/runningSprites/Rogers5.png" type="Texture" id=1]
-[ext_resource path="res://roger-roger/runningSprites/Rogers4.png" type="Texture" id=2]
-[ext_resource path="res://roger-roger/runningSprites/Rogers6.png" type="Texture" id=3]
-[ext_resource path="res://roger-roger/runningSprites/Rogers2.png" type="Texture" id=4]
-[ext_resource path="res://roger-roger/runningSprites/Rogers3.png" type="Texture" id=5]
-[ext_resource path="res://roger-roger/runningSprites/RogersFinal.png" type="Texture" id=6]
-[ext_resource path="res://roger-roger/runningSprites/Rogers1.png" type="Texture" id=7]
-[ext_resource path="res://roger-roger/runningSprites/RogersStart.png" type="Texture" id=8]
+[ext_resource path="res://assets/runningSprites/Rogers5.png" type="Texture" id=1]
+[ext_resource path="res://assets/runningSprites/Rogers4.png" type="Texture" id=2]
+[ext_resource path="res://assets/runningSprites/Rogers6.png" type="Texture" id=3]
+[ext_resource path="res://assets/runningSprites/Rogers2.png" type="Texture" id=4]
+[ext_resource path="res://assets/runningSprites/Rogers3.png" type="Texture" id=5]
+[ext_resource path="res://assets/runningSprites/RogersFinal.png" type="Texture" id=6]
+[ext_resource path="res://assets/runningSprites/Rogers1.png" type="Texture" id=7]
+[ext_resource path="res://assets/runningSprites/RogersStart.png" type="Texture" id=8]
 [ext_resource path="res://scripts/player.gd" type="Script" id=9]
-[ext_resource path="res://roger-roger/mrRogers.png" type="Texture" id=10]
-[ext_resource path="res://roger-roger/chevron_pointer.png" type="Texture" id=11]
+[ext_resource path="res://assets/mrRogers.png" type="Texture" id=10]
+[ext_resource path="res://assets/chevron_pointer.png" type="Texture" id=11]
 [ext_resource path="res://scenes/UI.tscn" type="PackedScene" id=12]
 
 [sub_resource type="CapsuleShape2D" id=2]
diff --git a/scenes/pop.tscn b/scenes/pop.tscn
index 40fae66..99b60f0 100644
--- a/scenes/pop.tscn
+++ b/scenes/pop.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://roger-roger/effects/pop-4.png" type="Texture" id=1]
-[ext_resource path="res://roger-roger/effects/pop-3.png" type="Texture" id=2]
-[ext_resource path="res://roger-roger/effects/pop-1.png" type="Texture" id=3]
-[ext_resource path="res://roger-roger/effects/pop-2.png" type="Texture" id=4]
+[ext_resource path="res://assets/effects/pop-4.png" type="Texture" id=1]
+[ext_resource path="res://assets/effects/pop-3.png" type="Texture" id=2]
+[ext_resource path="res://assets/effects/pop-1.png" type="Texture" id=3]
+[ext_resource path="res://assets/effects/pop-2.png" type="Texture" id=4]
 [ext_resource path="res://scripts/pop.gd" type="Script" id=5]
 
 [sub_resource type="SpriteFrames" id=1]
diff --git a/scenes/trolley.tscn b/scenes/trolley.tscn
index 01f0446..8471891 100644
--- a/scenes/trolley.tscn
+++ b/scenes/trolley.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://roger-roger/trolley-lg.png" type="Texture" id=1]
+[ext_resource path="res://assets/trolley-lg.png" type="Texture" id=1]
 [ext_resource path="res://scripts/trolley.gd" type="Script" id=2]
 
 [sub_resource type="RectangleShape2D" id=2]