diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5ad6c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +game.pck +.import/ diff --git a/Ch1S2.tscn b/Scenes/Ch1S2.tscn similarity index 94% rename from Ch1S2.tscn rename to Scenes/Ch1S2.tscn index 4c44ed3..ef20795 100644 --- a/Ch1S2.tscn +++ b/Scenes/Ch1S2.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://Scenes/UI.tscn" type="PackedScene" id=2] [ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=3] [ext_resource path="res://Tiles/Furniture/kettle.png" type="Texture" id=4] [ext_resource path="res://Tiles/Furniture/mug.png" type="Texture" id=5] [ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=6] [ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=7] -[ext_resource path="res://woods.tres" type="TileSet" id=8] +[ext_resource path="res://Scenes/woods.tres" type="TileSet" id=8] [ext_resource path="res://Sprites/charlene/Charlene.tscn" type="PackedScene" id=9] [ext_resource path="res://Sprites/alistair/Alistair-back.tscn" type="PackedScene" id=10] -[ext_resource path="res://lodge.tres" type="TileSet" id=14] +[ext_resource path="res://Scenes/lodge.tres" type="TileSet" id=14] [node name="LivingRoom" type="Node2D"] diff --git a/LivingRoom.tscn b/Scenes/LivingRoom.tscn similarity index 100% rename from LivingRoom.tscn rename to Scenes/LivingRoom.tscn diff --git a/MainScene.tscn b/Scenes/MainScene.tscn similarity index 93% rename from MainScene.tscn rename to Scenes/MainScene.tscn index 6073131..1bbbca2 100644 --- a/MainScene.tscn +++ b/Scenes/MainScene.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://UI.tscn" type="PackedScene" id=2] -[ext_resource path="res://lodge.tres" type="TileSet" id=14] +[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://Scenes/UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scenes/lodge.tres" type="TileSet" id=14] [node name="LivingRoom" type="Node2D"] position = Vector2( 60, 0 ) diff --git a/Player.tscn b/Scenes/Player.tscn similarity index 97% rename from Player.tscn rename to Scenes/Player.tscn index 69530e1..f705460 100644 --- a/Player.tscn +++ b/Scenes/Player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=16 format=2] -[ext_resource path="res://Player.gd" type="Script" id=1] +[ext_resource path="res://Scripts/Player.gd" type="Script" id=1] [ext_resource path="res://Sprites/mc/front.png" type="Texture" id=2] [ext_resource path="res://Sprites/mc/right.png" type="Texture" id=3] [ext_resource path="res://Sprites/mc/left.png" type="Texture" id=4] @@ -16,6 +16,16 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { +"frames": [ ExtResource( 4 ) ], +"loop": true, +"name": "IdleLeft", +"speed": 5.0 +}, { +"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], +"loop": true, +"name": "MoveLeft", +"speed": 5.0 +}, { "frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ], "loop": true, "name": "MoveUp", @@ -26,19 +36,14 @@ animations = [ { "name": "MoveRight", "speed": 5.0 }, { -"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], -"loop": true, -"name": "MoveLeft", -"speed": 5.0 -}, { "frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ], "loop": true, "name": "MoveDown", "speed": 5.0 }, { -"frames": [ ExtResource( 3 ) ], +"frames": [ ExtResource( 5 ) ], "loop": true, -"name": "IdleRight", +"name": "IdleUp", "speed": 5.0 }, { "frames": [ ExtResource( 2 ) ], @@ -46,14 +51,9 @@ animations = [ { "name": "IdleDown", "speed": 5.0 }, { -"frames": [ ExtResource( 5 ) ], -"loop": true, -"name": "IdleUp", -"speed": 5.0 -}, { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 3 ) ], "loop": true, -"name": "IdleLeft", +"name": "IdleRight", "speed": 5.0 } ] diff --git a/UI.tscn b/Scenes/UI.tscn similarity index 100% rename from UI.tscn rename to Scenes/UI.tscn diff --git a/backroom.tscn b/Scenes/backroom.tscn similarity index 99% rename from backroom.tscn rename to Scenes/backroom.tscn index a7d7b2d..bf19702 100644 --- a/backroom.tscn +++ b/Scenes/backroom.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://Tiles/backroom.png" type="Texture" id=1] -[ext_resource path="res://Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=2] [sub_resource type="TileSet" id=1] 0/name = "backroom.png 0" diff --git a/limbo.tres b/Scenes/limbo.tres similarity index 100% rename from limbo.tres rename to Scenes/limbo.tres diff --git a/limbo.tscn b/Scenes/limbo.tscn similarity index 86% rename from limbo.tscn rename to Scenes/limbo.tscn index 6669ca1..77c1a32 100644 --- a/limbo.tscn +++ b/Scenes/limbo.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://limbo.tres" type="TileSet" id=1] +[ext_resource path="res://Scenes/limbo.tres" type="TileSet" id=1] [node name="Node2D" type="Node2D"] diff --git a/lodge.tres b/Scenes/lodge.tres similarity index 100% rename from lodge.tres rename to Scenes/lodge.tres diff --git a/woods.tres b/Scenes/woods.tres similarity index 100% rename from woods.tres rename to Scenes/woods.tres diff --git a/CameraFollow.gd b/Scripts/CameraFollow.gd similarity index 100% rename from CameraFollow.gd rename to Scripts/CameraFollow.gd diff --git a/Player.gd b/Scripts/Player.gd similarity index 100% rename from Player.gd rename to Scripts/Player.gd diff --git a/project.godot b/project.godot index 2164390..ae03eda 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="Fullhouse" -run/main_scene="res://Ch1S2.tscn" +run/main_scene="res://Scenes/Ch1S2.tscn" boot_splash/fullsize=false boot_splash/use_filter=false boot_splash/bg_color=Color( 0.141176, 0.141176, 0.141176, 1 ) diff --git a/richal/front.png b/richal/front.png deleted file mode 100644 index a050dc5..0000000 Binary files a/richal/front.png and /dev/null differ diff --git a/richal/front.png.import b/richal/front.png.import deleted file mode 100644 index e45baf8..0000000 --- a/richal/front.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/front.png-43294f7d19ca1e0c5e3086461b9d7234.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://richal/front.png" -dest_files=[ "res://.import/front.png-43294f7d19ca1e0c5e3086461b9d7234.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0