From a5aafc99b4701e11acfafbe025a675ae951b0bd1 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 2 Apr 2022 21:42:30 +0200 Subject: [PATCH] :wrench: Rename files so that they are categorized --- project.godot | 2 +- src/{ => entities}/Fire.gd | 0 src/{ => entities}/Fire.tscn | 6 +++--- src/{ => entities}/Player.tscn | 7 +++---- src/{ => entities/behaviours}/PlayerMovement.gd | 0 src/{ => entities/behaviours}/PlayerMovement.tscn | 2 +- src/{ => levels}/Game.tscn | 8 ++++---- src/{ => levels}/MainMenu.gd | 0 src/{ => levels}/MainMenu.tscn | 2 +- src/{ => mechanics}/Background.tscn | 6 +++--- src/{ => mechanics}/Black.png | 0 src/{ => mechanics}/Black.png.import | 6 +++--- src/{ => mechanics}/Darkness.tscn | 0 src/{ => mechanics}/GimpWood.png | 0 src/{ => mechanics}/GimpWood.png.import | 6 +++--- src/{ => mechanics}/Light.png | 0 src/{ => mechanics}/Light.png.import | 6 +++--- src/{ => mechanics}/White.png | 0 src/{ => mechanics}/White.png.import | 6 +++--- 19 files changed, 28 insertions(+), 29 deletions(-) rename src/{ => entities}/Fire.gd (100%) rename src/{ => entities}/Fire.tscn (68%) rename src/{ => entities}/Player.tscn (56%) rename src/{ => entities/behaviours}/PlayerMovement.gd (100%) rename src/{ => entities/behaviours}/PlayerMovement.tscn (53%) rename src/{ => levels}/Game.tscn (97%) rename src/{ => levels}/MainMenu.gd (100%) rename src/{ => levels}/MainMenu.tscn (74%) rename src/{ => mechanics}/Background.tscn (86%) rename src/{ => mechanics}/Black.png (100%) rename src/{ => mechanics}/Black.png.import (72%) rename src/{ => mechanics}/Darkness.tscn (100%) rename src/{ => mechanics}/GimpWood.png (100%) rename src/{ => mechanics}/GimpWood.png.import (71%) rename src/{ => mechanics}/Light.png (100%) rename src/{ => mechanics}/Light.png.import (72%) rename src/{ => mechanics}/White.png (100%) rename src/{ => mechanics}/White.png.import (72%) diff --git a/project.godot b/project.godot index 93a79d9..e384c2e 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="LD50" -run/main_scene="res://src/Game.tscn" +run/main_scene="res://src/levels/Game.tscn" [display] diff --git a/src/Fire.gd b/src/entities/Fire.gd similarity index 100% rename from src/Fire.gd rename to src/entities/Fire.gd diff --git a/src/Fire.tscn b/src/entities/Fire.tscn similarity index 68% rename from src/Fire.tscn rename to src/entities/Fire.tscn index 46b8a9d..12a0c6f 100644 --- a/src/Fire.tscn +++ b/src/entities/Fire.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Light.png" type="Texture" id=1] -[ext_resource path="res://src/White.png" type="Texture" id=2] -[ext_resource path="res://src/Fire.gd" type="Script" id=3] +[ext_resource path="res://src/mechanics/Light.png" type="Texture" id=1] +[ext_resource path="res://src/mechanics/White.png" type="Texture" id=2] +[ext_resource path="res://src/entities/Fire.gd" type="Script" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 16 ) diff --git a/src/Player.tscn b/src/entities/Player.tscn similarity index 56% rename from src/Player.tscn rename to src/entities/Player.tscn index 3aa8ae6..a3ca0e5 100644 --- a/src/Player.tscn +++ b/src/entities/Player.tscn @@ -1,15 +1,14 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://src/White.png" type="Texture" id=1] -[ext_resource path="res://src/PlayerMovement.gd" type="Script" id=2] +[ext_resource path="res://src/mechanics/White.png" type="Texture" id=1] +[ext_resource path="res://src/entities/behaviours/PlayerMovement.tscn" type="PackedScene" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 16 ) [node name="Player" type="KinematicBody2D"] -[node name="PlayerMovement" type="Node" parent="."] -script = ExtResource( 2 ) +[node name="PlayerMovement" parent="." instance=ExtResource( 2 )] [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) diff --git a/src/PlayerMovement.gd b/src/entities/behaviours/PlayerMovement.gd similarity index 100% rename from src/PlayerMovement.gd rename to src/entities/behaviours/PlayerMovement.gd diff --git a/src/PlayerMovement.tscn b/src/entities/behaviours/PlayerMovement.tscn similarity index 53% rename from src/PlayerMovement.tscn rename to src/entities/behaviours/PlayerMovement.tscn index 145aa85..7161f53 100644 --- a/src/PlayerMovement.tscn +++ b/src/entities/behaviours/PlayerMovement.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/PlayerMovement.gd" type="Script" id=1] +[ext_resource path="res://src/entities/behaviours/PlayerMovement.gd" type="Script" id=1] [node name="PlayerMovement" type="Node"] script = ExtResource( 1 ) diff --git a/src/Game.tscn b/src/levels/Game.tscn similarity index 97% rename from src/Game.tscn rename to src/levels/Game.tscn index a477acc..4a79567 100644 --- a/src/Game.tscn +++ b/src/levels/Game.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Background.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Darkness.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/Fire.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/Player.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/mechanics/Background.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/mechanics/Darkness.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/entities/Fire.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/entities/Player.tscn" type="PackedScene" id=4] [node name="Game" type="Node2D"] diff --git a/src/MainMenu.gd b/src/levels/MainMenu.gd similarity index 100% rename from src/MainMenu.gd rename to src/levels/MainMenu.gd diff --git a/src/MainMenu.tscn b/src/levels/MainMenu.tscn similarity index 74% rename from src/MainMenu.tscn rename to src/levels/MainMenu.tscn index fee5590..941bdcb 100644 --- a/src/MainMenu.tscn +++ b/src/levels/MainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/MainMenu.gd" type="Script" id=1] +[ext_resource path="res://src/levels/MainMenu.gd" type="Script" id=1] [node name="MainMenu" type="Node2D"] script = ExtResource( 1 ) diff --git a/src/Background.tscn b/src/mechanics/Background.tscn similarity index 86% rename from src/Background.tscn rename to src/mechanics/Background.tscn index 22eb089..bdaf13b 100644 --- a/src/Background.tscn +++ b/src/mechanics/Background.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://src/Black.png" type="Texture" id=1] -[ext_resource path="res://src/White.png" type="Texture" id=2] -[ext_resource path="res://src/GimpWood.png" type="Texture" id=3] +[ext_resource path="res://src/mechanics/Black.png" type="Texture" id=1] +[ext_resource path="res://src/mechanics/White.png" type="Texture" id=2] +[ext_resource path="res://src/mechanics/GimpWood.png" type="Texture" id=3] [sub_resource type="TileSet" id=1] 0/name = "Black.png 0" diff --git a/src/Black.png b/src/mechanics/Black.png similarity index 100% rename from src/Black.png rename to src/mechanics/Black.png diff --git a/src/Black.png.import b/src/mechanics/Black.png.import similarity index 72% rename from src/Black.png.import rename to src/mechanics/Black.png.import index e209387..85b0395 100644 --- a/src/Black.png.import +++ b/src/mechanics/Black.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Black.png-22e975293195b4e333258a3cb447b5bd.stex" +path="res://.import/Black.png-1d7f7dfcb55e890586db64e8005bcd4d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://src/Black.png" -dest_files=[ "res://.import/Black.png-22e975293195b4e333258a3cb447b5bd.stex" ] +source_file="res://src/mechanics/Black.png" +dest_files=[ "res://.import/Black.png-1d7f7dfcb55e890586db64e8005bcd4d.stex" ] [params] diff --git a/src/Darkness.tscn b/src/mechanics/Darkness.tscn similarity index 100% rename from src/Darkness.tscn rename to src/mechanics/Darkness.tscn diff --git a/src/GimpWood.png b/src/mechanics/GimpWood.png similarity index 100% rename from src/GimpWood.png rename to src/mechanics/GimpWood.png diff --git a/src/GimpWood.png.import b/src/mechanics/GimpWood.png.import similarity index 71% rename from src/GimpWood.png.import rename to src/mechanics/GimpWood.png.import index 67c71c4..3d2809b 100644 --- a/src/GimpWood.png.import +++ b/src/mechanics/GimpWood.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/GimpWood.png-2b0a5198ac300b953a13fbc53f931941.stex" +path="res://.import/GimpWood.png-4e41be77762f8e440af37a2253f0fe68.stex" metadata={ "vram_texture": false } [deps] -source_file="res://src/GimpWood.png" -dest_files=[ "res://.import/GimpWood.png-2b0a5198ac300b953a13fbc53f931941.stex" ] +source_file="res://src/mechanics/GimpWood.png" +dest_files=[ "res://.import/GimpWood.png-4e41be77762f8e440af37a2253f0fe68.stex" ] [params] diff --git a/src/Light.png b/src/mechanics/Light.png similarity index 100% rename from src/Light.png rename to src/mechanics/Light.png diff --git a/src/Light.png.import b/src/mechanics/Light.png.import similarity index 72% rename from src/Light.png.import rename to src/mechanics/Light.png.import index 087ce1b..cf679d9 100644 --- a/src/Light.png.import +++ b/src/mechanics/Light.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Light.png-c5939eb13f28497c5b088df274cb69ef.stex" +path="res://.import/Light.png-23403d245754c06f53def44e66bfe25d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://src/Light.png" -dest_files=[ "res://.import/Light.png-c5939eb13f28497c5b088df274cb69ef.stex" ] +source_file="res://src/mechanics/Light.png" +dest_files=[ "res://.import/Light.png-23403d245754c06f53def44e66bfe25d.stex" ] [params] diff --git a/src/White.png b/src/mechanics/White.png similarity index 100% rename from src/White.png rename to src/mechanics/White.png diff --git a/src/White.png.import b/src/mechanics/White.png.import similarity index 72% rename from src/White.png.import rename to src/mechanics/White.png.import index dceb13c..dcf8377 100644 --- a/src/White.png.import +++ b/src/mechanics/White.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/White.png-11abf8da476fb8bc7f2f30d4f84a59c9.stex" +path="res://.import/White.png-f90595f9b068cd2719955f415819137c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://src/White.png" -dest_files=[ "res://.import/White.png-11abf8da476fb8bc7f2f30d4f84a59c9.stex" ] +source_file="res://src/mechanics/White.png" +dest_files=[ "res://.import/White.png-f90595f9b068cd2719955f415819137c.stex" ] [params]