Made autoload and ui folders to clean things up

autoloads/debug.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://scripts/debug.gd" type="Script" id=1]
+[ext_resource path="res://autoloads/debug.gd" type="Script" id=1]
 
 [sub_resource type="InputEventAction" id=4]
 action = "toggle_console"

autoloads/game.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://game.gd" type="Script" id=1]
+[ext_resource path="res://autoloads/game.gd" type="Script" id=1]
 
 [node name="Game" type="Node"]
 pause_mode = 2

autoloads/level_data.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=15 format=2]
 
-[ext_resource path="res://level_data.gd" type="Script" id=1]
+[ext_resource path="res://autoloads/level_data.gd" type="Script" id=1]
 [ext_resource path="res://maps/map01.tscn" type="PackedScene" id=2]
 [ext_resource path="res://maps/canopy.tscn" type="PackedScene" id=3]
 [ext_resource path="res://maps/cave.tscn" type="PackedScene" id=4]

control.tscn

@@ -4,8 +4,8 @@
 [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=2]
 [ext_resource path="res://maps/level_select.tscn" type="PackedScene" id=3]
 [ext_resource path="res://scripts/crt.gdshader" type="Shader" id=4]
-[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
-[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=6]
+[ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
+[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6]
 [ext_resource path="res://graphics/fade_patterns/diamonds2.png" type="Texture" id=7]
 [ext_resource path="res://scripts/fade.gd" type="Script" id=8]
 [ext_resource path="res://scripts/fade.gdshader" type="Shader" id=9]

maps/level_select.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=11 format=2]
 
-[ext_resource path="res://scripts/theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/theme.tres" type="Theme" id=1]
 [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2]
 [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=3]
 [ext_resource path="res://graphics/hud/levelselect_arrow.png" type="Texture" id=4]

maps/test_room.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=27 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
@@ -21,6 +21,7 @@
 [ext_resource path="res://objects/enemy/explosion.tscn" type="PackedScene" id=19]
 [ext_resource path="res://objects/enemy/tin.tscn" type="PackedScene" id=20]
 [ext_resource path="res://graphics/enemy/sawblade.png" type="Texture" id=21]
+[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=22]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 16, 20 )
@@ -113,6 +114,9 @@ format = 1
 [node name="Turniwood5" parent="." instance=ExtResource( 12 )]
 position = Vector2( 80, 120 )
 
+[node name="Turniwood10" parent="." instance=ExtResource( 12 )]
+position = Vector2( 184, 160 )
+
 [node name="Turniwood6" parent="." instance=ExtResource( 12 )]
 position = Vector2( 72, 112 )
 delay = 0.5
@@ -160,27 +164,11 @@ position = Vector2( 32, 72 )
 up_boundary = 3.0
 down_boundary = 3.0
 
-[node name="SawTest" type="AnimatedSprite" parent="."]
-material = SubResource( 4 )
-position = Vector2( 40, 128 )
-z_index = -3
-frames = SubResource( 5 )
-playing = true
-
-[node name="SawTest2" type="AnimatedSprite" parent="."]
-material = SubResource( 4 )
-position = Vector2( 112, 136 )
-z_index = -3
-frames = SubResource( 5 )
-frame = 1
-playing = true
-
 [node name="SawTest3" type="AnimatedSprite" parent="."]
 material = SubResource( 4 )
 position = Vector2( 120, 168 )
 z_index = -3
 frames = SubResource( 5 )
-frame = 1
 playing = true
 
 [node name="SawTest4" type="AnimatedSprite" parent="."]
@@ -188,6 +176,7 @@ material = SubResource( 4 )
 position = Vector2( 160, 168 )
 z_index = -3
 frames = SubResource( 5 )
+frame = 1
 playing = true
 
 [node name="SawTest5" type="AnimatedSprite" parent="."]
@@ -195,4 +184,21 @@ material = SubResource( 4 )
 position = Vector2( 56, 176 )
 z_index = -3
 frames = SubResource( 5 )
+frame = 1
 playing = true
