diff --git a/game/modules/species/Human/Female/character_models/Standard.material b/game/models/entities/human/female/character_models/Standard.material similarity index 100% rename from game/modules/species/Human/Female/character_models/Standard.material rename to game/models/entities/human/female/character_models/Standard.material diff --git a/game/modules/species/Human/Female/character_models/Standard_003.material b/game/models/entities/human/female/character_models/Standard_003.material similarity index 100% rename from game/modules/species/Human/Female/character_models/Standard_003.material rename to game/models/entities/human/female/character_models/Standard_003.material diff --git a/game/modules/species/Human/Female/character_models/huf_calf_left.tres b/game/models/entities/human/female/character_models/huf_calf_left.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_calf_left.tres rename to game/models/entities/human/female/character_models/huf_calf_left.tres diff --git a/game/modules/species/Human/Female/character_models/huf_finger.tres b/game/models/entities/human/female/character_models/huf_finger.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_finger.tres rename to game/models/entities/human/female/character_models/huf_finger.tres diff --git a/game/modules/species/Human/Female/character_models/huf_fingers.tres b/game/models/entities/human/female/character_models/huf_fingers.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_fingers.tres rename to game/models/entities/human/female/character_models/huf_fingers.tres diff --git a/game/modules/species/Human/Female/character_models/huf_foot_left.tres b/game/models/entities/human/female/character_models/huf_foot_left.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_foot_left.tres rename to game/models/entities/human/female/character_models/huf_foot_left.tres diff --git a/game/modules/species/Human/Female/character_models/huf_forearm.tres b/game/models/entities/human/female/character_models/huf_forearm.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_forearm.tres rename to game/models/entities/human/female/character_models/huf_forearm.tres diff --git a/game/modules/species/Human/Female/character_models/huf_hand.tres b/game/models/entities/human/female/character_models/huf_hand.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_hand.tres rename to game/models/entities/human/female/character_models/huf_hand.tres diff --git a/game/modules/species/Human/Female/character_models/huf_handl.tres b/game/models/entities/human/female/character_models/huf_handl.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_handl.tres rename to game/models/entities/human/female/character_models/huf_handl.tres diff --git a/game/modules/species/Human/Female/character_models/huf_head.tres b/game/models/entities/human/female/character_models/huf_head.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_head.tres rename to game/models/entities/human/female/character_models/huf_head.tres diff --git a/game/modules/species/Human/Female/character_models/huf_neck.tres b/game/models/entities/human/female/character_models/huf_neck.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_neck.tres rename to game/models/entities/human/female/character_models/huf_neck.tres diff --git a/game/modules/species/Human/Female/character_models/huf_pelvis.tres b/game/models/entities/human/female/character_models/huf_pelvis.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_pelvis.tres rename to game/models/entities/human/female/character_models/huf_pelvis.tres diff --git a/game/modules/species/Human/Female/character_models/huf_spine.tres b/game/models/entities/human/female/character_models/huf_spine.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_spine.tres rename to game/models/entities/human/female/character_models/huf_spine.tres diff --git a/game/modules/species/Human/Female/character_models/huf_spine1.tres b/game/models/entities/human/female/character_models/huf_spine1.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_spine1.tres rename to game/models/entities/human/female/character_models/huf_spine1.tres diff --git a/game/modules/species/Human/Female/character_models/huf_spine2.tres b/game/models/entities/human/female/character_models/huf_spine2.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_spine2.tres rename to game/models/entities/human/female/character_models/huf_spine2.tres diff --git a/game/modules/species/Human/Female/character_models/huf_thigh_left.tres b/game/models/entities/human/female/character_models/huf_thigh_left.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_thigh_left.tres rename to game/models/entities/human/female/character_models/huf_thigh_left.tres diff --git a/game/modules/species/Human/Female/character_models/huf_thigh_right.tres b/game/models/entities/human/female/character_models/huf_thigh_right.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_thigh_right.tres rename to game/models/entities/human/female/character_models/huf_thigh_right.tres diff --git a/game/modules/species/Human/Female/character_models/huf_upperarm.tres b/game/models/entities/human/female/character_models/huf_upperarm.tres similarity index 100% rename from game/modules/species/Human/Female/character_models/huf_upperarm.tres rename to game/models/entities/human/female/character_models/huf_upperarm.tres diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/Attributions.xml b/game/models/entities/human/female/character_textures/100_seamless/Attributions.xml similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/Attributions.xml rename to game/models/entities/human/female/character_textures/100_seamless/Attributions.xml diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png diff --git a/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png.import new file mode 100644 index 00000000..dce40329 --- /dev/null +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_green_scarf.png-eca572be481fbbb4076e661811f75623.restex" + +[deps] + +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png" +dest_files=[ "res://.import/armor_green_scarf.png-eca572be481fbbb4076e661811f75623.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png.import similarity index 69% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png.import rename to game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png.import index 1a561414..152e7e89 100644 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png.import +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_green_scarf_v3.png-65b0d0907d90f6f53dbb261fce8ce5c1.stex" +path="res://.import/armor_green_scarf_v3.png-8d33305c3292a6a1ab4a7d677dc70212.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" -dest_files=[ "res://.import/armor_green_scarf_v3.png-65b0d0907d90f6f53dbb261fce8ce5c1.stex" ] +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png" +dest_files=[ "res://.import/armor_green_scarf_v3.png-8d33305c3292a6a1ab4a7d677dc70212.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png.import similarity index 50% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png.import rename to game/models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png.import index 6f729098..5f8344ac 100644 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png.import +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png.import @@ -2,9 +2,9 @@ importer="texture" type="StreamTexture" -path.s3tc="res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.s3tc.stex" -path.etc2="res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.etc2.stex" -path.etc="res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.etc.stex" +path.s3tc="res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.s3tc.stex" +path.etc2="res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.etc2.stex" +path.etc="res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.etc.stex" metadata={ "imported_formats": [ "s3tc", "etc2", "etc" ], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png" -dest_files=[ "res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.s3tc.stex", "res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.etc2.stex", "res://.import/armor_green_scarfv2.png-391fe47fc577fed88f97ca577970ad86.etc.stex" ] +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png" +dest_files=[ "res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.s3tc.stex", "res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.etc2.stex", "res://.import/armor_green_scarfv2.png-98379328248feaf73291c2fb294deb81.etc.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png diff --git a/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png.import new file mode 100644 index 00000000..1d402299 --- /dev/null +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_red_scarf.png-23ec1b83cd191d9174c4a70ab992120d.restex" + +[deps] + +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png" +dest_files=[ "res://.import/armor_red_scarf.png-23ec1b83cd191d9174c4a70ab992120d.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png.import similarity index 69% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png.import rename to game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png.import index 8082b6ea..ff5b0437 100644 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png.import +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_red_scarf_v3.png-1f57b3183d41229e7d09af23d80d4344.stex" +path="res://.import/armor_red_scarf_v3.png-7c7c7c8f93e13f433385d52e624b5deb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png" -dest_files=[ "res://.import/armor_red_scarf_v3.png-1f57b3183d41229e7d09af23d80d4344.stex" ] +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png" +dest_files=[ "res://.import/armor_red_scarf_v3.png-7c7c7c8f93e13f433385d52e624b5deb.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple.png b/game/models/entities/human/female/character_textures/100_seamless/armor_simple.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_simple.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_simple.png diff --git a/game/models/entities/human/female/character_textures/100_seamless/armor_simple.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_simple.png.import new file mode 100644 index 00000000..6225a918 --- /dev/null +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_simple.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_simple.png-7c85f29b0e6b4d57b2dd9b4db6e439fd.restex" + +[deps] + +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" +dest_files=[ "res://.import/armor_simple.png-7c85f29b0e6b4d57b2dd9b4db6e439fd.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png.import similarity index 69% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png.import rename to game/models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png.import index b3226358..384005a9 100644 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png.import +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_simple_v2.png-3e761c8ca8ffccf43f95ba1d6d486f3e.stex" +path="res://.import/armor_simple_v2.png-8bf995f1a45e8d49cd8f35f2af4fb30b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png" -dest_files=[ "res://.import/armor_simple_v2.png-3e761c8ca8ffccf43f95ba1d6d486f3e.stex" ] +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png" +dest_files=[ "res://.import/armor_simple_v2.png-8bf995f1a45e8d49cd8f35f2af4fb30b.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png rename to game/models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png.import b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png.import similarity index 69% rename from game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png.import rename to game/models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png.import index fbd1b45a..63dd1a44 100644 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png.import +++ b/game/models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_simple_v3.png-997063e3c5f1c29a7927bfbef439bdac.stex" +path="res://.import/armor_simple_v3.png-00c21715ff7d767eb6a2efa4c1f50f33.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" -dest_files=[ "res://.import/armor_simple_v3.png-997063e3c5f1c29a7927bfbef439bdac.stex" ] +source_file="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" +dest_files=[ "res://.import/armor_simple_v3.png-00c21715ff7d767eb6a2efa4c1f50f33.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/head.png b/game/models/entities/human/female/character_textures/head.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/head.png rename to game/models/entities/human/female/character_textures/head.png diff --git a/game/models/entities/human/female/character_textures/head.png.import b/game/models/entities/human/female/character_textures/head.png.import new file mode 100644 index 00000000..2c9237a1 --- /dev/null +++ b/game/models/entities/human/female/character_textures/head.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/head.png-fa6fd16f56f8458abf2cf279364481d2.restex" + +[deps] + +source_file="res://models/entities/human/female/character_textures/head.png" +dest_files=[ "res://.import/head.png-fa6fd16f56f8458abf2cf279364481d2.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/head_v3.png b/game/models/entities/human/female/character_textures/head_v3.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/head_v3.png rename to game/models/entities/human/female/character_textures/head_v3.png diff --git a/game/modules/species/Human/Female/character_textures/head_v3.png.import b/game/models/entities/human/female/character_textures/head_v3.png.import similarity index 71% rename from game/modules/species/Human/Female/character_textures/head_v3.png.import rename to game/models/entities/human/female/character_textures/head_v3.png.import index cb801445..9c39789a 100644 --- a/game/modules/species/Human/Female/character_textures/head_v3.png.import +++ b/game/models/entities/human/female/character_textures/head_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/head_v3.png-47988113bb36fbe076a9b159f1e4f39f.stex" +path="res://.import/head_v3.png-6365e600120b040fca31743bf1f2e8fd.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/head_v3.png" -dest_files=[ "res://.import/head_v3.png-47988113bb36fbe076a9b159f1e4f39f.stex" ] +source_file="res://models/entities/human/female/character_textures/head_v3.png" +dest_files=[ "res://.import/head_v3.png-6365e600120b040fca31743bf1f2e8fd.stex" ] [params] diff --git a/game/modules/species/Human/Female/character_textures/skin.png b/game/models/entities/human/female/character_textures/skin.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/skin.png rename to game/models/entities/human/female/character_textures/skin.png diff --git a/game/models/entities/human/female/character_textures/skin.png.import b/game/models/entities/human/female/character_textures/skin.png.import new file mode 100644 index 00000000..45e038af --- /dev/null +++ b/game/models/entities/human/female/character_textures/skin.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/skin.png-4cb6b64e35f56d582ca0a5f805b375b1.restex" + +[deps] + +source_file="res://models/entities/human/female/character_textures/skin.png" +dest_files=[ "res://.import/skin.png-4cb6b64e35f56d582ca0a5f805b375b1.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/skin_v3.png b/game/models/entities/human/female/character_textures/skin_v3.png similarity index 100% rename from game/modules/species/Human/Female/character_textures/skin_v3.png rename to game/models/entities/human/female/character_textures/skin_v3.png diff --git a/game/modules/species/Human/Female/character_textures/skin_v3.png.import b/game/models/entities/human/female/character_textures/skin_v3.png.import similarity index 71% rename from game/modules/species/Human/Female/character_textures/skin_v3.png.import rename to game/models/entities/human/female/character_textures/skin_v3.png.import index 197e760e..07f17deb 100644 --- a/game/modules/species/Human/Female/character_textures/skin_v3.png.import +++ b/game/models/entities/human/female/character_textures/skin_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/skin_v3.png-903579bb8157003ac1ae4cca5e36e648.stex" +path="res://.import/skin_v3.png-b97aa2e09a4edb6a122bb459ebe8828c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/Female/character_textures/skin_v3.png" -dest_files=[ "res://.import/skin_v3.png-903579bb8157003ac1ae4cca5e36e648.stex" ] +source_file="res://models/entities/human/female/character_textures/skin_v3.png" +dest_files=[ "res://.import/skin_v3.png-b97aa2e09a4edb6a122bb459ebe8828c.stex" ] [params] diff --git a/game/modules/species/Human/Female/head.tres b/game/models/entities/human/female/head.tres similarity index 68% rename from game/modules/species/Human/Female/head.tres rename to game/models/entities/human/female/head.tres index d5a69b4f..68e16258 100644 --- a/game/modules/species/Human/Female/head.tres +++ b/game/models/entities/human/female/head.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/head_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/head_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/left_calf.tres b/game/models/entities/human/female/left_calf.tres new file mode 100644 index 00000000..e17f38a3 --- /dev/null +++ b/game/models/entities/human/female/left_calf.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 24 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/left_fingers_base.tres b/game/models/entities/human/female/left_fingers_base.tres similarity index 68% rename from game/modules/species/Human/Female/left_fingers_base.tres rename to game/models/entities/human/female/left_fingers_base.tres index 43d3d96c..4da71e35 100644 --- a/game/modules/species/Human/Female/left_fingers_base.tres +++ b/game/models/entities/human/female/left_fingers_base.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/left_fingers_end.tres b/game/models/entities/human/female/left_fingers_end.tres similarity index 68% rename from game/modules/species/Human/Female/left_fingers_end.tres rename to game/models/entities/human/female/left_fingers_end.tres index 685eef64..7b6aa031 100644 --- a/game/modules/species/Human/Female/left_fingers_end.tres +++ b/game/models/entities/human/female/left_fingers_end.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/left_foot.tres b/game/models/entities/human/female/left_foot.tres new file mode 100644 index 00000000..63bd36eb --- /dev/null +++ b/game/models/entities/human/female/left_foot.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_foot_left.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 25 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/models/entities/human/female/left_forearm.tres b/game/models/entities/human/female/left_forearm.tres new file mode 100644 index 00000000..99a0b37a --- /dev/null +++ b/game/models/entities/human/female/left_forearm.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_forearm.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 9 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/left_hand.tres b/game/models/entities/human/female/left_hand.tres similarity index 70% rename from game/modules/species/Human/Female/left_hand.tres rename to game/models/entities/human/female/left_hand.tres index 7ec70e3d..ff9ed21b 100644 --- a/game/modules/species/Human/Female/left_hand.tres +++ b/game/models/entities/human/female/left_hand.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_handl.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/left_thigh.tres b/game/models/entities/human/female/left_thigh.tres new file mode 100644 index 00000000..05d715a9 --- /dev/null +++ b/game/models/entities/human/female/left_thigh.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 23 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/models/entities/human/female/left_thumb_end.tres b/game/models/entities/human/female/left_thumb_end.tres new file mode 100644 index 00000000..165391ee --- /dev/null +++ b/game/models/entities/human/female/left_thumb_end.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] + +[resource] +entity_type = 1 +bone = 12 +group = 1 +entry_0/mesh = ExtResource( 1 ) +entry_0/texture = ExtResource( 2 ) diff --git a/game/models/entities/human/female/left_thunm_base.tres b/game/models/entities/human/female/left_thunm_base.tres new file mode 100644 index 00000000..20c1c3c7 --- /dev/null +++ b/game/models/entities/human/female/left_thunm_base.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] + +[resource] +entity_type = 1 +bone = 11 +group = 1 +entry_0/mesh = ExtResource( 1 ) +entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/left_upper_arm.tres b/game/models/entities/human/female/left_upper_arm.tres similarity index 68% rename from game/modules/species/Human/Female/left_upper_arm.tres rename to game/models/entities/human/female/left_upper_arm.tres index 48772086..06733357 100644 --- a/game/modules/species/Human/Female/left_upper_arm.tres +++ b/game/models/entities/human/female/left_upper_arm.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_upperarm.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_upperarm.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/neck.tres b/game/models/entities/human/female/neck.tres similarity index 69% rename from game/modules/species/Human/Female/neck.tres rename to game/models/entities/human/female/neck.tres index 70f0fbe2..6adbb9ea 100644 --- a/game/modules/species/Human/Female/neck.tres +++ b/game/models/entities/human/female/neck.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_neck.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_neck.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/pelvis.tres b/game/models/entities/human/female/pelvis.tres similarity index 69% rename from game/modules/species/Human/Female/pelvis.tres rename to game/models/entities/human/female/pelvis.tres index 72a34694..37dd0b4a 100644 --- a/game/modules/species/Human/Female/pelvis.tres +++ b/game/models/entities/human/female/pelvis.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_pelvis.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/right_calf.tres b/game/models/entities/human/female/right_calf.tres similarity index 70% rename from game/modules/species/Human/Female/right_calf.tres rename to game/models/entities/human/female/right_calf.tres index 985abe51..8568af1a 100644 --- a/game/modules/species/Human/Female/right_calf.tres +++ b/game/models/entities/human/female/right_calf.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/right_fingers_base.tres b/game/models/entities/human/female/right_fingers_base.tres similarity index 68% rename from game/modules/species/Human/Female/right_fingers_base.tres rename to game/models/entities/human/female/right_fingers_base.tres index 979d5a90..439d1e05 100644 --- a/game/modules/species/Human/Female/right_fingers_base.tres +++ b/game/models/entities/human/female/right_fingers_base.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/right_fingers_end.tres b/game/models/entities/human/female/right_fingers_end.tres similarity index 68% rename from game/modules/species/Human/Female/right_fingers_end.tres rename to game/models/entities/human/female/right_fingers_end.tres index 4a44fc99..8b066867 100644 --- a/game/modules/species/Human/Female/right_fingers_end.tres +++ b/game/models/entities/human/female/right_fingers_end.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/right_foot.tres b/game/models/entities/human/female/right_foot.tres similarity index 70% rename from game/modules/species/Human/Female/right_foot.tres rename to game/models/entities/human/female/right_foot.tres index c90a6a03..159b3190 100644 --- a/game/modules/species/Human/Female/right_foot.tres +++ b/game/models/entities/human/female/right_foot.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_foot_left.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/right_forearm.tres b/game/models/entities/human/female/right_forearm.tres new file mode 100644 index 00000000..b52c48cd --- /dev/null +++ b/game/models/entities/human/female/right_forearm.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_forearm.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 17 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/right_hand.tres b/game/models/entities/human/female/right_hand.tres similarity index 70% rename from game/modules/species/Human/Female/right_hand.tres rename to game/models/entities/human/female/right_hand.tres index a7be7f9b..10f4236b 100644 --- a/game/modules/species/Human/Female/right_hand.tres +++ b/game/models/entities/human/female/right_hand.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_hand.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_hand.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/right_thigh.tres b/game/models/entities/human/female/right_thigh.tres new file mode 100644 index 00000000..4f287508 --- /dev/null +++ b/game/models/entities/human/female/right_thigh.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_thigh_right.tres" type="MeshDataResource" id=2] + +[resource] +entity_type = 1 +bone = 26 +group = 1 +entry_0/mesh = ExtResource( 2 ) +entry_0/texture = ExtResource( 1 ) diff --git a/game/models/entities/human/female/right_thumb_base.tres b/game/models/entities/human/female/right_thumb_base.tres new file mode 100644 index 00000000..a53f967e --- /dev/null +++ b/game/models/entities/human/female/right_thumb_base.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] + +[resource] +entity_type = 1 +bone = 19 +group = 1 +entry_0/mesh = ExtResource( 1 ) +entry_0/texture = ExtResource( 2 ) diff --git a/game/models/entities/human/female/right_thumb_end.tres b/game/models/entities/human/female/right_thumb_end.tres new file mode 100644 index 00000000..cafc08a4 --- /dev/null +++ b/game/models/entities/human/female/right_thumb_end.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] + +[resource] +entity_type = 1 +bone = 20 +group = 1 +entry_0/mesh = ExtResource( 1 ) +entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/right_upper_arm.tres b/game/models/entities/human/female/right_upper_arm.tres similarity index 68% rename from game/modules/species/Human/Female/right_upper_arm.tres rename to game/models/entities/human/female/right_upper_arm.tres index c69102da..e3a2b43b 100644 --- a/game/modules/species/Human/Female/right_upper_arm.tres +++ b/game/models/entities/human/female/right_upper_arm.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_upperarm.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_upperarm.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/skin_v3.png" type="Texture" id=2] [resource] entity_type = 1 diff --git a/game/modules/species/Human/Female/spine_1.tres b/game/models/entities/human/female/spine_1.tres similarity index 69% rename from game/modules/species/Human/Female/spine_1.tres rename to game/models/entities/human/female/spine_1.tres index ef503c59..ea5f8f4a 100644 --- a/game/modules/species/Human/Female/spine_1.tres +++ b/game/models/entities/human/female/spine_1.tres @@ -1,7 +1,7 @@ [gd_resource type="ModelVisualEntry" load_steps=3 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine1.tres" type="MeshDataResource" id=2] [resource] entity_type = 1 diff --git a/game/models/entities/human/female/spine_2.tres b/game/models/entities/human/female/spine_2.tres new file mode 100644 index 00000000..ad959850 --- /dev/null +++ b/game/models/entities/human/female/spine_2.tres @@ -0,0 +1,11 @@ +[gd_resource type="ModelVisualEntry" load_steps=3 format=2] + +[ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=2] + +[resource] +entity_type = 1 +bone = 4 +group = 1 +entry_0/mesh = ExtResource( 1 ) +entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/models/HumanFemale.tres b/game/models/entities/human/models/HumanFemale.tres similarity index 75% rename from game/modules/species/Human/models/HumanFemale.tres rename to game/models/entities/human/models/HumanFemale.tres index 45935feb..5e53e61f 100644 --- a/game/modules/species/Human/models/HumanFemale.tres +++ b/game/models/entities/human/models/HumanFemale.tres @@ -1,6 +1,6 @@ [gd_resource type="SpeciesModelData" load_steps=2 format=2] -[ext_resource path="res://modules/species/Human/models/HumanFemale.tscn" type="PackedScene" id=1] +[ext_resource path="res://models/entities/human/models/HumanFemale.tscn" type="PackedScene" id=1] [resource] resource_name = "Human Female" diff --git a/game/modules/species/Human/models/HumanFemale.tscn b/game/models/entities/human/models/HumanFemale.tscn similarity index 82% rename from game/modules/species/Human/models/HumanFemale.tscn rename to game/models/entities/human/models/HumanFemale.tscn index 8449d755..4c206c57 100644 --- a/game/modules/species/Human/models/HumanFemale.tscn +++ b/game/models/entities/human/models/HumanFemale.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://player/Body.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/models/armature_huf.tscn" type="PackedScene" id=2] +[ext_resource path="res://models/entities/human/models/armature_huf.tscn" type="PackedScene" id=1] +[ext_resource path="res://player/Body.gd" type="Script" id=2] [sub_resource type="CapsuleShape" id=1] radius = 0.266582 @@ -10,7 +10,7 @@ height = 0.927641 [node name="HumanFemale" type="KinematicBody"] collision_layer = 2147483650 collision_mask = 3 -script = ExtResource( 1 ) +script = ExtResource( 2 ) max_visible_distance = 70.0 model_path = NodePath("../HumanFemale/Rotation_Helper/Model") character_skeleton_path = NodePath("Rotation_Helper/Model/character2") @@ -29,4 +29,4 @@ transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 [node name="Model" type="Spatial" parent="Rotation_Helper"] -[node name="character2" parent="Rotation_Helper/Model" instance=ExtResource( 2 )] +[node name="character2" parent="Rotation_Helper/Model" instance=ExtResource( 1 )] diff --git a/game/modules/species/Human/models/Material_003.material b/game/models/entities/human/models/Material_003.material similarity index 100% rename from game/modules/species/Human/models/Material_003.material rename to game/models/entities/human/models/Material_003.material diff --git a/game/modules/species/Human/models/animations.tres b/game/models/entities/human/models/animations.tres similarity index 100% rename from game/modules/species/Human/models/animations.tres rename to game/models/entities/human/models/animations.tres diff --git a/game/modules/species/Human/models/armature.gd b/game/models/entities/human/models/armature.gd similarity index 100% rename from game/modules/species/Human/models/armature.gd rename to game/models/entities/human/models/armature.gd diff --git a/game/modules/species/Human/models/armature.tscn b/game/models/entities/human/models/armature.tscn similarity index 100% rename from game/modules/species/Human/models/armature.tscn rename to game/models/entities/human/models/armature.tscn diff --git a/game/modules/species/Human/models/armature_huf.tscn b/game/models/entities/human/models/armature_huf.tscn similarity index 90% rename from game/modules/species/Human/models/armature_huf.tscn rename to game/models/entities/human/models/armature_huf.tscn index 8571e348..9f5d76d1 100644 --- a/game/modules/species/Human/models/armature_huf.tscn +++ b/game/models/entities/human/models/armature_huf.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=42 format=2] -[ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=1] +[ext_resource path="res://models/entities/human/models/armature.gd" type="Script" id=1] [ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2] -[ext_resource path="res://modules/species/Human/models/dead.tres" type="Animation" id=4] -[ext_resource path="res://modules/species/Human/models/armature.gd" type="Script" id=5] -[ext_resource path="res://modules/species/Human/models/armature.tscn" type="PackedScene" id=6] -[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8] -[ext_resource path="res://modules/species/Human/models/idle-loop.tres" type="Animation" id=9] -[ext_resource path="res://modules/species/Human/models/rest.tres" type="Animation" id=10] -[ext_resource path="res://modules/species/Human/models/cast-end.tres" type="Animation" id=11] -[ext_resource path="res://modules/species/Human/models/casting-loop.tres" type="Animation" id=12] -[ext_resource path="res://modules/species/Human/models/run-left-loop.tres" type="Animation" id=13] -[ext_resource path="res://modules/species/Human/models/run-right-loop.tres" type="Animation" id=14] -[ext_resource path="res://modules/species/Human/models/run-loop.tres" type="Animation" id=15] +[ext_resource path="res://models/entities/human/models/cast-end.tres" type="Animation" id=3] +[ext_resource path="res://models/entities/human/models/idle-loop.tres" type="Animation" id=4] +[ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=5] +[ext_resource path="res://models/entities/human/models/armature.tscn" type="PackedScene" id=6] +[ext_resource path="res://models/entities/human/models/rest.tres" type="Animation" id=7] +[ext_resource path="res://models/entities/human/models/casting-loop.tres" type="Animation" id=8] +[ext_resource path="res://models/entities/human/models/dead.tres" type="Animation" id=9] +[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=10] +[ext_resource path="res://models/entities/human/models/run-loop.tres" type="Animation" id=11] +[ext_resource path="res://models/entities/human/models/run-left-loop.tres" type="Animation" id=12] +[ext_resource path="res://models/entities/human/models/run-right-loop.tres" type="Animation" id=13] [sub_resource type="AnimationNodeAnimation" id=1] animation = "cast-end" @@ -137,14 +137,14 @@ attach_point_paths/8_weapon_right = NodePath("armature/Armature/Skeleton/RightWe attach_point_paths/9_weapon_left_back = NodePath("armature/Armature/Skeleton/LeftWeaponBack") attach_point_paths/10_weapon_right_back = NodePath("armature/Armature/Skeleton/RightWeaponBack") attach_point_paths/11_weapon_shield_left = NodePath("armature/Armature/Skeleton/Shield") -script = ExtResource( 8 ) +script = ExtResource( 10 ) automatic_build = true mesh_instance_path = NodePath("armature/Armature/Skeleton/MeshInstance") skeleton_path = NodePath("armature/Armature/Skeleton") -viss = [ ExtResource( 1 ) ] +viss = [ ExtResource( 5 ) ] [node name="armature" parent="." instance=ExtResource( 6 )] -script = ExtResource( 5 ) +script = ExtResource( 1 ) [node name="Skeleton" parent="armature/Armature" index="0"] transform = Transform( 1, -6.84064e-18, 1.54087e-25, 6.84064e-18, 1, 1.05378e-42, -1.54087e-25, 0, 1, 0, 0, 0 ) @@ -252,14 +252,14 @@ positions = [ NodePath("../RightBackAttachment/RightBackAP"), NodePath("../Right [node name="AnimationPlayer" parent="armature" index="1"] autoplay = "rest" -anims/cast-end = ExtResource( 11 ) -anims/casting-loop = ExtResource( 12 ) -anims/dead = ExtResource( 4 ) -anims/idle-loop = ExtResource( 9 ) -anims/rest = ExtResource( 10 ) -anims/run-left-loop = ExtResource( 13 ) -anims/run-loop = ExtResource( 15 ) -anims/run-right-loop = ExtResource( 14 ) +anims/cast-end = ExtResource( 3 ) +anims/casting-loop = ExtResource( 8 ) +anims/dead = ExtResource( 9 ) +anims/idle-loop = ExtResource( 4 ) +anims/rest = ExtResource( 7 ) +anims/run-left-loop = ExtResource( 12 ) +anims/run-loop = ExtResource( 11 ) +anims/run-right-loop = ExtResource( 13 ) [node name="AnimationTree" type="AnimationTree" parent="."] tree_root = SubResource( 27 ) diff --git a/game/modules/species/Human/models/cast-end.tres b/game/models/entities/human/models/cast-end.tres similarity index 95% rename from game/modules/species/Human/models/cast-end.tres rename to game/models/entities/human/models/cast-end.tres index 431f3b59..8fff0298 100644 --- a/game/modules/species/Human/models/cast-end.tres +++ b/game/models/entities/human/models/cast-end.tres @@ -206,25 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 40 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 1.0 -keyframe/0/method_name = "" -keyframe/0/position = Vector2( 360, -60 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 41 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 1.0 -keyframe/1/method_name = "" -keyframe/1/position = Vector2( 600, -60 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 40 -keyframe/2/next_keyframe = -1 -keyframe/2/transition = 1.0 -keyframe/2/time = 1.0 -keyframe/2/method_name = "" -keyframe/2/position = Vector2( 840, -60 ) diff --git a/game/modules/species/Human/models/casting-loop.tres b/game/models/entities/human/models/casting-loop.tres similarity index 96% rename from game/modules/species/Human/models/casting-loop.tres rename to game/models/entities/human/models/casting-loop.tres index 28edb130..604fecfa 100644 --- a/game/modules/species/Human/models/casting-loop.tres +++ b/game/models/entities/human/models/casting-loop.tres @@ -206,22 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1.5, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 3, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 20 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 1.5 -keyframe/0/position = Vector2( 220, 0 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 21 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 1.5 -keyframe/1/position = Vector2( 440, 0 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 20 -keyframe/2/next_keyframe = -1 -keyframe/2/transition = 1.0 -keyframe/2/time = 0.0 -keyframe/2/position = Vector2( 640, 0 ) diff --git a/game/modules/species/Human/models/dead.tres b/game/models/entities/human/models/dead.tres similarity index 97% rename from game/modules/species/Human/models/dead.tres rename to game/models/entities/human/models/dead.tres index ac55fd0f..6c98e484 100644 --- a/game/modules/species/Human/models/dead.tres +++ b/game/models/entities/human/models/dead.tres @@ -205,10 +205,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 30 -keyframe/0/next_keyframe = -1 -keyframe/0/transition = 1.0 -keyframe/0/time = 1.0 -keyframe/0/position = Vector2( 220, 0 ) diff --git a/game/modules/species/Human/models/idle-loop.tres b/game/models/entities/human/models/idle-loop.tres similarity index 96% rename from game/modules/species/Human/models/idle-loop.tres rename to game/models/entities/human/models/idle-loop.tres index 2e518c8f..8fff0298 100644 --- a/game/modules/species/Human/models/idle-loop.tres +++ b/game/models/entities/human/models/idle-loop.tres @@ -206,22 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 40 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 1.0 -keyframe/0/position = Vector2( 360, -60 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 41 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 1.0 -keyframe/1/position = Vector2( 600, -60 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 40 -keyframe/2/next_keyframe = -1 -keyframe/2/transition = 1.0 -keyframe/2/time = 1.0 -keyframe/2/position = Vector2( 840, -60 ) diff --git a/game/modules/species/Human/models/rest.tres b/game/models/entities/human/models/rest.tres similarity index 97% rename from game/modules/species/Human/models/rest.tres rename to game/models/entities/human/models/rest.tres index 45ff5c2e..0086b056 100644 --- a/game/modules/species/Human/models/rest.tres +++ b/game/models/entities/human/models/rest.tres @@ -205,11 +205,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 0 -keyframe/0/next_keyframe = -1 -keyframe/0/transition = 1.0 -keyframe/0/time = 0.0 -keyframe/0/method_name = "" -keyframe/0/position = Vector2( 360, -60 ) diff --git a/game/modules/species/Human/models/run-left-loop.tres b/game/models/entities/human/models/run-left-loop.tres similarity index 95% rename from game/modules/species/Human/models/run-left-loop.tres rename to game/models/entities/human/models/run-left-loop.tres index bfd8cba1..f12015d8 100644 --- a/game/modules/species/Human/models/run-left-loop.tres +++ b/game/models/entities/human/models/run-left-loop.tres @@ -206,34 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 50 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 0.17 -keyframe/0/position = Vector2( 180, -40 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 51 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 0.23 -keyframe/1/position = Vector2( 380, -40 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 52 -keyframe/2/next_keyframe = 3 -keyframe/2/transition = 1.0 -keyframe/2/time = 0.17 -keyframe/2/position = Vector2( 580, -40 ) -keyframe/3/name = "" -keyframe/3/animation_keyframe_index = 53 -keyframe/3/next_keyframe = 4 -keyframe/3/transition = 1.0 -keyframe/3/time = 0.23 -keyframe/3/position = Vector2( 780, -40 ) -keyframe/4/name = "" -keyframe/4/animation_keyframe_index = 50 -keyframe/4/next_keyframe = -1 -keyframe/4/transition = 1.0 -keyframe/4/time = 0.0 -keyframe/4/position = Vector2( 980, -40 ) diff --git a/game/modules/species/Human/models/run-loop.tres b/game/models/entities/human/models/run-loop.tres similarity index 94% rename from game/modules/species/Human/models/run-loop.tres rename to game/models/entities/human/models/run-loop.tres index 61752f0d..c351c973 100644 --- a/game/modules/species/Human/models/run-loop.tres +++ b/game/models/entities/human/models/run-loop.tres @@ -206,39 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 60 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 0.17 -keyframe/0/method_name = "" -keyframe/0/position = Vector2( 180, -40 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 61 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 0.23 -keyframe/1/method_name = "" -keyframe/1/position = Vector2( 380, -40 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 62 -keyframe/2/next_keyframe = 3 -keyframe/2/transition = 1.0 -keyframe/2/time = 0.17 -keyframe/2/method_name = "" -keyframe/2/position = Vector2( 580, -40 ) -keyframe/3/name = "" -keyframe/3/animation_keyframe_index = 63 -keyframe/3/next_keyframe = 4 -keyframe/3/transition = 1.0 -keyframe/3/time = 0.23 -keyframe/3/method_name = "" -keyframe/3/position = Vector2( 780, -40 ) -keyframe/4/name = "" -keyframe/4/animation_keyframe_index = 60 -keyframe/4/next_keyframe = -1 -keyframe/4/transition = 1.0 -keyframe/4/time = 0.0 -keyframe/4/method_name = "" -keyframe/4/position = Vector2( 980, -40 ) diff --git a/game/modules/species/Human/models/run-right-loop.tres b/game/models/entities/human/models/run-right-loop.tres similarity index 95% rename from game/modules/species/Human/models/run-right-loop.tres rename to game/models/entities/human/models/run-right-loop.tres index e0363aa8..380a5f1f 100644 --- a/game/modules/species/Human/models/run-right-loop.tres +++ b/game/models/entities/human/models/run-right-loop.tres @@ -206,34 +206,3 @@ tracks/28/loop_wrap = true tracks/28/imported = false tracks/28/enabled = true tracks/28/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.17, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.4, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.57, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0.8, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 ) -start_frame_index = 0 -keyframe/0/name = "" -keyframe/0/animation_keyframe_index = 70 -keyframe/0/next_keyframe = 1 -keyframe/0/transition = 1.0 -keyframe/0/time = 0.17 -keyframe/0/position = Vector2( 180, -40 ) -keyframe/1/name = "" -keyframe/1/animation_keyframe_index = 71 -keyframe/1/next_keyframe = 2 -keyframe/1/transition = 1.0 -keyframe/1/time = 0.23 -keyframe/1/position = Vector2( 380, -40 ) -keyframe/2/name = "" -keyframe/2/animation_keyframe_index = 72 -keyframe/2/next_keyframe = 3 -keyframe/2/transition = 1.0 -keyframe/2/time = 0.17 -keyframe/2/position = Vector2( 580, -40 ) -keyframe/3/name = "" -keyframe/3/animation_keyframe_index = 73 -keyframe/3/next_keyframe = 4 -keyframe/3/transition = 1.0 -keyframe/3/time = 0.23 -keyframe/3/position = Vector2( 780, -40 ) -keyframe/4/name = "" -keyframe/4/animation_keyframe_index = 70 -keyframe/4/next_keyframe = -1 -keyframe/4/transition = 1.0 -keyframe/4/time = 0.0 -keyframe/4/position = Vector2( 980, -40 ) diff --git a/game/modules/species/Human/models/ttt.png b/game/models/entities/human/models/ttt.png similarity index 100% rename from game/modules/species/Human/models/ttt.png rename to game/models/entities/human/models/ttt.png diff --git a/game/modules/species/Human/models/ttt.png.import b/game/models/entities/human/models/ttt.png.import similarity index 71% rename from game/modules/species/Human/models/ttt.png.import rename to game/models/entities/human/models/ttt.png.import index ff8965ff..6732988d 100644 --- a/game/modules/species/Human/models/ttt.png.import +++ b/game/models/entities/human/models/ttt.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ttt.png-d8f1b0eff7d1a5b02e85a0ab3eccfb86.stex" +path="res://.import/ttt.png-9b2208250072d9347ea02754f65eb7f9.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/species/Human/models/ttt.png" -dest_files=[ "res://.import/ttt.png-d8f1b0eff7d1a5b02e85a0ab3eccfb86.stex" ] +source_file="res://models/entities/human/models/ttt.png" +dest_files=[ "res://.import/ttt.png-9b2208250072d9347ea02754f65eb7f9.stex" ] [params] diff --git a/game/modules/species/Human/species_human.tres b/game/models/entities/human/species_human.tres similarity index 76% rename from game/modules/species/Human/species_human.tres rename to game/models/entities/human/species_human.tres index 7ba58353..72898062 100644 --- a/game/modules/species/Human/species_human.tres +++ b/game/models/entities/human/species_human.tres @@ -1,6 +1,6 @@ [gd_resource type="EntitySpeciesData" load_steps=2 format=2] -[ext_resource path="res://modules/species/Human/models/HumanFemale.tres" type="SpeciesModelData" id=1] +[ext_resource path="res://models/entities/human/models/HumanFemale.tres" type="SpeciesModelData" id=1] [resource] resource_name = "Human" diff --git a/game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres b/game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres index b25acbd6..f10e4d00 100644 --- a/game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres +++ b/game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres @@ -1,6 +1,6 @@ [gd_resource type="ModelVisual" load_steps=4 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] [sub_resource type="ModelVisualEntry" id=1] override_layer = 5 diff --git a/game/modules/core/model_visuals/test_base_v2.tres b/game/modules/core/model_visuals/test_base_v2.tres index 069eab82..ce73368c 100644 --- a/game/modules/core/model_visuals/test_base_v2.tres +++ b/game/modules/core/model_visuals/test_base_v2.tres @@ -1,25 +1,25 @@ [gd_resource type="ModelVisual" load_steps=46 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_neck.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=3] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.tres" type="MeshDataResource" id=4] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.tres" type="MeshDataResource" id=5] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=6] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.tres" type="MeshDataResource" id=7] -[ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=8] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.tres" type="MeshDataResource" id=9] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=10] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=11] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin.png" type="Texture" id=12] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=13] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.tres" type="MeshDataResource" id=14] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=15] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_upperarm.tres" type="MeshDataResource" id=16] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.tres" type="MeshDataResource" id=17] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_hand.tres" type="MeshDataResource" id=18] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v2.png" type="Texture" id=19] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarfv2.png" type="Texture" id=20] +[ext_resource path="res://models/entities/human/female/character_models/huf_neck.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/human/female/character_models/huf_pelvis.tres" type="MeshDataResource" id=4] +[ext_resource path="res://models/entities/human/female/character_models/huf_forearm.tres" type="MeshDataResource" id=5] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=6] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=7] +[ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=8] +[ext_resource path="res://models/entities/human/female/character_models/huf_foot_left.tres" type="MeshDataResource" id=9] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=10] +[ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=11] +[ext_resource path="res://models/entities/human/female/character_textures/skin.png" type="Texture" id=12] +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=13] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine1.tres" type="MeshDataResource" id=14] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=15] +[ext_resource path="res://models/entities/human/female/character_models/huf_upperarm.tres" type="MeshDataResource" id=16] +[ext_resource path="res://models/entities/human/female/character_models/huf_handl.tres" type="MeshDataResource" id=17] +[ext_resource path="res://models/entities/human/female/character_models/huf_hand.tres" type="MeshDataResource" id=18] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple_v2.png" type="Texture" id=19] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarfv2.png" type="Texture" id=20] [sub_resource type="ModelVisualEntry" id=1] entry_0/mesh = ExtResource( 4 ) diff --git a/game/modules/core/model_visuals/test_base_v3.tres b/game/modules/core/model_visuals/test_base_v3.tres index c459cd0d..9ef4454b 100644 --- a/game/modules/core/model_visuals/test_base_v3.tres +++ b/game/modules/core/model_visuals/test_base_v3.tres @@ -1,32 +1,32 @@ [gd_resource type="ModelVisual" load_steps=28 format=2] -[ext_resource path="res://modules/species/Human/Female/left_upper_arm.tres" type="ModelVisualEntry" id=1] -[ext_resource path="res://modules/species/Human/Female/right_fingers_end.tres" type="ModelVisualEntry" id=2] -[ext_resource path="res://modules/species/Human/Female/head.tres" type="ModelVisualEntry" id=3] -[ext_resource path="res://modules/species/Human/Female/left_foot.tres" type="ModelVisualEntry" id=4] -[ext_resource path="res://modules/species/Human/Female/neck.tres" type="ModelVisualEntry" id=5] -[ext_resource path="res://modules/species/Human/Female/pelvis.tres" type="ModelVisualEntry" id=6] -[ext_resource path="res://modules/species/Human/Female/right_forearm.tres" type="ModelVisualEntry" id=7] -[ext_resource path="res://modules/species/Human/Female/right_thigh.tres" type="ModelVisualEntry" id=8] -[ext_resource path="res://modules/species/Human/Female/left_calf.tres" type="ModelVisualEntry" id=9] -[ext_resource path="res://modules/species/Human/Female/right_calf.tres" type="ModelVisualEntry" id=10] -[ext_resource path="res://modules/species/Human/Female/right_foot.tres" type="ModelVisualEntry" id=11] -[ext_resource path="res://modules/species/Human/Female/spine_2.tres" type="ModelVisualEntry" id=12] -[ext_resource path="res://modules/species/Human/Female/left_thunm_base.tres" type="ModelVisualEntry" id=13] -[ext_resource path="res://modules/species/Human/Female/spine_1.tres" type="ModelVisualEntry" id=14] -[ext_resource path="res://modules/species/Human/Female/right_upper_arm.tres" type="ModelVisualEntry" id=15] +[ext_resource path="res://models/entities/human/female/left_upper_arm.tres" type="ModelVisualEntry" id=1] +[ext_resource path="res://models/entities/human/female/right_fingers_end.tres" type="ModelVisualEntry" id=2] +[ext_resource path="res://models/entities/human/female/head.tres" type="ModelVisualEntry" id=3] +[ext_resource path="res://models/entities/human/female/left_foot.tres" type="ModelVisualEntry" id=4] +[ext_resource path="res://models/entities/human/female/neck.tres" type="ModelVisualEntry" id=5] +[ext_resource path="res://models/entities/human/female/pelvis.tres" type="ModelVisualEntry" id=6] +[ext_resource path="res://models/entities/human/female/right_forearm.tres" type="ModelVisualEntry" id=7] +[ext_resource path="res://models/entities/human/female/right_thigh.tres" type="ModelVisualEntry" id=8] +[ext_resource path="res://models/entities/human/female/left_calf.tres" type="ModelVisualEntry" id=9] +[ext_resource path="res://models/entities/human/female/right_calf.tres" type="ModelVisualEntry" id=10] +[ext_resource path="res://models/entities/human/female/right_foot.tres" type="ModelVisualEntry" id=11] +[ext_resource path="res://models/entities/human/female/spine_2.tres" type="ModelVisualEntry" id=12] +[ext_resource path="res://models/entities/human/female/left_thunm_base.tres" type="ModelVisualEntry" id=13] +[ext_resource path="res://models/entities/human/female/spine_1.tres" type="ModelVisualEntry" id=14] +[ext_resource path="res://models/entities/human/female/right_upper_arm.tres" type="ModelVisualEntry" id=15] [ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestShield.tres" type="ModelVisualEntry" id=16] -[ext_resource path="res://modules/species/Human/Female/left_forearm.tres" type="ModelVisualEntry" id=17] -[ext_resource path="res://modules/species/Human/Female/left_thigh.tres" type="ModelVisualEntry" id=18] -[ext_resource path="res://modules/species/Human/Female/left_hand.tres" type="ModelVisualEntry" id=19] -[ext_resource path="res://modules/species/Human/Female/left_thumb_end.tres" type="ModelVisualEntry" id=20] -[ext_resource path="res://modules/species/Human/Female/right_hand.tres" type="ModelVisualEntry" id=21] -[ext_resource path="res://modules/species/Human/Female/left_fingers_base.tres" type="ModelVisualEntry" id=22] -[ext_resource path="res://modules/species/Human/Female/right_fingers_base.tres" type="ModelVisualEntry" id=23] +[ext_resource path="res://models/entities/human/female/left_forearm.tres" type="ModelVisualEntry" id=17] +[ext_resource path="res://models/entities/human/female/left_thigh.tres" type="ModelVisualEntry" id=18] +[ext_resource path="res://models/entities/human/female/left_hand.tres" type="ModelVisualEntry" id=19] +[ext_resource path="res://models/entities/human/female/left_thumb_end.tres" type="ModelVisualEntry" id=20] +[ext_resource path="res://models/entities/human/female/right_hand.tres" type="ModelVisualEntry" id=21] +[ext_resource path="res://models/entities/human/female/left_fingers_base.tres" type="ModelVisualEntry" id=22] +[ext_resource path="res://models/entities/human/female/right_fingers_base.tres" type="ModelVisualEntry" id=23] [ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestOnehander.tres" type="ModelVisualEntry" id=24] -[ext_resource path="res://modules/species/Human/Female/left_fingers_end.tres" type="ModelVisualEntry" id=25] -[ext_resource path="res://modules/species/Human/Female/right_thumb_end.tres" type="ModelVisualEntry" id=26] -[ext_resource path="res://modules/species/Human/Female/right_thumb_base.tres" type="ModelVisualEntry" id=27] +[ext_resource path="res://models/entities/human/female/left_fingers_end.tres" type="ModelVisualEntry" id=25] +[ext_resource path="res://models/entities/human/female/right_thumb_end.tres" type="ModelVisualEntry" id=26] +[ext_resource path="res://models/entities/human/female/right_thumb_base.tres" type="ModelVisualEntry" id=27] [resource] layer = 1 diff --git a/game/modules/core/model_visuals/test_vis1.tres b/game/modules/core/model_visuals/test_vis1.tres index 056a2e20..68e6f0b0 100644 --- a/game/modules/core/model_visuals/test_vis1.tres +++ b/game/modules/core/model_visuals/test_vis1.tres @@ -1,24 +1,24 @@ [gd_resource type="ModelVisual" load_steps=45 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.tres" type="MeshDataResource" id=3] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_neck.tres" type="MeshDataResource" id=4] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_upperarm.tres" type="MeshDataResource" id=5] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.tres" type="MeshDataResource" id=6] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.tres" type="MeshDataResource" id=7] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.tres" type="MeshDataResource" id=8] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=9] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_fingers.tres" type="MeshDataResource" id=10] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_hand.tres" type="MeshDataResource" id=11] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=12] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.tres" type="MeshDataResource" id=13] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=14] -[ext_resource path="res://modules/species/Human/Female/character_textures/skin.png" type="Texture" id=15] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple.png" type="Texture" id=16] -[ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=17] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=18] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=19] +[ext_resource path="res://models/entities/human/female/character_models/huf_pelvis.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_forearm.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/human/female/character_models/huf_neck.tres" type="MeshDataResource" id=4] +[ext_resource path="res://models/entities/human/female/character_models/huf_upperarm.tres" type="MeshDataResource" id=5] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine1.tres" type="MeshDataResource" id=6] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=7] +[ext_resource path="res://models/entities/human/female/character_models/huf_handl.tres" type="MeshDataResource" id=8] +[ext_resource path="res://models/entities/human/female/character_models/huf_finger.tres" type="MeshDataResource" id=9] +[ext_resource path="res://models/entities/human/female/character_models/huf_fingers.tres" type="MeshDataResource" id=10] +[ext_resource path="res://models/entities/human/female/character_models/huf_hand.tres" type="MeshDataResource" id=11] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=12] +[ext_resource path="res://models/entities/human/female/character_models/huf_foot_left.tres" type="MeshDataResource" id=13] +[ext_resource path="res://models/entities/human/female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=14] +[ext_resource path="res://models/entities/human/female/character_textures/skin.png" type="Texture" id=15] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=16] +[ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=17] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=18] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=19] [sub_resource type="ModelVisualEntry" id=1] entry_0/mesh = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres index 7abdfad8..2a0843d7 100644 --- a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres @@ -1,7 +1,7 @@ [gd_resource type="EntityData" load_steps=4 format=2] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] -[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=3] +[ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=3] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4] [resource] diff --git a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres index 990e6e77..bb8a45ef 100644 --- a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -1,6 +1,6 @@ [gd_resource type="EntityData" load_steps=5 format=2] -[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=1] +[ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=1] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=3] diff --git a/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres b/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres index afef3e69..5ed6f0de 100644 --- a/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres +++ b/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres @@ -1,7 +1,7 @@ [gd_resource type="EntityData" load_steps=4 format=2] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=2] +[ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=2] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=3] [resource] diff --git a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres b/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres index faba3874..6ad68427 100644 --- a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres +++ b/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres @@ -1,7 +1,7 @@ [gd_resource type="EntityData" load_steps=4 format=2] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=2] +[ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=2] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=3] [resource] diff --git a/game/modules/planets/test_planet/dungeons/dungeon.tres b/game/modules/planets/test_planet/dungeons/dungeon.tres index 41bf0020..b2de71d6 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" load_steps=12 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] [ext_resource path="res://models/core_models/ceiling.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=5] diff --git a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres index b03d6430..76e83850 100644 --- a/game/modules/planets/test_planet/dungeons/dungeon_l2.tres +++ b/game/modules/planets/test_planet/dungeons/dungeon_l2.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" load_steps=12 format=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dungeon.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_calf_left.tres" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/dungeons/dung_teleporter.tscn" type="PackedScene" id=3] [ext_resource path="res://models/core_models/ceiling.tres" type="MeshDataResource" id=4] [ext_resource path="res://models/core_models/wall_xp.tres" type="MeshDataResource" id=5] diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png.import b/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png.import deleted file mode 100644 index 05832c9b..00000000 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/armor_green_scarf.png-9c64e94f4403166c5a5941434e7155b9.restex" - -[deps] - -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png" -dest_files=[ "res://.import/armor_green_scarf.png-9c64e94f4403166c5a5941434e7155b9.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png.import b/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png.import deleted file mode 100644 index 4d0826d7..00000000 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/armor_red_scarf.png-aaf7bf088845a9daaaad5116fa47f8e2.restex" - -[deps] - -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png" -dest_files=[ "res://.import/armor_red_scarf.png-aaf7bf088845a9daaaad5116fa47f8e2.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple.png.import b/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple.png.import deleted file mode 100644 index 686b9013..00000000 --- a/game/modules/species/Human/Female/character_textures/100_seamless/armor_simple.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/armor_simple.png-a87d4105c5d6b0e71538bd5a01d65e0a.restex" - -[deps] - -source_file="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple.png" -dest_files=[ "res://.import/armor_simple.png-a87d4105c5d6b0e71538bd5a01d65e0a.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/head.png.import b/game/modules/species/Human/Female/character_textures/head.png.import deleted file mode 100644 index 4704228b..00000000 --- a/game/modules/species/Human/Female/character_textures/head.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/head.png-6603bf299022bb836aa6480e5be1810f.restex" - -[deps] - -source_file="res://modules/species/Human/Female/character_textures/head.png" -dest_files=[ "res://.import/head.png-6603bf299022bb836aa6480e5be1810f.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/modules/species/Human/Female/character_textures/skin.png.import b/game/modules/species/Human/Female/character_textures/skin.png.import deleted file mode 100644 index 637fd873..00000000 --- a/game/modules/species/Human/Female/character_textures/skin.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/skin.png-3c676869540ab62d18b83fe2afa84a20.restex" - -[deps] - -source_file="res://modules/species/Human/Female/character_textures/skin.png" -dest_files=[ "res://.import/skin.png-3c676869540ab62d18b83fe2afa84a20.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/modules/species/Human/Female/left_calf.tres b/game/modules/species/Human/Female/left_calf.tres deleted file mode 100644 index 4e85f906..00000000 --- a/game/modules/species/Human/Female/left_calf.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 24 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/left_foot.tres b/game/modules/species/Human/Female/left_foot.tres deleted file mode 100644 index b4c15b5b..00000000 --- a/game/modules/species/Human/Female/left_foot.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 25 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/left_forearm.tres b/game/modules/species/Human/Female/left_forearm.tres deleted file mode 100644 index 4537e7a6..00000000 --- a/game/modules/species/Human/Female/left_forearm.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 9 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/left_thigh.tres b/game/modules/species/Human/Female/left_thigh.tres deleted file mode 100644 index fdea38e4..00000000 --- a/game/modules/species/Human/Female/left_thigh.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_left.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 23 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/left_thumb_end.tres b/game/modules/species/Human/Female/left_thumb_end.tres deleted file mode 100644 index f657caf7..00000000 --- a/game/modules/species/Human/Female/left_thumb_end.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=2] - -[resource] -entity_type = 1 -bone = 12 -group = 1 -entry_0/mesh = ExtResource( 2 ) -entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/left_thunm_base.tres b/game/modules/species/Human/Female/left_thunm_base.tres deleted file mode 100644 index c8ebeef2..00000000 --- a/game/modules/species/Human/Female/left_thunm_base.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=2] - -[resource] -entity_type = 1 -bone = 11 -group = 1 -entry_0/mesh = ExtResource( 2 ) -entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/right_forearm.tres b/game/modules/species/Human/Female/right_forearm.tres deleted file mode 100644 index 05bcddbd..00000000 --- a/game/modules/species/Human/Female/right_forearm.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 17 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/right_thigh.tres b/game/modules/species/Human/Female/right_thigh.tres deleted file mode 100644 index 9dfce1e4..00000000 --- a/game/modules/species/Human/Female/right_thigh.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_right.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - -[resource] -entity_type = 1 -bone = 26 -group = 1 -entry_0/mesh = ExtResource( 1 ) -entry_0/texture = ExtResource( 2 ) diff --git a/game/modules/species/Human/Female/right_thumb_base.tres b/game/modules/species/Human/Female/right_thumb_base.tres deleted file mode 100644 index e0999fd4..00000000 --- a/game/modules/species/Human/Female/right_thumb_base.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=2] - -[resource] -entity_type = 1 -bone = 19 -group = 1 -entry_0/mesh = ExtResource( 2 ) -entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/right_thumb_end.tres b/game/modules/species/Human/Female/right_thumb_end.tres deleted file mode 100644 index c4deeee4..00000000 --- a/game/modules/species/Human/Female/right_thumb_end.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_finger.tres" type="MeshDataResource" id=2] - -[resource] -entity_type = 1 -bone = 20 -group = 1 -entry_0/mesh = ExtResource( 2 ) -entry_0/texture = ExtResource( 1 ) diff --git a/game/modules/species/Human/Female/spine_2.tres b/game/modules/species/Human/Female/spine_2.tres deleted file mode 100644 index b850eb57..00000000 --- a/game/modules/species/Human/Female/spine_2.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ModelVisualEntry" load_steps=3 format=2] - -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.tres" type="MeshDataResource" id=2] - -[resource] -entity_type = 1 -bone = 4 -group = 1 -entry_0/mesh = ExtResource( 2 ) -entry_0/texture = ExtResource( 1 ) diff --git a/game/player/DisplayPlayer.tscn b/game/player/DisplayPlayer.tscn index 7e2b7d78..30162534 100644 --- a/game/player/DisplayPlayer.tscn +++ b/game/player/DisplayPlayer.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://player/DisplayPlayer.gd" type="Script" id=1] -[ext_resource path="res://modules/species/Human/models/armature_huf.tscn" type="PackedScene" id=2] +[ext_resource path="res://models/entities/human/models/armature_huf.tscn" type="PackedScene" id=2] [ext_resource path="res://player/EntityModel.gd" type="Script" id=3] [node name="DisplayPlayer" type="Entity" groups=[ diff --git a/game/tests/test_props/MeshDataInstance.tres b/game/tests/test_props/MeshDataInstance.tres index 4020c7d8..bf616cec 100644 --- a/game/tests/test_props/MeshDataInstance.tres +++ b/game/tests/test_props/MeshDataInstance.tres @@ -1,9 +1,9 @@ [gd_resource type="PropData" load_steps=10 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.tres" type="MeshDataResource" id=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=3] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=4] +[ext_resource path="res://models/entities/human/female/character_models/huf_handl.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine1.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=3] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=4] [ext_resource path="res://tests/test_props/MeshDataInstance2.tres" type="PropData" id=5] [sub_resource type="PropDataMeshData" id=1] diff --git a/game/tests/test_props/MeshDataInstance.tscn b/game/tests/test_props/MeshDataInstance.tscn index ea702727..88097754 100644 --- a/game/tests/test_props/MeshDataInstance.tscn +++ b/game/tests/test_props/MeshDataInstance.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=12 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.tres" type="MeshDataResource" id=3] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=4] +[ext_resource path="res://models/entities/human/female/character_models/huf_handl.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_red_scarf.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine1.tres" type="MeshDataResource" id=3] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_green_scarf.png" type="Texture" id=4] [ext_resource path="res://tests/test_props/MeshDataInstance2.tres" type="PropData" id=5] [sub_resource type="Image" id=8] diff --git a/game/tests/test_props/MeshDataInstance2.tres b/game/tests/test_props/MeshDataInstance2.tres index b1034702..3d17d58a 100644 --- a/game/tests/test_props/MeshDataInstance2.tres +++ b/game/tests/test_props/MeshDataInstance2.tres @@ -1,7 +1,7 @@ [gd_resource type="PropData" load_steps=6 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="PropDataMeshData" id=1] diff --git a/game/tests/test_props/MeshDataInstance2.tscn b/game/tests/test_props/MeshDataInstance2.tscn index 8368c8c0..28f1663d 100644 --- a/game/tests/test_props/MeshDataInstance2.tscn +++ b/game/tests/test_props/MeshDataInstance2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://modules/species/Human/Female/character_textures/head.png" type="Texture" id=1] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_head.tres" type="MeshDataResource" id=2] +[ext_resource path="res://models/entities/human/female/character_textures/head.png" type="Texture" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_head.tres" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=3] [sub_resource type="Image" id=9] diff --git a/game/tests/test_rooms/Room2.tres b/game/tests/test_rooms/Room2.tres index ed5ccc4b..5a6d5938 100644 --- a/game/tests/test_rooms/Room2.tres +++ b/game/tests/test_rooms/Room2.tres @@ -1,9 +1,9 @@ [gd_resource type="PropData" load_steps=16 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=3] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple.png" type="Texture" id=4] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=4] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=5] [sub_resource type="PropDataPortal" id=1] diff --git a/game/tests/test_rooms/Room2.tscn b/game/tests/test_rooms/Room2.tscn index b5bca7be..2e370d4b 100644 --- a/game/tests/test_rooms/Room2.tscn +++ b/game/tests/test_rooms/Room2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] -[ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple.png" type="Texture" id=2] +[ext_resource path="res://models/entities/human/female/character_models/huf_spine2.tres" type="MeshDataResource" id=1] +[ext_resource path="res://models/entities/human/female/character_textures/100_seamless/armor_simple.png" type="Texture" id=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_dungeon_1_albedo.png" type="Texture" id=4] [ext_resource path="res://models/core_models/wall_zn.tres" type="MeshDataResource" id=5] [ext_resource path="res://tests/test_rooms/test2_tiledwalldata.tres" type="TiledWallData" id=10]