diff --git a/.gitignore b/.gitignore index 6f41b6b..f0d68c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Godot 4+ specific ignores + .godot/ +*.translation export_presets.cfg -addons/ + assets/ +addons/ exports/ diff --git a/resources/art/Sheep/HappySheep_All.png b/resources/art/Sheep/HappySheep_All.png new file mode 100644 index 0000000..64ad14f Binary files /dev/null and b/resources/art/Sheep/HappySheep_All.png differ diff --git a/resources/art/Sheep/HappySheep_All.png.import b/resources/art/Sheep/HappySheep_All.png.import new file mode 100644 index 0000000..703f19e --- /dev/null +++ b/resources/art/Sheep/HappySheep_All.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b87bm74emkf1v" +path="res://.godot/imported/HappySheep_All.png-0839394ffb3e465232f60019b1be4e70.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Sheep/HappySheep_All.png" +dest_files=["res://.godot/imported/HappySheep_All.png-0839394ffb3e465232f60019b1be4e70.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/art/Sheep/HappySheep_Bouncing.png b/resources/art/Sheep/HappySheep_Bouncing.png new file mode 100644 index 0000000..e66dcaa Binary files /dev/null and b/resources/art/Sheep/HappySheep_Bouncing.png differ diff --git a/resources/art/Sheep/HappySheep_Bouncing.png.import b/resources/art/Sheep/HappySheep_Bouncing.png.import new file mode 100644 index 0000000..87a2b00 --- /dev/null +++ b/resources/art/Sheep/HappySheep_Bouncing.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dlri6rxgh0j45" +path="res://.godot/imported/HappySheep_Bouncing.png-e2c093c34d705d99957dd5aec87f8c80.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Sheep/HappySheep_Bouncing.png" +dest_files=["res://.godot/imported/HappySheep_Bouncing.png-e2c093c34d705d99957dd5aec87f8c80.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/art/Sheep/HappySheep_Idle.png b/resources/art/Sheep/HappySheep_Idle.png new file mode 100644 index 0000000..c6ed6b6 Binary files /dev/null and b/resources/art/Sheep/HappySheep_Idle.png differ diff --git a/resources/art/Sheep/HappySheep_Idle.png.import b/resources/art/Sheep/HappySheep_Idle.png.import new file mode 100644 index 0000000..b5470fe --- /dev/null +++ b/resources/art/Sheep/HappySheep_Idle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b6wodvoshiyxk" +path="res://.godot/imported/HappySheep_Idle.png-c017c8da6be094f0bcf016bdd431280a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Sheep/HappySheep_Idle.png" +dest_files=["res://.godot/imported/HappySheep_Idle.png-c017c8da6be094f0bcf016bdd431280a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/art/Sheep/Happy_Sheep.aseprite b/resources/art/Sheep/Happy_Sheep.aseprite new file mode 100644 index 0000000..89955f9 Binary files /dev/null and b/resources/art/Sheep/Happy_Sheep.aseprite differ diff --git a/resources/art/Torch_Red.png b/resources/art/Torch_Red.png new file mode 100644 index 0000000..ee5b79d Binary files /dev/null and b/resources/art/Torch_Red.png differ diff --git a/resources/art/Torch_Red.png.import b/resources/art/Torch_Red.png.import new file mode 100644 index 0000000..8e9c8ff --- /dev/null +++ b/resources/art/Torch_Red.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rkf8u2a652nr" +path="res://.godot/imported/Torch_Red.png-2e4de547251d9c8ec246c8c769cd3f04.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Torch_Red.png" +dest_files=["res://.godot/imported/Torch_Red.png-2e4de547251d9c8ec246c8c769cd3f04.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/art/Warrior_Blue.png b/resources/art/Warrior_Blue.png new file mode 100644 index 0000000..1048145 Binary files /dev/null and b/resources/art/Warrior_Blue.png differ diff --git a/resources/art/Warrior_Blue.png.import b/resources/art/Warrior_Blue.png.import new file mode 100644 index 0000000..61731c4 --- /dev/null +++ b/resources/art/Warrior_Blue.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://doepfv3j42n1u" +path="res://.godot/imported/Warrior_Blue.png-f07c955b01f898c0cc7b584d95028daf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Warrior_Blue.png" +dest_files=["res://.godot/imported/Warrior_Blue.png-f07c955b01f898c0cc7b584d95028daf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/art/Water.png b/resources/art/Water.png new file mode 100644 index 0000000..817eda7 Binary files /dev/null and b/resources/art/Water.png differ diff --git a/resources/art/Water.png.import b/resources/art/Water.png.import new file mode 100644 index 0000000..0f4c4e3 --- /dev/null +++ b/resources/art/Water.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8jv2a8pb5lbc" +path="res://.godot/imported/Water.png-77341aee95852c34d22010b4f323493c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/art/Water.png" +dest_files=["res://.godot/imported/Water.png-77341aee95852c34d22010b4f323493c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/resources/sprite_frames/goblin_torch_red.tres b/resources/sprite_frames/goblin_torch_red.tres index 117530b..b77d85b 100644 --- a/resources/sprite_frames/goblin_torch_red.tres +++ b/resources/sprite_frames/goblin_torch_red.tres @@ -1,6 +1,6 @@ [gd_resource type="SpriteFrames" load_steps=33 format=3 uid="uid://da8kntokso7av"] -[ext_resource type="Texture2D" uid="uid://rkf8u2a652nr" path="res://assets/Factions/Goblins/Troops/Torch/Red/Torch_Red.png" id="1_tw31u"] +[ext_resource type="Texture2D" uid="uid://rkf8u2a652nr" path="res://resources/art/Torch_Red.png" id="1_tw31u"] [sub_resource type="AtlasTexture" id="AtlasTexture_o3qkp"] atlas = ExtResource("1_tw31u") diff --git a/resources/sprite_frames/sheep.tres b/resources/sprite_frames/sheep.tres index 68f39f0..bb5e496 100644 --- a/resources/sprite_frames/sheep.tres +++ b/resources/sprite_frames/sheep.tres @@ -1,62 +1,62 @@ [gd_resource type="SpriteFrames" load_steps=17 format=3 uid="uid://cxn20r5ped3i5"] -[ext_resource type="Texture2D" uid="uid://b6wodvoshiyxk" path="res://assets/Resources/Sheep/HappySheep_Idle.png" id="1_bhexk"] -[ext_resource type="Texture2D" uid="uid://dlri6rxgh0j45" path="res://assets/Resources/Sheep/HappySheep_Bouncing.png" id="2_gxovd"] +[ext_resource type="Texture2D" uid="uid://b6wodvoshiyxk" path="res://resources/art/Sheep/HappySheep_Idle.png" id="1_wyuip"] +[ext_resource type="Texture2D" uid="uid://dlri6rxgh0j45" path="res://resources/art/Sheep/HappySheep_Bouncing.png" id="2_g4xpk"] [sub_resource type="AtlasTexture" id="AtlasTexture_t7xi7"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(0, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_xwn2w"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(128, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_gapcy"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(256, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_x5bvp"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(384, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_438ac"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(512, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_i8o4k"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(640, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_5yw0t"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(768, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_hx6q8"] -atlas = ExtResource("1_bhexk") +atlas = ExtResource("1_wyuip") region = Rect2(896, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_bko2v"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(0, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_7i1nd"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(128, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_ux3vn"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(256, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_1tal6"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(384, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_pr516"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(512, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_xb272"] -atlas = ExtResource("2_gxovd") +atlas = ExtResource("2_g4xpk") region = Rect2(640, 0, 128, 128) [resource] diff --git a/resources/sprite_frames/warrior_blue.tres b/resources/sprite_frames/warrior_blue.tres index c0f19d7..0589e8d 100644 --- a/resources/sprite_frames/warrior_blue.tres +++ b/resources/sprite_frames/warrior_blue.tres @@ -1,7 +1,7 @@ [gd_resource type="SpriteFrames" load_steps=29 format=3 uid="uid://ddnkn8hm4epop"] [ext_resource type="Texture2D" uid="uid://dqjlno771oqvu" path="res://assets/Factions/Knights/Troops/Dead/Dead.png" id="1_lguhc"] -[ext_resource type="Texture2D" uid="uid://doepfv3j42n1u" path="res://assets/Factions/Knights/Troops/Warrior/Blue/Warrior_Blue.png" id="2_5dugl"] +[ext_resource type="Texture2D" uid="uid://doepfv3j42n1u" path="res://resources/art/Warrior_Blue.png" id="2_5dugl"] [sub_resource type="AtlasTexture" id="AtlasTexture_yjpx0"] atlas = ExtResource("1_lguhc") diff --git a/src/main.tscn b/src/main.tscn index 1054e8e..89c3c36 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://dpo75j7ra04cm" path="res://src/characters/player.tscn" id="1_1ufet"] [ext_resource type="Script" path="res://src/main.gd" id="1_180hn"] [ext_resource type="PackedScene" uid="uid://b4jf4ii8i2prd" path="res://src/characters/mob.tscn" id="2_dncjg"] -[ext_resource type="Texture2D" uid="uid://8jv2a8pb5lbc" path="res://assets/Terrain/Water/Water.png" id="3_5bpf4"] +[ext_resource type="Texture2D" uid="uid://8jv2a8pb5lbc" path="res://resources/art/Water.png" id="3_5bpf4"] [ext_resource type="PackedScene" uid="uid://n4ny5ub0c0bg" path="res://src/hud.tscn" id="4_2dwxb"] [ext_resource type="TileSet" uid="uid://qf2hqmh4hx0b" path="res://resources/tilesets/ground.tres" id="5_52nv5"] [ext_resource type="SpriteFrames" uid="uid://cxn20r5ped3i5" path="res://resources/sprite_frames/sheep.tres" id="6_n0bua"]