+
+[node name="RollingFiend" parent="." instance=ExtResource( 22 )]
+position = Vector2( 48, 120 )
+
+[node name="AnimatedSprite" parent="RollingFiend" index="0"]
+visible = false
+frame = 0
+
+[node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"]
+material = SubResource( 4 )
+position = Vector2( 4, 4 )
+z_index = -3
+frames = SubResource( 5 )
+playing = true
+
+[editable path="RollingFiend"]

objects/environment/barrier/barrier.tscn

@@ -2,8 +2,8 @@
 
 [ext_resource path="res://objects/environment/barrier/barrier.gd" type="Script" id=1]
 [ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2]
-[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=3]
-[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=4]
+[ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=3]
+[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 2, 0.5 )

objects/environment/exit/exit.tscn

@@ -1,10 +1,11 @@
 [gd_scene load_steps=9 format=2]
 
-[ext_resource path="res://scripts/theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/theme.tres" type="Theme" id=1]
 [ext_resource path="res://objects/environment/exit/exit.gd" type="Script" id=2]
 [ext_resource path="res://graphics/exit/exit.png" type="Texture" id=3]
 [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4]
 
+
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 4 )
 shader_param/border_color = Color( 0, 0, 0, 1 )

objects/hud/hud.tscn

@@ -5,7 +5,7 @@
 [ext_resource path="res://graphics/hud/hud.png" type="Texture" id=3]
 [ext_resource path="res://graphics/hud/deaths_head.png" type="Texture" id=4]
 [ext_resource path="res://objects/hud/hud.gd" type="Script" id=6]
-[ext_resource path="res://scripts/theme.tres" type="Theme" id=10]
+[ext_resource path="res://ui/theme.tres" type="Theme" id=10]
 
 [sub_resource type="ShaderMaterial" id=1]
 

objects/hud/pause_screen.tscn

@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=1]
-[ext_resource path="res://scripts/theme.tres" type="Theme" id=2]
+[ext_resource path="res://ui/theme.tres" type="Theme" id=2]
 [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=3]
 [ext_resource path="res://objects/hud/pause_screen.gd" type="Script" id=4]
-[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
-[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=6]
+[ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
+[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6]
 
 [node name="PauseScreen" type="CanvasLayer"]
 pause_mode = 2

project.godot

@@ -21,15 +21,15 @@ _global_script_class_icons={
 [application]
 
 config/name="Hero Mark 2"
-run/main_scene="res://Main.tscn"
+run/main_scene="res://main.tscn"
 config/icon="res://icon.png"
 
 [autoload]
 
-Game="*res://game.tscn"
-Debug="*res://objects/debug.tscn"
-LevelData="*res://level_data.tscn"
-Save="*res://scripts/save.gd"
+Game="*res://autoloads/game.tscn"
+Debug="*res://autoloads/debug.tscn"
+LevelData="*res://autoloads/level_data.tscn"
+Save="*res://autoloads/save.gd"
 
 [display]
 

ui/2ndpuberty..png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/2ndpuberty..png-fcb093b956485853b52b89a083af493a.stex"
+path="res://.import/2ndpuberty..png-ec578c6a0d4202e67678753c1d9b2e12.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://fonts/2ndpuberty..png"
-dest_files=[ "res://.import/2ndpuberty..png-fcb093b956485853b52b89a083af493a.stex" ]
+source_file="res://ui/2ndpuberty..png"
+dest_files=[ "res://.import/2ndpuberty..png-ec578c6a0d4202e67678753c1d9b2e12.stex" ]
 
 [params]
 

ui/2ndpuberty_no_dropshadow.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/2ndpuberty_no_dropshadow.png-1885217c8cb02614801aae74f3adfb95.stex"
+path="res://.import/2ndpuberty_no_dropshadow.png-5715774fcdadbbe232da32637e674577.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://fonts/2ndpuberty_no_dropshadow.png"
-dest_files=[ "res://.import/2ndpuberty_no_dropshadow.png-1885217c8cb02614801aae74f3adfb95.stex" ]
+source_file="res://ui/2ndpuberty_no_dropshadow.png"
+dest_files=[ "res://.import/2ndpuberty_no_dropshadow.png-5715774fcdadbbe232da32637e674577.stex" ]
 
 [params]
 

ui/2ndpuberty_no_dropshadow.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=2 format=2]
 
-[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=1]
+[ext_resource path="res://ui/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=1]
 
 [resource]
 default_font = ExtResource( 1 )

ui/theme.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Theme" load_steps=2 format=2]
 
-[ext_resource path="res://fonts/2ndpuberty..fnt" type="BitmapFont" id=1]
+[ext_resource path="res://ui/2ndpuberty..fnt" type="BitmapFont" id=1]
 
 [resource]
 default_font = ExtResource( 1 )