From 8cfe971e0695593e7bd3fe521a83ec9709d0276c Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 24 Feb 2023 17:15:20 -0500 Subject: [PATCH] Made autoload and ui folders to clean things up --- {scripts => autoloads}/debug.gd | 0 {objects => autoloads}/debug.tscn | 2 +- game.gd => autoloads/game.gd | 0 game.tscn => autoloads/game.tscn | 2 +- level_data.gd => autoloads/level_data.gd | 0 level_data.tscn => autoloads/level_data.tscn | 2 +- {scripts => autoloads}/save.gd | 0 control.tscn | 4 +- maps/level_select.tscn | 2 +- maps/test_room.tscn | 40 ++++++++++-------- objects/environment/barrier/barrier.tscn | 4 +- objects/environment/exit/exit.tscn | 3 +- objects/hud/hud.tscn | 2 +- objects/hud/pause_screen.tscn | 6 +-- project.godot | 10 ++--- {fonts => ui}/2ndPubertyMono.ttf | Bin {fonts => ui}/2ndpuberty..fnt | 0 {fonts => ui}/2ndpuberty..png | Bin {fonts => ui}/2ndpuberty..png.import | 6 +-- {fonts => ui}/2ndpuberty..tres | 0 {fonts => ui}/2ndpuberty_no_dropshadow.fnt | 0 {fonts => ui}/2ndpuberty_no_dropshadow.png | Bin .../2ndpuberty_no_dropshadow.png.import | 6 +-- {scripts => ui}/2ndpuberty_no_dropshadow.tres | 2 +- {scripts => ui}/2ndpuberty_outline.tres | 0 {scripts => ui}/theme.tres | 2 +- 26 files changed, 50 insertions(+), 43 deletions(-) rename {scripts => autoloads}/debug.gd (100%) rename {objects => autoloads}/debug.tscn (92%) rename game.gd => autoloads/game.gd (100%) rename game.tscn => autoloads/game.tscn (91%) rename level_data.gd => autoloads/level_data.gd (100%) rename level_data.tscn => autoloads/level_data.tscn (97%) rename {scripts => autoloads}/save.gd (100%) rename {fonts => ui}/2ndPubertyMono.ttf (100%) rename {fonts => ui}/2ndpuberty..fnt (100%) rename {fonts => ui}/2ndpuberty..png (100%) rename {fonts => ui}/2ndpuberty..png.import (71%) rename {fonts => ui}/2ndpuberty..tres (100%) rename {fonts => ui}/2ndpuberty_no_dropshadow.fnt (100%) rename {fonts => ui}/2ndpuberty_no_dropshadow.png (100%) rename {fonts => ui}/2ndpuberty_no_dropshadow.png.import (67%) rename {scripts => ui}/2ndpuberty_no_dropshadow.tres (52%) rename {scripts => ui}/2ndpuberty_outline.tres (100%) rename {scripts => ui}/theme.tres (56%) diff --git a/scripts/debug.gd b/autoloads/debug.gd similarity index 100% rename from scripts/debug.gd rename to autoloads/debug.gd diff --git a/objects/debug.tscn b/autoloads/debug.tscn similarity index 92% rename from objects/debug.tscn rename to autoloads/debug.tscn index 485a4b2..5d0acdc 100644 --- a/objects/debug.tscn +++ b/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" diff --git a/game.gd b/autoloads/game.gd similarity index 100% rename from game.gd rename to autoloads/game.gd diff --git a/game.tscn b/autoloads/game.tscn similarity index 91% rename from game.tscn rename to autoloads/game.tscn index bdb58d7..589fcc5 100644 --- a/game.tscn +++ b/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 diff --git a/level_data.gd b/autoloads/level_data.gd similarity index 100% rename from level_data.gd rename to autoloads/level_data.gd diff --git a/level_data.tscn b/autoloads/level_data.tscn similarity index 97% rename from level_data.tscn rename to autoloads/level_data.tscn index bf939c6..6bd8b60 100644 --- a/level_data.tscn +++ b/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] diff --git a/scripts/save.gd b/autoloads/save.gd similarity index 100% rename from scripts/save.gd rename to autoloads/save.gd diff --git a/control.tscn b/control.tscn index d4d7e58..647ece7 100644 --- a/control.tscn +++ b/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] diff --git a/maps/level_select.tscn b/maps/level_select.tscn index 94e26a1..f1e588a 100644 --- a/maps/level_select.tscn +++ b/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] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 9a34344..e11ac03 100644 --- a/maps/test_room.tscn +++ b/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"] diff --git a/objects/environment/barrier/barrier.tscn b/objects/environment/barrier/barrier.tscn index 162b858..e81bf23 100644 --- a/objects/environment/barrier/barrier.tscn +++ b/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 ) diff --git a/objects/environment/exit/exit.tscn b/objects/environment/exit/exit.tscn index eb4a8ed..af6fbce 100644 --- a/objects/environment/exit/exit.tscn +++ b/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 ) diff --git a/objects/hud/hud.tscn b/objects/hud/hud.tscn index bf89f51..f5cd346 100644 --- a/objects/hud/hud.tscn +++ b/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] diff --git a/objects/hud/pause_screen.tscn b/objects/hud/pause_screen.tscn index a108e21..ceb7eb5 100644 --- a/objects/hud/pause_screen.tscn +++ b/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 diff --git a/project.godot b/project.godot index 68cbc64..ef52571 100644 --- a/project.godot +++ b/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] diff --git a/fonts/2ndPubertyMono.ttf b/ui/2ndPubertyMono.ttf similarity index 100% rename from fonts/2ndPubertyMono.ttf rename to ui/2ndPubertyMono.ttf diff --git a/fonts/2ndpuberty..fnt b/ui/2ndpuberty..fnt similarity index 100% rename from fonts/2ndpuberty..fnt rename to ui/2ndpuberty..fnt diff --git a/fonts/2ndpuberty..png b/ui/2ndpuberty..png similarity index 100% rename from fonts/2ndpuberty..png rename to ui/2ndpuberty..png diff --git a/fonts/2ndpuberty..png.import b/ui/2ndpuberty..png.import similarity index 71% rename from fonts/2ndpuberty..png.import rename to ui/2ndpuberty..png.import index cb38b53..b573ca5 100644 --- a/fonts/2ndpuberty..png.import +++ b/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] diff --git a/fonts/2ndpuberty..tres b/ui/2ndpuberty..tres similarity index 100% rename from fonts/2ndpuberty..tres rename to ui/2ndpuberty..tres diff --git a/fonts/2ndpuberty_no_dropshadow.fnt b/ui/2ndpuberty_no_dropshadow.fnt similarity index 100% rename from fonts/2ndpuberty_no_dropshadow.fnt rename to ui/2ndpuberty_no_dropshadow.fnt diff --git a/fonts/2ndpuberty_no_dropshadow.png b/ui/2ndpuberty_no_dropshadow.png similarity index 100% rename from fonts/2ndpuberty_no_dropshadow.png rename to ui/2ndpuberty_no_dropshadow.png diff --git a/fonts/2ndpuberty_no_dropshadow.png.import b/ui/2ndpuberty_no_dropshadow.png.import similarity index 67% rename from fonts/2ndpuberty_no_dropshadow.png.import rename to ui/2ndpuberty_no_dropshadow.png.import index c152788..a1b2472 100644 --- a/fonts/2ndpuberty_no_dropshadow.png.import +++ b/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] diff --git a/scripts/2ndpuberty_no_dropshadow.tres b/ui/2ndpuberty_no_dropshadow.tres similarity index 52% rename from scripts/2ndpuberty_no_dropshadow.tres rename to ui/2ndpuberty_no_dropshadow.tres index 7491afd..96179e9 100644 --- a/scripts/2ndpuberty_no_dropshadow.tres +++ b/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 ) diff --git a/scripts/2ndpuberty_outline.tres b/ui/2ndpuberty_outline.tres similarity index 100% rename from scripts/2ndpuberty_outline.tres rename to ui/2ndpuberty_outline.tres diff --git a/scripts/theme.tres b/ui/theme.tres similarity index 56% rename from scripts/theme.tres rename to ui/theme.tres index e60d6f1..ee204c5 100644 --- a/scripts/theme.tres +++ b/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 )