diff --git a/.vscode/settings.json b/.vscode/settings.json index 3c0aab2..e69de29 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +0,0 @@ -{ - "godotTools.editorPath.godot4": "/home/joey/Programs/Godot_v4.2.2-stable_linux.x86_64" -} \ No newline at end of file diff --git a/actors/actor.gd b/actors/actor.gd new file mode 100644 index 0000000..5bcfc8d --- /dev/null +++ b/actors/actor.gd @@ -0,0 +1,3 @@ + +class_name Actor +extends Node2D \ No newline at end of file diff --git a/actors/enemies/blob/art/Blob.png b/actors/enemies/blob/art/Blob.png new file mode 100644 index 0000000..5fff121 --- /dev/null +++ b/actors/enemies/blob/art/Blob.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b7d7beaaf6a3af9f1ae2d6bb6d415f3cb2e04dd36142b4df3a5e1650108a024 +size 449 diff --git a/actors/enemies/blob/art/Blob.png.import b/actors/enemies/blob/art/Blob.png.import new file mode 100644 index 0000000..99d9e3f --- /dev/null +++ b/actors/enemies/blob/art/Blob.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd73lco3o6w4f" +path="res://.godot/imported/Blob.png-1c6e25fee902453014828903c414f9b3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://actors/enemies/blob/art/Blob.png" +dest_files=["res://.godot/imported/Blob.png-1c6e25fee902453014828903c414f9b3.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/actors/enemies/blob/blob.gd b/actors/enemies/blob/blob.gd new file mode 100644 index 0000000..1e2c7f3 --- /dev/null +++ b/actors/enemies/blob/blob.gd @@ -0,0 +1,10 @@ + +class_name Blob +extends EnemyCharacter + +func get_combatant_component(): + return $Combatant + + +func _ready(): + $AnimatedSprite2D.play("Idle") diff --git a/actors/enemies/blob/blob.tscn b/actors/enemies/blob/blob.tscn new file mode 100644 index 0000000..5c2109a --- /dev/null +++ b/actors/enemies/blob/blob.tscn @@ -0,0 +1,55 @@ +[gd_scene load_steps=9 format=3 uid="uid://dwi00nixw6eia"] + +[ext_resource type="Script" path="res://actors/enemies/blob/blob.gd" id="1_e8a40"] +[ext_resource type="Texture2D" uid="uid://dd73lco3o6w4f" path="res://actors/enemies/blob/art/Blob.png" id="2_ej213"] +[ext_resource type="Script" path="res://systems/combat/combatant.gd" id="3_mqgr1"] +[ext_resource type="Script" path="res://systems/combat/combat_stats.gd" id="4_22gbw"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_m73y6"] +atlas = ExtResource("2_ej213") +region = Rect2(0, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1g2yn"] +atlas = ExtResource("2_ej213") +region = Rect2(32, 0, 32, 32) + +[sub_resource type="SpriteFrames" id="SpriteFrames_p36og"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_m73y6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1g2yn") +}], +"loop": true, +"name": &"Idle", +"speed": 3.0 +}] + +[sub_resource type="Resource" id="Resource_46v15"] +script = ExtResource("4_22gbw") +max_hp = 10 +max_physical_stamina = 10 +max_mental_stamina = 10 +strength = 1 +wisdom = 1 +constitution = 1 +willpower = 1 +speed = 1 +focus = 1 +accuracy = 1 +agility = 1 + +[node name="Blob" type="Node2D"] +script = ExtResource("1_e8a40") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +texture_filter = 1 +sprite_frames = SubResource("SpriteFrames_p36og") +animation = &"Idle" +frame_progress = 0.110573 + +[node name="Combatant" type="Node" parent="."] +script = ExtResource("3_mqgr1") +combat_stats = SubResource("Resource_46v15") diff --git a/actors/enemies/enemy_character.gd b/actors/enemies/enemy_character.gd index 1851ead..17e3a8d 100644 --- a/actors/enemies/enemy_character.gd +++ b/actors/enemies/enemy_character.gd @@ -1,3 +1,3 @@ class_name EnemyCharacter -extends Node2D \ No newline at end of file +extends Actor diff --git a/actors/player chars/alex/alex.gd b/actors/player chars/alex/alex.gd index afdde77..14b29f2 100644 --- a/actors/player chars/alex/alex.gd +++ b/actors/player chars/alex/alex.gd @@ -2,3 +2,5 @@ class_name Alex extends PlayerCharacter +func get_combatant_component(): + return $Combatant diff --git a/actors/player chars/alex/alex.tscn b/actors/player chars/alex/alex.tscn index 282b890..94dc02b 100644 --- a/actors/player chars/alex/alex.tscn +++ b/actors/player chars/alex/alex.tscn @@ -1,7 +1,10 @@ -[gd_scene load_steps=16 format=3 uid="uid://d1nq0efa53wra"] +[gd_scene load_steps=21 format=3 uid="uid://d1nq0efa53wra"] -[ext_resource type="Script" path="res://actors/player chars/player_character.gd" id="1_l60p5"] -[ext_resource type="Texture2D" uid="uid://cs6uqgpyvwy7r" path="res://assets/art/character sprites/alex.png" id="2_2yoh5"] +[ext_resource type="Script" path="res://actors/player chars/alex/alex.gd" id="1_3ppui"] +[ext_resource type="Texture2D" uid="uid://cs6uqgpyvwy7r" path="res://actors/player chars/alex/art/alex.png" id="2_2yoh5"] +[ext_resource type="Script" path="res://systems/combat/combatant.gd" id="3_m4k76"] +[ext_resource type="Script" path="res://systems/combat/combat_stats.gd" id="4_6ae2h"] +[ext_resource type="Script" path="res://systems/combat/common actions/action_attack.gd" id="5_dhgwv"] [sub_resource type="AtlasTexture" id="AtlasTexture_u1hru"] atlas = ExtResource("2_2yoh5") @@ -129,11 +132,34 @@ animations = [{ "speed": 5.0 }] +[sub_resource type="Resource" id="Resource_y86ab"] +script = ExtResource("4_6ae2h") +max_hp = 100 +max_physical_stamina = 10 +max_mental_stamina = 10 +strength = 5 +wisdom = 1 +constitution = 2 +willpower = 1 +speed = 1 +focus = 1 +accuracy = 1 +agility = 1 + +[sub_resource type="Resource" id="Resource_2d861"] +script = ExtResource("5_dhgwv") + [node name="Alex" type="Node2D" node_paths=PackedStringArray("sprite")] -script = ExtResource("1_l60p5") +script = ExtResource("1_3ppui") char_name = "Alex" sprite = NodePath("AnimatedSprite2D") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +texture_filter = 1 sprite_frames = SubResource("SpriteFrames_vu5b1") animation = &"Idle_West" + +[node name="Combatant" type="Node" parent="."] +script = ExtResource("3_m4k76") +combat_stats = SubResource("Resource_y86ab") +actions = Array[Resource("res://systems/combat/combat_action.gd")]([SubResource("Resource_2d861")]) diff --git a/assets/art/character sprites/alex.png b/actors/player chars/alex/art/alex.png similarity index 100% rename from assets/art/character sprites/alex.png rename to actors/player chars/alex/art/alex.png diff --git a/assets/art/character sprites/alex.png.import b/actors/player chars/alex/art/alex.png.import similarity index 71% rename from assets/art/character sprites/alex.png.import rename to actors/player chars/alex/art/alex.png.import index 207f88d..25534ff 100644 --- a/assets/art/character sprites/alex.png.import +++ b/actors/player chars/alex/art/alex.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cs6uqgpyvwy7r" -path="res://.godot/imported/alex.png-d2fbd360031d0aeabb7ca94deee40098.ctex" +path="res://.godot/imported/alex.png-56d47e9a77a03f088a2e0c12cdb4ed2d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/alex.png" -dest_files=["res://.godot/imported/alex.png-d2fbd360031d0aeabb7ca94deee40098.ctex"] +source_file="res://actors/player chars/alex/art/alex.png" +dest_files=["res://.godot/imported/alex.png-56d47e9a77a03f088a2e0c12cdb4ed2d.ctex"] [params] diff --git a/actors/player chars/player_character.gd b/actors/player chars/player_character.gd index c798149..75f2283 100644 --- a/actors/player chars/player_character.gd +++ b/actors/player chars/player_character.gd @@ -1,6 +1,6 @@ class_name PlayerCharacter -extends Node2D +extends Actor enum FacingDirection { diff --git a/assets/binary files/.gdignore b/assets/binary files/.gdignore deleted file mode 100644 index 8d1c8b6..0000000 --- a/assets/binary files/.gdignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png.import b/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png.import deleted file mode 100644 index 3d24aff..0000000 --- a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dxqymswxvgfax" -path="res://.godot/imported/MainLev2.0.png-c0f0144cffd3ebe82e6676edefbdd261.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png" -dest_files=["res://.godot/imported/MainLev2.0.png-c0f0144cffd3ebe82e6676edefbdd261.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/assets/art/character sprites/Szadi NPCs/Female1.png b/assets/extra/character sprites/Szadi NPCs/Female1.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Female1.png rename to assets/extra/character sprites/Szadi NPCs/Female1.png diff --git a/assets/art/character sprites/Szadi NPCs/Female1.png.import b/assets/extra/character sprites/Szadi NPCs/Female1.png.import similarity index 69% rename from assets/art/character sprites/Szadi NPCs/Female1.png.import rename to assets/extra/character sprites/Szadi NPCs/Female1.png.import index 1e32c2b..a653926 100644 --- a/assets/art/character sprites/Szadi NPCs/Female1.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Female1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://uvm83t4gchb7" -path="res://.godot/imported/Female1.png-751b04120ba1352265921310378ca8c2.ctex" +path="res://.godot/imported/Female1.png-2eec5ea28254392b2e95464ad0a94372.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Female1.png" -dest_files=["res://.godot/imported/Female1.png-751b04120ba1352265921310378ca8c2.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Female1.png" +dest_files=["res://.godot/imported/Female1.png-2eec5ea28254392b2e95464ad0a94372.ctex"] [params] diff --git a/assets/art/character sprites/Szadi NPCs/Female2.png b/assets/extra/character sprites/Szadi NPCs/Female2.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Female2.png rename to assets/extra/character sprites/Szadi NPCs/Female2.png diff --git a/assets/art/character sprites/Szadi NPCs/Female2.png.import b/assets/extra/character sprites/Szadi NPCs/Female2.png.import similarity index 69% rename from assets/art/character sprites/Szadi NPCs/Female2.png.import rename to assets/extra/character sprites/Szadi NPCs/Female2.png.import index 77ee4c9..4c12baa 100644 --- a/assets/art/character sprites/Szadi NPCs/Female2.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Female2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cgc15eklb3nu" -path="res://.godot/imported/Female2.png-c21c085d5b87f05b39035afefe476932.ctex" +path="res://.godot/imported/Female2.png-01de3d78f89683cfbbe8e8792cc6bd08.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Female2.png" -dest_files=["res://.godot/imported/Female2.png-c21c085d5b87f05b39035afefe476932.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Female2.png" +dest_files=["res://.godot/imported/Female2.png-01de3d78f89683cfbbe8e8792cc6bd08.ctex"] [params] diff --git a/assets/art/character sprites/Szadi NPCs/Male1.png b/assets/extra/character sprites/Szadi NPCs/Male1.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Male1.png rename to assets/extra/character sprites/Szadi NPCs/Male1.png diff --git a/assets/art/character sprites/Szadi NPCs/Male1.png.import b/assets/extra/character sprites/Szadi NPCs/Male1.png.import similarity index 70% rename from assets/art/character sprites/Szadi NPCs/Male1.png.import rename to assets/extra/character sprites/Szadi NPCs/Male1.png.import index 7107a72..9385ce8 100644 --- a/assets/art/character sprites/Szadi NPCs/Male1.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Male1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://4h8n71pv0rte" -path="res://.godot/imported/Male1.png-7e24926694ba397cd822ce2fe47dd922.ctex" +path="res://.godot/imported/Male1.png-963f24f22d76f069f012c827a633bb63.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Male1.png" -dest_files=["res://.godot/imported/Male1.png-7e24926694ba397cd822ce2fe47dd922.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Male1.png" +dest_files=["res://.godot/imported/Male1.png-963f24f22d76f069f012c827a633bb63.ctex"] [params] diff --git a/assets/art/character sprites/Szadi NPCs/Male2.png b/assets/extra/character sprites/Szadi NPCs/Male2.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Male2.png rename to assets/extra/character sprites/Szadi NPCs/Male2.png diff --git a/assets/art/character sprites/Szadi NPCs/Male2.png.import b/assets/extra/character sprites/Szadi NPCs/Male2.png.import similarity index 70% rename from assets/art/character sprites/Szadi NPCs/Male2.png.import rename to assets/extra/character sprites/Szadi NPCs/Male2.png.import index a55f0cd..7c50652 100644 --- a/assets/art/character sprites/Szadi NPCs/Male2.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Male2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://daq5hi7v0qbys" -path="res://.godot/imported/Male2.png-383cd63349d8e1441ed489d992446ce6.ctex" +path="res://.godot/imported/Male2.png-457a0ef9a2428d306d6490ae1fdbea89.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Male2.png" -dest_files=["res://.godot/imported/Male2.png-383cd63349d8e1441ed489d992446ce6.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Male2.png" +dest_files=["res://.godot/imported/Male2.png-457a0ef9a2428d306d6490ae1fdbea89.ctex"] [params] diff --git a/assets/art/character sprites/Szadi NPCs/Male3.png b/assets/extra/character sprites/Szadi NPCs/Male3.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Male3.png rename to assets/extra/character sprites/Szadi NPCs/Male3.png diff --git a/assets/art/character sprites/Szadi NPCs/Male3.png.import b/assets/extra/character sprites/Szadi NPCs/Male3.png.import similarity index 70% rename from assets/art/character sprites/Szadi NPCs/Male3.png.import rename to assets/extra/character sprites/Szadi NPCs/Male3.png.import index 2531998..4e8dc7a 100644 --- a/assets/art/character sprites/Szadi NPCs/Male3.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Male3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cj13x130gdhv3" -path="res://.godot/imported/Male3.png-30f6f69b4fbf36e0cd2cc492c4dbe0f2.ctex" +path="res://.godot/imported/Male3.png-b2d56b3ab554af3a5ebd939e18716414.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Male3.png" -dest_files=["res://.godot/imported/Male3.png-30f6f69b4fbf36e0cd2cc492c4dbe0f2.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Male3.png" +dest_files=["res://.godot/imported/Male3.png-b2d56b3ab554af3a5ebd939e18716414.ctex"] [params] diff --git a/assets/art/character sprites/Szadi NPCs/Male4.png b/assets/extra/character sprites/Szadi NPCs/Male4.png similarity index 100% rename from assets/art/character sprites/Szadi NPCs/Male4.png rename to assets/extra/character sprites/Szadi NPCs/Male4.png diff --git a/assets/art/character sprites/Szadi NPCs/Male4.png.import b/assets/extra/character sprites/Szadi NPCs/Male4.png.import similarity index 70% rename from assets/art/character sprites/Szadi NPCs/Male4.png.import rename to assets/extra/character sprites/Szadi NPCs/Male4.png.import index 62a4902..699a579 100644 --- a/assets/art/character sprites/Szadi NPCs/Male4.png.import +++ b/assets/extra/character sprites/Szadi NPCs/Male4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://biv828180br3o" -path="res://.godot/imported/Male4.png-4f84124cbebb5fd4c9ec637846a7c80c.ctex" +path="res://.godot/imported/Male4.png-587a54eeb23dff76c97924ec7f3ba382.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/character sprites/Szadi NPCs/Male4.png" -dest_files=["res://.godot/imported/Male4.png-4f84124cbebb5fd4c9ec637846a7c80c.ctex"] +source_file="res://assets/extra/character sprites/Szadi NPCs/Male4.png" +dest_files=["res://.godot/imported/Male4.png-587a54eeb23dff76c97924ec7f3ba382.ctex"] [params] diff --git a/assets/art/tile sets/Village_AnimatedWaterTiles.png.import b/assets/extra/tile sets/Village_AnimatedWaterTiles.png.import similarity index 100% rename from assets/art/tile sets/Village_AnimatedWaterTiles.png.import rename to assets/extra/tile sets/Village_AnimatedWaterTiles.png.import diff --git a/assets/art/tile sets/Village_BuildingTiles.png.import b/assets/extra/tile sets/Village_BuildingTiles.png.import similarity index 100% rename from assets/art/tile sets/Village_BuildingTiles.png.import rename to assets/extra/tile sets/Village_BuildingTiles.png.import diff --git a/assets/art/tile sets/Village_ObjectTiles.png.import b/assets/extra/tile sets/Village_ObjectTiles.png.import similarity index 100% rename from assets/art/tile sets/Village_ObjectTiles.png.import rename to assets/extra/tile sets/Village_ObjectTiles.png.import diff --git a/assets/art/tile sets/Village_TerrainTiles.png.import b/assets/extra/tile sets/Village_TerrainTiles.png.import similarity index 100% rename from assets/art/tile sets/Village_TerrainTiles.png.import rename to assets/extra/tile sets/Village_TerrainTiles.png.import diff --git a/assets/art/ui/bar_over.png b/assets/extra/ui/bar_over.png similarity index 100% rename from assets/art/ui/bar_over.png rename to assets/extra/ui/bar_over.png diff --git a/assets/art/ui/bar_over.png.import b/assets/extra/ui/bar_over.png.import similarity index 71% rename from assets/art/ui/bar_over.png.import rename to assets/extra/ui/bar_over.png.import index 461c1e0..c43f2cb 100644 --- a/assets/art/ui/bar_over.png.import +++ b/assets/extra/ui/bar_over.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bnp5t7o26kb0c" -path="res://.godot/imported/bar_over.png-55a6bae0151fad781ffcae0da3dc8d8b.ctex" +path="res://.godot/imported/bar_over.png-845363e26d1dc5930d27712ba94e0f91.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/ui/bar_over.png" -dest_files=["res://.godot/imported/bar_over.png-55a6bae0151fad781ffcae0da3dc8d8b.ctex"] +source_file="res://assets/extra/ui/bar_over.png" +dest_files=["res://.godot/imported/bar_over.png-845363e26d1dc5930d27712ba94e0f91.ctex"] [params] diff --git a/assets/art/ui/bar_under.png b/assets/extra/ui/bar_under.png similarity index 100% rename from assets/art/ui/bar_under.png rename to assets/extra/ui/bar_under.png diff --git a/assets/art/ui/bar_under.png.import b/assets/extra/ui/bar_under.png.import similarity index 71% rename from assets/art/ui/bar_under.png.import rename to assets/extra/ui/bar_under.png.import index c666cd6..1265be9 100644 --- a/assets/art/ui/bar_under.png.import +++ b/assets/extra/ui/bar_under.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dqf1p1mfki3vc" -path="res://.godot/imported/bar_under.png-f50ef5b32422e97a71938bac527202bf.ctex" +path="res://.godot/imported/bar_under.png-640e8ada6e2e3b0f68aea5197ab95723.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/ui/bar_under.png" -dest_files=["res://.godot/imported/bar_under.png-f50ef5b32422e97a71938bac527202bf.ctex"] +source_file="res://assets/extra/ui/bar_under.png" +dest_files=["res://.godot/imported/bar_under.png-640e8ada6e2e3b0f68aea5197ab95723.ctex"] [params] diff --git a/assets/art/ui/bars.png b/assets/extra/ui/bars.png similarity index 100% rename from assets/art/ui/bars.png rename to assets/extra/ui/bars.png diff --git a/assets/art/ui/bars.png.import b/assets/extra/ui/bars.png.import similarity index 73% rename from assets/art/ui/bars.png.import rename to assets/extra/ui/bars.png.import index c147484..2b8ae20 100644 --- a/assets/art/ui/bars.png.import +++ b/assets/extra/ui/bars.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dusv2g2bfou5l" -path="res://.godot/imported/bars.png-44ddffd67a1ebda120adc0b0e3911832.ctex" +path="res://.godot/imported/bars.png-fcaf8e549b67a5e765aebf41c3229fd3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/art/ui/bars.png" -dest_files=["res://.godot/imported/bars.png-44ddffd67a1ebda120adc0b0e3911832.ctex"] +source_file="res://assets/extra/ui/bars.png" +dest_files=["res://.godot/imported/bars.png-fcaf8e549b67a5e765aebf41c3229fd3.ctex"] [params] diff --git a/assets/source files/.gdignore b/assets/source files/.gdignore new file mode 100644 index 0000000..e69de29 diff --git a/assets/source files/Blob.aseprite b/assets/source files/Blob.aseprite new file mode 100644 index 0000000..314f085 Binary files /dev/null and b/assets/source files/Blob.aseprite differ diff --git a/assets/binary files/NPC_Characters_v1.0/Female1.png b/assets/source files/NPC_Characters_v1.0/Female1.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Female1.png rename to assets/source files/NPC_Characters_v1.0/Female1.png diff --git a/assets/source files/NPC_Characters_v1.0/Female1.png.import b/assets/source files/NPC_Characters_v1.0/Female1.png.import new file mode 100644 index 0000000..74d68c2 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Female1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4vbvmka0nuap" +path="res://.godot/imported/Female1.png-56887a3529fb336cf0858ab90f1fa770.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Female1.png" +dest_files=["res://.godot/imported/Female1.png-56887a3529fb336cf0858ab90f1fa770.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/assets/binary files/NPC_Characters_v1.0/Female2.png b/assets/source files/NPC_Characters_v1.0/Female2.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Female2.png rename to assets/source files/NPC_Characters_v1.0/Female2.png diff --git a/assets/source files/NPC_Characters_v1.0/Female2.png.import b/assets/source files/NPC_Characters_v1.0/Female2.png.import new file mode 100644 index 0000000..300ca92 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Female2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7w7x8v2knti6" +path="res://.godot/imported/Female2.png-7455c479d4df8ac112540e04ff5b5630.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Female2.png" +dest_files=["res://.godot/imported/Female2.png-7455c479d4df8ac112540e04ff5b5630.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/assets/binary files/NPC_Characters_v1.0/Male1.png b/assets/source files/NPC_Characters_v1.0/Male1.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Male1.png rename to assets/source files/NPC_Characters_v1.0/Male1.png diff --git a/assets/source files/NPC_Characters_v1.0/Male1.png.import b/assets/source files/NPC_Characters_v1.0/Male1.png.import new file mode 100644 index 0000000..acb46c5 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Male1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c62uqc15bk3v1" +path="res://.godot/imported/Male1.png-52f5a648166156cb5e195109c5672d85.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Male1.png" +dest_files=["res://.godot/imported/Male1.png-52f5a648166156cb5e195109c5672d85.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/assets/binary files/NPC_Characters_v1.0/Male2.png b/assets/source files/NPC_Characters_v1.0/Male2.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Male2.png rename to assets/source files/NPC_Characters_v1.0/Male2.png diff --git a/assets/source files/NPC_Characters_v1.0/Male2.png.import b/assets/source files/NPC_Characters_v1.0/Male2.png.import new file mode 100644 index 0000000..5c7a0f4 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Male2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://6wby1g2ryiga" +path="res://.godot/imported/Male2.png-ea5c98f76a14fdec8476da97ac1fd5c0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Male2.png" +dest_files=["res://.godot/imported/Male2.png-ea5c98f76a14fdec8476da97ac1fd5c0.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/assets/binary files/NPC_Characters_v1.0/Male3.png b/assets/source files/NPC_Characters_v1.0/Male3.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Male3.png rename to assets/source files/NPC_Characters_v1.0/Male3.png diff --git a/assets/source files/NPC_Characters_v1.0/Male3.png.import b/assets/source files/NPC_Characters_v1.0/Male3.png.import new file mode 100644 index 0000000..bcfab11 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Male3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://duom7a2rcyoxr" +path="res://.godot/imported/Male3.png-55debb59273585e3573b0ff3535086f8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Male3.png" +dest_files=["res://.godot/imported/Male3.png-55debb59273585e3573b0ff3535086f8.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/assets/binary files/NPC_Characters_v1.0/Male4.png b/assets/source files/NPC_Characters_v1.0/Male4.png similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/Male4.png rename to assets/source files/NPC_Characters_v1.0/Male4.png diff --git a/assets/source files/NPC_Characters_v1.0/Male4.png.import b/assets/source files/NPC_Characters_v1.0/Male4.png.import new file mode 100644 index 0000000..abfa487 --- /dev/null +++ b/assets/source files/NPC_Characters_v1.0/Male4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0jpxexgng8o6" +path="res://.godot/imported/Male4.png-8c683ea0a332ef0d4c17509ab8e2d3d4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/binary files/NPC_Characters_v1.0/Male4.png" +dest_files=["res://.godot/imported/Male4.png-8c683ea0a332ef0d4c17509ab8e2d3d4.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/assets/binary files/NPC_Characters_v1.0/_INFO.txt b/assets/source files/NPC_Characters_v1.0/_INFO.txt similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_INFO.txt rename to assets/source files/NPC_Characters_v1.0/_INFO.txt diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Female1.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Female1.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Female1.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Female1.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Female2.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Female2.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Female2.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Female2.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Male1.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Male1.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Male1.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Male1.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Male2.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Male2.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Male2.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Male2.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Male3.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Male3.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Male3.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Male3.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_PSD/Male4.psd b/assets/source files/NPC_Characters_v1.0/_PSD/Male4.psd similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_PSD/Male4.psd rename to assets/source files/NPC_Characters_v1.0/_PSD/Male4.psd diff --git a/assets/binary files/NPC_Characters_v1.0/_license.txt b/assets/source files/NPC_Characters_v1.0/_license.txt similarity index 100% rename from assets/binary files/NPC_Characters_v1.0/_license.txt rename to assets/source files/NPC_Characters_v1.0/_license.txt diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/MainLev_autotiling.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/_license.txt b/assets/source files/tile sets/RPGW_GrassLand_v2.01/_license.txt similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/_license.txt rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/_license.txt diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1A_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1C_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2A_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2B_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2C_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree2D_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3A_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3B_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3C_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/tree3D_ss.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1A.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_1B.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2A.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_2B.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3A.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_3B.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4A.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/Water_tafle_4B.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerA_ef.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/anim/water/water_layerB_ef.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative.png.import diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png b/assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png diff --git a/assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png.import b/assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png.import similarity index 100% rename from assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png.import rename to assets/source files/tile sets/RPGW_GrassLand_v2.01/decorative_nograss.png.import diff --git a/assets/binary files/tile sets/Village_AnimatedWaterTiles.png b/assets/source files/tile sets/Village_AnimatedWaterTiles.png similarity index 100% rename from assets/binary files/tile sets/Village_AnimatedWaterTiles.png rename to assets/source files/tile sets/Village_AnimatedWaterTiles.png diff --git a/assets/binary files/tile sets/Village_AnimatedWaterTiles.png.import b/assets/source files/tile sets/Village_AnimatedWaterTiles.png.import similarity index 100% rename from assets/binary files/tile sets/Village_AnimatedWaterTiles.png.import rename to assets/source files/tile sets/Village_AnimatedWaterTiles.png.import diff --git a/assets/binary files/tile sets/Village_BuildingTiles.png b/assets/source files/tile sets/Village_BuildingTiles.png similarity index 100% rename from assets/binary files/tile sets/Village_BuildingTiles.png rename to assets/source files/tile sets/Village_BuildingTiles.png diff --git a/assets/binary files/tile sets/Village_BuildingTiles.png.import b/assets/source files/tile sets/Village_BuildingTiles.png.import similarity index 100% rename from assets/binary files/tile sets/Village_BuildingTiles.png.import rename to assets/source files/tile sets/Village_BuildingTiles.png.import diff --git a/assets/binary files/tile sets/Village_ObjectTiles.png b/assets/source files/tile sets/Village_ObjectTiles.png similarity index 100% rename from assets/binary files/tile sets/Village_ObjectTiles.png rename to assets/source files/tile sets/Village_ObjectTiles.png diff --git a/assets/binary files/tile sets/Village_ObjectTiles.png.import b/assets/source files/tile sets/Village_ObjectTiles.png.import similarity index 100% rename from assets/binary files/tile sets/Village_ObjectTiles.png.import rename to assets/source files/tile sets/Village_ObjectTiles.png.import diff --git a/assets/binary files/tile sets/Village_TerrainTiles.png b/assets/source files/tile sets/Village_TerrainTiles.png similarity index 100% rename from assets/binary files/tile sets/Village_TerrainTiles.png rename to assets/source files/tile sets/Village_TerrainTiles.png diff --git a/assets/binary files/tile sets/Village_TerrainTiles.png.import b/assets/source files/tile sets/Village_TerrainTiles.png.import similarity index 100% rename from assets/binary files/tile sets/Village_TerrainTiles.png.import rename to assets/source files/tile sets/Village_TerrainTiles.png.import diff --git a/systems/combat/combat_action.gd b/systems/combat/combat_action.gd index 429e7e0..87afb18 100644 --- a/systems/combat/combat_action.gd +++ b/systems/combat/combat_action.gd @@ -1,3 +1,9 @@ class_name CombatAction -extends Resource \ No newline at end of file +extends Resource + +# The character performing the action +var source_actor: Combatant + +func execute(): + push_warning("Default CombatAction::execute method called! This method should be overridden!") \ No newline at end of file diff --git a/systems/combat/combat_state.gd b/systems/combat/combat_state.gd index 68e86c7..ccc74b1 100644 --- a/systems/combat/combat_state.gd +++ b/systems/combat/combat_state.gd @@ -4,17 +4,61 @@ extends GameState ## The combat state controls/manages combat -var teams: Array[CombatTeam] = [] +@export var teams: Array[CombatTeam] = [] +var action_queue: Array[CombatAction] = [] +var defeated_teams: Array[CombatTeam] = [] +var combat_log: CombatLog + func state_enter(_params: Dictionary): - pass + + defeated_teams.clear() + + print("Combat started!") + + combat_log = find_child("CombatLog") + if !combat_log: + push_warning("Combat Log not found!") + else: + combat_log.push_message("Combat Started!") + + + if teams.size() < 2: + push_warning("Combat started with less than 2 teams!") + + # Connect to all needed signals + for team in teams: + for combatant in team.members: + if !combatant.damaged.is_connected(on_combatant_damaged): + combatant.damaged.connect(on_combatant_damaged) + + func state_exit(): - pass + pass func state_process(delta): - for team in teams: - team.tick_atb(delta) - team.process_ready_actions() - \ No newline at end of file + + # Tick all of the teams + for team in teams: + team.tick_atb(delta) + action_queue.append_array(team.get_ready_actions()) + + # TODO: Execute all ready actions + + # clean up defeated teams + var r = range(0,teams.size()) + r.reverse() + for i in r: + if teams[i].is_defeated(): + defeated_teams.append(teams[i]) + teams.remove_at(i) + + # TODO: Check for winning team(s) and for defeat of the + # player team (or other specific defeat conditions) + + + +func on_combatant_damaged(damaged_combatant, source, final_amount): + combat_log.push_message("%s hit %s for %s damage!" %[source.attacker, damaged_combatant, final_amount]) diff --git a/systems/combat/combat_stats.gd b/systems/combat/combat_stats.gd index 7702ede..c16d596 100644 --- a/systems/combat/combat_stats.gd +++ b/systems/combat/combat_stats.gd @@ -30,11 +30,11 @@ extends Resource # Battle turn order or ATB time @export var speed = 1 -# Critical hit chance +# Critical hit chance bonus @export var focus = 1 -# Chance to hit +# Chance to hit bonus @export var accuracy = 1 -# Chance to dodge -@export var aabbgility = 1 +# Chance to dodge bonus +@export var agility = 1 diff --git a/systems/combat/combat_team.gd b/systems/combat/combat_team.gd index ab7cfbe..7b9d99b 100644 --- a/systems/combat/combat_team.gd +++ b/systems/combat/combat_team.gd @@ -5,11 +5,21 @@ extends Node ## ## -var team: Array[Combatant] = [] +enum Allegience +{ + PLAYER, + ENEMY, + NEUTRAL, +} + +@export var members: Array[Combatant] = [] +@export var allegience: Allegience = Allegience.NEUTRAL + +var action_queue: Array[CombatAction] = [] func is_defeated(): - for combatant in team: + for combatant in members: if !combatant.is_defeated(): return false @@ -17,9 +27,8 @@ func is_defeated(): func tick_atb(delta): - for combatant in team: + for combatant in members: combatant.tick_atb(delta) -func process_ready_actions(): - # TODO: Implement process_ready_actions() - pass +func get_ready_actions(): + return action_queue diff --git a/systems/combat/combatant.gd b/systems/combat/combatant.gd index 5ca489b..c65e078 100644 --- a/systems/combat/combatant.gd +++ b/systems/combat/combatant.gd @@ -9,6 +9,8 @@ extends Node ## Anything that can take a turn in combat needs to use this component: ## Player characters, enemys, allies, neutral units, etc. +signal damaged(damaged_combatant: Combatant, source: DamageSource, final_amount: int) + @export var combat_stats: CombatStats @export var actions: Array[CombatAction] = [] @@ -34,6 +36,18 @@ func tick_atb(delta): atb -= delta -# Override these methods in child classes func take_damage(source: DamageSource): - hp -= source.amount \ No newline at end of file + + # TODO: Apply stats and status to adjust the incoming damage amount + + var final_amount = source.amount + + if source.element == DamageSource.Element.PHYSICAL: + final_amount -= combat_stats.constitution + + if source.type == DamageSource.Type.MAGIC: + final_amount -= combat_stats.willpower + + hp -= final_amount + + damaged.emit(self, source, final_amount) \ No newline at end of file diff --git a/systems/combat/common actions/action_attack.gd b/systems/combat/common actions/action_attack.gd new file mode 100644 index 0000000..0bf9326 --- /dev/null +++ b/systems/combat/common actions/action_attack.gd @@ -0,0 +1,9 @@ + +class_name Attack +extends CombatAction + +var target: Combatant +var damage: DamageSource + +func execute(): + target.take_damage(damage) \ No newline at end of file diff --git a/systems/combat/ui/combat_log.gd b/systems/combat/ui/combat_log.gd new file mode 100644 index 0000000..3971d6a --- /dev/null +++ b/systems/combat/ui/combat_log.gd @@ -0,0 +1,28 @@ + +class_name CombatLog +extends Control + +@onready var log_label = $PanelContainer/MarginContainer/Label + +var history: Array[String] = [] +var timer: Timer + +func _ready(): + timer = Timer.new() + if !timer.timeout.is_connected(on_timeout): + timer.timeout.connect(on_timeout) + + add_child(timer) + + +func on_timeout(): + history.append(log_label.text) + log_label.text = "" + timer.stop() + +func push_message(msg: String): + if !timer.is_stopped(): + on_timeout() + + log_label.text = msg + timer.start(5.0) diff --git a/systems/combat/ui/combat_log.tscn b/systems/combat/ui/combat_log.tscn new file mode 100644 index 0000000..3fd2209 --- /dev/null +++ b/systems/combat/ui/combat_log.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=2 format=3 uid="uid://bp3ea21lf4bpm"] + +[ext_resource type="Script" path="res://systems/combat/ui/combat_log.gd" id="1_57beg"] + +[node name="CombatLog" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1_57beg") + +[node name="PanelContainer" type="PanelContainer" parent="."] +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_left = 5 +theme_override_constants/margin_right = 5 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +text = "Hello this is a test yo" diff --git a/testing/art/MainLev2.0.png b/testing/art/MainLev2.0.png new file mode 100644 index 0000000..191cd7c --- /dev/null +++ b/testing/art/MainLev2.0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca99074b0c8c611cbc3497d99ff93f3f0bbf614065baa78180234c6087049eb6 +size 982971 diff --git a/testing/art/MainLev2.0.png.import b/testing/art/MainLev2.0.png.import new file mode 100644 index 0000000..f20263d --- /dev/null +++ b/testing/art/MainLev2.0.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxqymswxvgfax" +path="res://.godot/imported/MainLev2.0.png-cf0e8f9087f0e0e122709ff8fcc0a354.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testing/art/MainLev2.0.png" +dest_files=["res://.godot/imported/MainLev2.0.png-cf0e8f9087f0e0e122709ff8fcc0a354.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/testing/art/decorative.png b/testing/art/decorative.png new file mode 100644 index 0000000..e9c7125 --- /dev/null +++ b/testing/art/decorative.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97e06bf716f027d38d8d4afea2c5da7bd8cfd1bb14baf8d89be22554bf8eac41 +size 266014 diff --git a/testing/art/decorative.png.import b/testing/art/decorative.png.import new file mode 100644 index 0000000..89b70a8 --- /dev/null +++ b/testing/art/decorative.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://drc5gdoqscwb0" +path="res://.godot/imported/decorative.png-5f0c37e036666322a93e917ec7646c46.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testing/art/decorative.png" +dest_files=["res://.godot/imported/decorative.png-5f0c37e036666322a93e917ec7646c46.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/testing/art/tree1B_ss.png b/testing/art/tree1B_ss.png new file mode 100644 index 0000000..2d82ec8 --- /dev/null +++ b/testing/art/tree1B_ss.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d91c7310857663401b981524d3813dd551b45caaff057424ec85072b0e799386 +size 47563 diff --git a/testing/art/tree1B_ss.png.import b/testing/art/tree1B_ss.png.import new file mode 100644 index 0000000..c8d90da --- /dev/null +++ b/testing/art/tree1B_ss.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dw3vt6ax43ix1" +path="res://.godot/imported/tree1B_ss.png-b2ce41308a5bb83e4a7bbcfdf208d33b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testing/art/tree1B_ss.png" +dest_files=["res://.godot/imported/tree1B_ss.png-b2ce41308a5bb83e4a7bbcfdf208d33b.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/testing/art/tree1D_ss.png b/testing/art/tree1D_ss.png new file mode 100644 index 0000000..ebc902d --- /dev/null +++ b/testing/art/tree1D_ss.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18631c931adfdb30e469f54f4e323934a842ced53d8f01ba691b8c5a68c65cab +size 47187 diff --git a/testing/art/tree1D_ss.png.import b/testing/art/tree1D_ss.png.import new file mode 100644 index 0000000..cb8234f --- /dev/null +++ b/testing/art/tree1D_ss.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bl0pvppga2k4i" +path="res://.godot/imported/tree1D_ss.png-da2eb30a6bac4fe738ec20d380d5cc0e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testing/art/tree1D_ss.png" +dest_files=["res://.godot/imported/tree1D_ss.png-da2eb30a6bac4fe738ec20d380d5cc0e.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/testing/sandbox.gd b/testing/sandbox.gd index b92af52..31282dc 100644 --- a/testing/sandbox.gd +++ b/testing/sandbox.gd @@ -1,17 +1,26 @@ extends Node2D - -@export var player_team: Array[PlayerCharacter] = [] -@export var enemy_team: Array[EnemyCharacter] = [] - @onready var game_state: GameState = $CombatState - +# CHARS +@onready var alex: Alex = $Alex +@onready var blob: Blob = $Blob # Called when the node enters the scene tree for the first time. func _ready(): + var player_combat_team = CombatTeam.new() + player_combat_team.allegience = CombatTeam.Allegience.PLAYER + player_combat_team.members.append(alex.get_combatant_component()) + + var enemy_combat_team = CombatTeam.new() + enemy_combat_team.allegience = CombatTeam.Allegience.ENEMY + enemy_combat_team.members.append(blob.get_combatant_component()) + + var combat_state = game_state as CombatState + combat_state.teams.append(player_combat_team) + combat_state.teams.append(enemy_combat_team) game_state.state_enter({}) diff --git a/testing/sandbox.tscn b/testing/sandbox.tscn index 2cd700c..6a4f414 100644 --- a/testing/sandbox.tscn +++ b/testing/sandbox.tscn @@ -1,12 +1,14 @@ -[gd_scene load_steps=13 format=3 uid="uid://dnmtnb7kvhmkp"] +[gd_scene load_steps=15 format=3 uid="uid://dnmtnb7kvhmkp"] [ext_resource type="Script" path="res://testing/sandbox.gd" id="1_41e3p"] -[ext_resource type="Texture2D" uid="uid://dxqymswxvgfax" path="res://assets/binary files/tile sets/RPGW_GrassLand_v2.01/MainLev2.0.png" id="2_t8bqu"] -[ext_resource type="Texture2D" uid="uid://iuymh60ilu1r" path="res://assets/binary files/tile sets/RPGW_GrassLand_v2.01/decorative.png" id="3_udm07"] -[ext_resource type="Texture2D" uid="uid://cu7troaoq4own" path="res://assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1B_ss.png" id="4_21w1r"] -[ext_resource type="Texture2D" uid="uid://qje1ncupgnd" path="res://assets/binary files/tile sets/RPGW_GrassLand_v2.01/anim/tree1D_ss.png" id="5_tmyhp"] +[ext_resource type="Texture2D" uid="uid://dxqymswxvgfax" path="res://testing/art/MainLev2.0.png" id="2_t8bqu"] +[ext_resource type="Texture2D" uid="uid://drc5gdoqscwb0" path="res://testing/art/decorative.png" id="3_udm07"] +[ext_resource type="Texture2D" uid="uid://dw3vt6ax43ix1" path="res://testing/art/tree1B_ss.png" id="4_21w1r"] +[ext_resource type="Texture2D" uid="uid://bl0pvppga2k4i" path="res://testing/art/tree1D_ss.png" id="5_tmyhp"] [ext_resource type="Script" path="res://systems/combat/combat_state.gd" id="6_37h1i"] [ext_resource type="PackedScene" uid="uid://d1nq0efa53wra" path="res://actors/player chars/alex/alex.tscn" id="7_c3ubv"] +[ext_resource type="PackedScene" uid="uid://bp3ea21lf4bpm" path="res://systems/combat/ui/combat_log.tscn" id="7_qbibk"] +[ext_resource type="PackedScene" uid="uid://dwi00nixw6eia" path="res://actors/enemies/blob/blob.tscn" id="8_vcyws"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_6ttut"] texture = ExtResource("2_t8bqu") @@ -12592,7 +12594,16 @@ layer_2/tile_data = PackedInt32Array(983087, 3, 2, 1048623, 3, 3, 983088, 65539, [node name="CombatState" type="Node" parent="."] script = ExtResource("6_37h1i") +[node name="CombatLog" parent="CombatState" instance=ExtResource("7_qbibk")] +offset_left = 135.0 +offset_top = 656.0 +offset_right = 135.0 +offset_bottom = 656.0 + [node name="Alex" parent="." instance=ExtResource("7_c3ubv")] texture_filter = 1 position = Vector2(505, 516) scale = Vector2(2, 2) + +[node name="Blob" parent="." instance=ExtResource("8_vcyws")] +position = Vector2(417, 513)