From 2bbed8360166903347729bd2ba2ca59dff318c23 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 13:04:35 +0200 Subject: [PATCH] Grouped character species related data into a new folder. --- .../data/character_models/huf_calf.dae.import | 16 ------- .../character_models/huf_chest.dae.import | 16 ------- .../character_models/huf_finger.dae.import | 16 ------- .../character_models/huf_fingers.dae.import | 16 ------- .../data/character_models/huf_foot.dae.import | 16 ------- .../character_models/huf_forearm.dae.import | 16 ------- .../data/character_models/huf_hand.dae.import | 16 ------- .../character_models/huf_handl.dae.import | 16 ------- .../data/character_models/huf_head.dae.import | 16 ------- .../data/character_models/huf_neck.dae.import | 16 ------- .../character_models/huf_pelvis.dae.import | 16 ------- .../character_models/huf_spine1.dae.import | 16 ------- .../character_models/huf_spine2.dae.import | 16 ------- .../character_models/huf_thigh.dae.import | 16 ------- .../huf_thigh_left.dae.import | 16 ------- .../huf_thigh_right.dae.import | 16 ------- .../character_models/huf_upperarm.dae.import | 16 ------- game/data/character_models/neck.dae.import | 16 ------- game/data/character_models/pelvis.dae.import | 16 ------- game/data/character_models/spine.dae.import | 16 ------- game/data/character_models/spine1.dae.import | 16 ------- game/data/character_models/spine2.dae.import | 16 ------- game/data/character_models/thigh.dae.import | 16 ------- .../data/character_models/upperarm.dae.import | 16 ------- .../armor_green_scarf.png.import | 15 ------- .../armor_red_scarf.png.import | 15 ------- game/data/character_textures/head.png.import | 15 ------- game/data/character_textures/skin.png.import | 15 ------- .../naturalist/entities/1_naturalist.tres | 4 +- .../naturalist/entities/2_naturalist_mob.tres | 4 +- .../1_chest_of_the_infinite_wisdom.tres | 3 +- game/data/item_visuals/test_base_v2.tres | 40 +++++++++--------- game/data/item_visuals/test_base_v3.tres | 40 +++++++++--------- game/data/item_visuals/test_vis1.tres | 38 ++++++++--------- .../{ => Human/Female}/1_human_female.tres | 2 +- .../character_models/Standard.material | Bin .../character_models/Standard_003.material | Bin .../Female}/character_models/huf_calf.blend | Bin .../Female}/character_models/huf_calf.dae | 0 .../character_models/huf_calf.dae.import | 16 +++++++ .../Female}/character_models/huf_chest.dae | 0 .../character_models/huf_chest.dae.import | 16 +++++++ .../Female}/character_models/huf_finger.blend | Bin .../Female}/character_models/huf_finger.dae | 0 .../character_models/huf_finger.dae.import | 16 +++++++ .../character_models/huf_fingers.blend | Bin .../Female}/character_models/huf_fingers.dae | 0 .../character_models/huf_fingers.dae.import | 16 +++++++ .../Female}/character_models/huf_foot.blend | Bin .../Female}/character_models/huf_foot.dae | 0 .../character_models/huf_foot.dae.import | 16 +++++++ .../character_models/huf_forearm.blend | Bin .../Female}/character_models/huf_forearm.dae | 0 .../character_models/huf_forearm.dae.import | 16 +++++++ .../Female}/character_models/huf_hand.blend | Bin .../Female}/character_models/huf_hand.dae | 0 .../character_models/huf_hand.dae.import | 16 +++++++ .../Female}/character_models/huf_handl.blend | Bin .../Female}/character_models/huf_handl.dae | 0 .../character_models/huf_handl.dae.import | 16 +++++++ .../Female}/character_models/huf_head.blend | Bin .../Female}/character_models/huf_head.dae | 0 .../character_models/huf_head.dae.import | 16 +++++++ .../Female}/character_models/huf_neck.blend | Bin .../Female}/character_models/huf_neck.dae | 0 .../character_models/huf_neck.dae.import | 16 +++++++ .../Female}/character_models/huf_pelvis.blend | Bin .../Female}/character_models/huf_pelvis.dae | 0 .../character_models/huf_pelvis.dae.import | 16 +++++++ .../Female}/character_models/huf_spine.blend | Bin .../Female}/character_models/huf_spine1.blend | Bin .../Female}/character_models/huf_spine1.dae | 0 .../character_models/huf_spine1.dae.import | 16 +++++++ .../Female}/character_models/huf_spine2.blend | Bin .../Female}/character_models/huf_spine2.dae | 0 .../character_models/huf_spine2.dae.import | 16 +++++++ .../Female}/character_models/huf_thigh.dae | 0 .../character_models/huf_thigh.dae.import | 16 +++++++ .../character_models/huf_thigh_left.blend | Bin .../character_models/huf_thigh_left.dae | 0 .../huf_thigh_left.dae.import | 16 +++++++ .../character_models/huf_thigh_right.blend | Bin .../character_models/huf_thigh_right.dae | 0 .../huf_thigh_right.dae.import | 16 +++++++ .../character_models/huf_upperarm.blend | Bin .../Female}/character_models/huf_upperarm.dae | 0 .../character_models/huf_upperarm.dae.import | 16 +++++++ .../Human/Female}/character_models/neck.dae | 0 .../Female/character_models/neck.dae.import | 16 +++++++ .../Human/Female}/character_models/pelvis.dae | 0 .../Female/character_models/pelvis.dae.import | 16 +++++++ .../Human/Female}/character_models/spine.dae | 0 .../Female/character_models/spine.dae.import | 16 +++++++ .../Human/Female}/character_models/spine1.dae | 0 .../Female/character_models/spine1.dae.import | 16 +++++++ .../Human/Female}/character_models/spine2.dae | 0 .../Female/character_models/spine2.dae.import | 16 +++++++ .../Human/Female}/character_models/thigh.dae | 0 .../Female/character_models/thigh.dae.import | 16 +++++++ .../Female}/character_models/upperarm.dae | 0 .../character_models/upperarm.dae.import | 16 +++++++ .../character_textures/armor_green_scarf.png | Bin .../armor_green_scarf.png.import | 15 +++++++ .../armor_green_scarf_readme.txt | 0 .../armor_green_scarf_v3.png | Bin .../armor_green_scarf_v3.png.import | 6 +-- .../armor_green_scarfv2.png | Bin .../armor_green_scarfv2.png.import | 6 +-- .../character_textures/armor_red_scarf.png | Bin .../armor_red_scarf.png.import | 15 +++++++ .../armor_red_scarf_readme.txt | 0 .../character_textures/armor_red_scarf_v3.png | Bin .../armor_red_scarf_v3.png.import | 6 +-- .../character_textures/armor_simple.png | Bin .../armor_simple.png.import | 15 +++++++ .../armor_simple_readme.txt | 0 .../character_textures/armor_simple_v2.png | Bin .../armor_simple_v2.png.import | 6 +-- .../character_textures/armor_simple_v3.png | Bin .../armor_simple_v3.png.import | 6 +-- .../Human/Female}/character_textures/head.png | Bin .../Female/character_textures/head.png.import | 15 +++++++ .../Female}/character_textures/head_v3.png | Bin .../character_textures/head_v3.png.import | 6 +-- .../Human/Female}/character_textures/skin.png | Bin .../character_textures/skin.png.import} | 6 +-- .../Female}/character_textures/skin_v3.png | Bin .../character_textures/skin_v3.png.import | 6 +-- .../Human}/models/HumanFemale.tres | 2 +- .../Human}/models/HumanFemale.tscn | 9 ++-- .../Human}/models/Material_003.material | Bin .../{ => species/Human}/models/armature.blend | Bin .../{ => species/Human}/models/armature.dae | 0 .../Human}/models/armature.dae.import | 6 +-- .../Human}/models/armature_model_orig_v2.tscn | 33 ++++++++------- .../Human}/models/armature_new.blend | Bin .../Human}/models/armature_old.blend | Bin game/data/{ => species/Human}/models/ttt.png | Bin .../{ => species/Human}/models/ttt.png.import | 6 +-- game/player/DisplayPlayer.tscn | 4 +- 140 files changed, 568 insertions(+), 559 deletions(-) delete mode 100644 game/data/character_models/huf_calf.dae.import delete mode 100644 game/data/character_models/huf_chest.dae.import delete mode 100644 game/data/character_models/huf_finger.dae.import delete mode 100644 game/data/character_models/huf_fingers.dae.import delete mode 100644 game/data/character_models/huf_foot.dae.import delete mode 100644 game/data/character_models/huf_forearm.dae.import delete mode 100644 game/data/character_models/huf_hand.dae.import delete mode 100644 game/data/character_models/huf_handl.dae.import delete mode 100644 game/data/character_models/huf_head.dae.import delete mode 100644 game/data/character_models/huf_neck.dae.import delete mode 100644 game/data/character_models/huf_pelvis.dae.import delete mode 100644 game/data/character_models/huf_spine1.dae.import delete mode 100644 game/data/character_models/huf_spine2.dae.import delete mode 100644 game/data/character_models/huf_thigh.dae.import delete mode 100644 game/data/character_models/huf_thigh_left.dae.import delete mode 100644 game/data/character_models/huf_thigh_right.dae.import delete mode 100644 game/data/character_models/huf_upperarm.dae.import delete mode 100644 game/data/character_models/neck.dae.import delete mode 100644 game/data/character_models/pelvis.dae.import delete mode 100644 game/data/character_models/spine.dae.import delete mode 100644 game/data/character_models/spine1.dae.import delete mode 100644 game/data/character_models/spine2.dae.import delete mode 100644 game/data/character_models/thigh.dae.import delete mode 100644 game/data/character_models/upperarm.dae.import delete mode 100644 game/data/character_textures/armor_green_scarf.png.import delete mode 100644 game/data/character_textures/armor_red_scarf.png.import delete mode 100644 game/data/character_textures/head.png.import delete mode 100644 game/data/character_textures/skin.png.import rename game/data/species/{ => Human/Female}/1_human_female.tres (64%) rename game/data/{ => species/Human/Female}/character_models/Standard.material (100%) rename game/data/{ => species/Human/Female}/character_models/Standard_003.material (100%) rename game/data/{ => species/Human/Female}/character_models/huf_calf.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_calf.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_calf.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_chest.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_chest.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_finger.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_finger.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_finger.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_fingers.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_fingers.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_fingers.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_foot.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_foot.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_foot.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_forearm.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_forearm.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_forearm.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_hand.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_hand.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_hand.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_handl.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_handl.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_handl.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_head.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_head.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_head.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_neck.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_neck.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_neck.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_pelvis.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_pelvis.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_pelvis.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_spine.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_spine1.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_spine1.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_spine1.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_spine2.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_spine2.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_spine2.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_thigh.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_thigh.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_thigh_left.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_thigh_left.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_thigh_left.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_thigh_right.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_thigh_right.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_thigh_right.dae.import rename game/data/{ => species/Human/Female}/character_models/huf_upperarm.blend (100%) rename game/data/{ => species/Human/Female}/character_models/huf_upperarm.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/huf_upperarm.dae.import rename game/data/{ => species/Human/Female}/character_models/neck.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/neck.dae.import rename game/data/{ => species/Human/Female}/character_models/pelvis.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/pelvis.dae.import rename game/data/{ => species/Human/Female}/character_models/spine.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/spine.dae.import rename game/data/{ => species/Human/Female}/character_models/spine1.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/spine1.dae.import rename game/data/{ => species/Human/Female}/character_models/spine2.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/spine2.dae.import rename game/data/{ => species/Human/Female}/character_models/thigh.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/thigh.dae.import rename game/data/{ => species/Human/Female}/character_models/upperarm.dae (100%) create mode 100644 game/data/species/Human/Female/character_models/upperarm.dae.import rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarf.png (100%) create mode 100644 game/data/species/Human/Female/character_textures/armor_green_scarf.png.import rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarf_readme.txt (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarf_v3.png (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarf_v3.png.import (63%) rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarfv2.png (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_green_scarfv2.png.import (63%) rename game/data/{ => species/Human/Female}/character_textures/armor_red_scarf.png (100%) create mode 100644 game/data/species/Human/Female/character_textures/armor_red_scarf.png.import rename game/data/{ => species/Human/Female}/character_textures/armor_red_scarf_readme.txt (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_red_scarf_v3.png (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_red_scarf_v3.png.import (64%) rename game/data/{ => species/Human/Female}/character_textures/armor_simple.png (100%) create mode 100644 game/data/species/Human/Female/character_textures/armor_simple.png.import rename game/data/{ => species/Human/Female}/character_textures/armor_simple_readme.txt (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_simple_v2.png (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_simple_v2.png.import (64%) rename game/data/{ => species/Human/Female}/character_textures/armor_simple_v3.png (100%) rename game/data/{ => species/Human/Female}/character_textures/armor_simple_v3.png.import (64%) rename game/data/{ => species/Human/Female}/character_textures/head.png (100%) create mode 100644 game/data/species/Human/Female/character_textures/head.png.import rename game/data/{ => species/Human/Female}/character_textures/head_v3.png (100%) rename game/data/{ => species/Human/Female}/character_textures/head_v3.png.import (68%) rename game/data/{ => species/Human/Female}/character_textures/skin.png (100%) rename game/data/{character_textures/armor_simple.png.import => species/Human/Female/character_textures/skin.png.import} (51%) rename game/data/{ => species/Human/Female}/character_textures/skin_v3.png (100%) rename game/data/{ => species/Human/Female}/character_textures/skin_v3.png.import (68%) rename game/data/{ => species/Human}/models/HumanFemale.tres (63%) rename game/data/{ => species/Human}/models/HumanFemale.tscn (89%) rename game/data/{ => species/Human}/models/Material_003.material (100%) rename game/data/{ => species/Human}/models/armature.blend (100%) rename game/data/{ => species/Human}/models/armature.dae (100%) rename game/data/{ => species/Human}/models/armature.dae.import (99%) rename game/data/{ => species/Human}/models/armature_model_orig_v2.tscn (96%) rename game/data/{ => species/Human}/models/armature_new.blend (100%) rename game/data/{ => species/Human}/models/armature_old.blend (100%) rename game/data/{ => species/Human}/models/ttt.png (100%) rename game/data/{ => species/Human}/models/ttt.png.import (70%) diff --git a/game/data/character_models/huf_calf.dae.import b/game/data/character_models/huf_calf.dae.import deleted file mode 100644 index c826e06a..00000000 --- a/game/data/character_models/huf_calf.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_calf.dae-2406a84fea50f75097245c707b0365bf.res" - -[deps] - -source_file="res://data/character_models/huf_calf.dae" -dest_files=[ "res://.import/huf_calf.dae-2406a84fea50f75097245c707b0365bf.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_chest.dae.import b/game/data/character_models/huf_chest.dae.import deleted file mode 100644 index 96df3d5e..00000000 --- a/game/data/character_models/huf_chest.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_chest.dae-dce4888a3614744d05db1359e9281189.res" - -[deps] - -source_file="res://data/character_models/huf_chest.dae" -dest_files=[ "res://.import/huf_chest.dae-dce4888a3614744d05db1359e9281189.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_finger.dae.import b/game/data/character_models/huf_finger.dae.import deleted file mode 100644 index f04470f5..00000000 --- a/game/data/character_models/huf_finger.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_finger.dae-1081d7b4a1262c3764cabb0305687ec5.res" - -[deps] - -source_file="res://data/character_models/huf_finger.dae" -dest_files=[ "res://.import/huf_finger.dae-1081d7b4a1262c3764cabb0305687ec5.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_fingers.dae.import b/game/data/character_models/huf_fingers.dae.import deleted file mode 100644 index 33ed02b0..00000000 --- a/game/data/character_models/huf_fingers.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_fingers.dae-ace0097d7cb208e8d2836b10f454a7c6.res" - -[deps] - -source_file="res://data/character_models/huf_fingers.dae" -dest_files=[ "res://.import/huf_fingers.dae-ace0097d7cb208e8d2836b10f454a7c6.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_foot.dae.import b/game/data/character_models/huf_foot.dae.import deleted file mode 100644 index 00f4909e..00000000 --- a/game/data/character_models/huf_foot.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_foot.dae-35adefe1dce5a1e7f7f80ba6fabcf6a6.res" - -[deps] - -source_file="res://data/character_models/huf_foot.dae" -dest_files=[ "res://.import/huf_foot.dae-35adefe1dce5a1e7f7f80ba6fabcf6a6.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 1.3, 0, -1.571 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_forearm.dae.import b/game/data/character_models/huf_forearm.dae.import deleted file mode 100644 index 80975953..00000000 --- a/game/data/character_models/huf_forearm.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_forearm.dae-bee5ecdadc4c6be0c37528fb83e95ebd.res" - -[deps] - -source_file="res://data/character_models/huf_forearm.dae" -dest_files=[ "res://.import/huf_forearm.dae-bee5ecdadc4c6be0c37528fb83e95ebd.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_hand.dae.import b/game/data/character_models/huf_hand.dae.import deleted file mode 100644 index 74e33ebb..00000000 --- a/game/data/character_models/huf_hand.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_hand.dae-c941276dbbdc18a22d21e82280ce9e77.res" - -[deps] - -source_file="res://data/character_models/huf_hand.dae" -dest_files=[ "res://.import/huf_hand.dae-c941276dbbdc18a22d21e82280ce9e77.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_handl.dae.import b/game/data/character_models/huf_handl.dae.import deleted file mode 100644 index b25a5052..00000000 --- a/game/data/character_models/huf_handl.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_handl.dae-ddd1821816882a9541f9b3cf5cde3a49.res" - -[deps] - -source_file="res://data/character_models/huf_handl.dae" -dest_files=[ "res://.import/huf_handl.dae-ddd1821816882a9541f9b3cf5cde3a49.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.571 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_head.dae.import b/game/data/character_models/huf_head.dae.import deleted file mode 100644 index deebd4fa..00000000 --- a/game/data/character_models/huf_head.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_head.dae-6679cee5300fe22eca15659fcf0611fa.res" - -[deps] - -source_file="res://data/character_models/huf_head.dae" -dest_files=[ "res://.import/huf_head.dae-6679cee5300fe22eca15659fcf0611fa.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_neck.dae.import b/game/data/character_models/huf_neck.dae.import deleted file mode 100644 index 1e2a3349..00000000 --- a/game/data/character_models/huf_neck.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_neck.dae-a1cd7534d407b49f125bc423ef8bb490.res" - -[deps] - -source_file="res://data/character_models/huf_neck.dae" -dest_files=[ "res://.import/huf_neck.dae-a1cd7534d407b49f125bc423ef8bb490.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_pelvis.dae.import b/game/data/character_models/huf_pelvis.dae.import deleted file mode 100644 index e1dcceba..00000000 --- a/game/data/character_models/huf_pelvis.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_pelvis.dae-6efbe49ce394805d380fa6a4123d9bc3.res" - -[deps] - -source_file="res://data/character_models/huf_pelvis.dae" -dest_files=[ "res://.import/huf_pelvis.dae-6efbe49ce394805d380fa6a4123d9bc3.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_spine1.dae.import b/game/data/character_models/huf_spine1.dae.import deleted file mode 100644 index 6a3bb22a..00000000 --- a/game/data/character_models/huf_spine1.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_spine1.dae-1fc20c56216b08d47041539a686e8296.res" - -[deps] - -source_file="res://data/character_models/huf_spine1.dae" -dest_files=[ "res://.import/huf_spine1.dae-1fc20c56216b08d47041539a686e8296.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_spine2.dae.import b/game/data/character_models/huf_spine2.dae.import deleted file mode 100644 index 90b6e205..00000000 --- a/game/data/character_models/huf_spine2.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_spine2.dae-6f2ce3433a05441ef83487f71440f5df.res" - -[deps] - -source_file="res://data/character_models/huf_spine2.dae" -dest_files=[ "res://.import/huf_spine2.dae-6f2ce3433a05441ef83487f71440f5df.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh.dae.import b/game/data/character_models/huf_thigh.dae.import deleted file mode 100644 index 3f636971..00000000 --- a/game/data/character_models/huf_thigh.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_thigh.dae-7d588fac2ac5429503c946be2721a496.res" - -[deps] - -source_file="res://data/character_models/huf_thigh.dae" -dest_files=[ "res://.import/huf_thigh.dae-7d588fac2ac5429503c946be2721a496.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh_left.dae.import b/game/data/character_models/huf_thigh_left.dae.import deleted file mode 100644 index 005e8c32..00000000 --- a/game/data/character_models/huf_thigh_left.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_thigh_left.dae-c22a30784e3ebd7b7e696a5d9559fcfb.res" - -[deps] - -source_file="res://data/character_models/huf_thigh_left.dae" -dest_files=[ "res://.import/huf_thigh_left.dae-c22a30784e3ebd7b7e696a5d9559fcfb.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh_right.dae.import b/game/data/character_models/huf_thigh_right.dae.import deleted file mode 100644 index aba5c660..00000000 --- a/game/data/character_models/huf_thigh_right.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_thigh_right.dae-4462f07558dd22ce502eb650db5a2e85.res" - -[deps] - -source_file="res://data/character_models/huf_thigh_right.dae" -dest_files=[ "res://.import/huf_thigh_right.dae-4462f07558dd22ce502eb650db5a2e85.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_upperarm.dae.import b/game/data/character_models/huf_upperarm.dae.import deleted file mode 100644 index 419813d8..00000000 --- a/game/data/character_models/huf_upperarm.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/huf_upperarm.dae-1eee075ffca2e6f46b6c6f551a68a92b.res" - -[deps] - -source_file="res://data/character_models/huf_upperarm.dae" -dest_files=[ "res://.import/huf_upperarm.dae-1eee075ffca2e6f46b6c6f551a68a92b.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/neck.dae.import b/game/data/character_models/neck.dae.import deleted file mode 100644 index 89531228..00000000 --- a/game/data/character_models/neck.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/neck.dae-e41626fba5c00fb238ee35d93f8ca864.res" - -[deps] - -source_file="res://data/character_models/neck.dae" -dest_files=[ "res://.import/neck.dae-e41626fba5c00fb238ee35d93f8ca864.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/pelvis.dae.import b/game/data/character_models/pelvis.dae.import deleted file mode 100644 index 425ef072..00000000 --- a/game/data/character_models/pelvis.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/pelvis.dae-0e8dc732582f60c98255ac1873bc13d9.res" - -[deps] - -source_file="res://data/character_models/pelvis.dae" -dest_files=[ "res://.import/pelvis.dae-0e8dc732582f60c98255ac1873bc13d9.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine.dae.import b/game/data/character_models/spine.dae.import deleted file mode 100644 index 7d661122..00000000 --- a/game/data/character_models/spine.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/spine.dae-f993a532b50983aae5abc53592e88da4.res" - -[deps] - -source_file="res://data/character_models/spine.dae" -dest_files=[ "res://.import/spine.dae-f993a532b50983aae5abc53592e88da4.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine1.dae.import b/game/data/character_models/spine1.dae.import deleted file mode 100644 index e3748d17..00000000 --- a/game/data/character_models/spine1.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/spine1.dae-15d81779b79a12e9f071c4f570ccab54.res" - -[deps] - -source_file="res://data/character_models/spine1.dae" -dest_files=[ "res://.import/spine1.dae-15d81779b79a12e9f071c4f570ccab54.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.571 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine2.dae.import b/game/data/character_models/spine2.dae.import deleted file mode 100644 index ed3ca6c9..00000000 --- a/game/data/character_models/spine2.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/spine2.dae-32586b0139c29c133cf646c61d0da52c.res" - -[deps] - -source_file="res://data/character_models/spine2.dae" -dest_files=[ "res://.import/spine2.dae-32586b0139c29c133cf646c61d0da52c.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/thigh.dae.import b/game/data/character_models/thigh.dae.import deleted file mode 100644 index 00204de0..00000000 --- a/game/data/character_models/thigh.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/thigh.dae-d1ee5ec45cc4767d20e26985f309bfe4.res" - -[deps] - -source_file="res://data/character_models/thigh.dae" -dest_files=[ "res://.import/thigh.dae-d1ee5ec45cc4767d20e26985f309bfe4.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/upperarm.dae.import b/game/data/character_models/upperarm.dae.import deleted file mode 100644 index aaf6be2e..00000000 --- a/game/data/character_models/upperarm.dae.import +++ /dev/null @@ -1,16 +0,0 @@ -[remap] - -importer="collada_mdr" -type="MeshDataResource" -path="res://.import/upperarm.dae-cf2b46f2d30871ec43b123c1e370e293.res" - -[deps] - -source_file="res://data/character_models/upperarm.dae" -dest_files=[ "res://.import/upperarm.dae-cf2b46f2d30871ec43b123c1e370e293.res" ] - -[params] - -offset=Vector3( 0, 0, 0 ) -rotation=Vector3( 0, 0, -1.5708 ) -scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_textures/armor_green_scarf.png.import b/game/data/character_textures/armor_green_scarf.png.import deleted file mode 100644 index 6e83b30d..00000000 --- a/game/data/character_textures/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-95b5753d6136e39985cb21b34a0f4588.restex" - -[deps] - -source_file="res://data/character_textures/armor_green_scarf.png" -dest_files=[ "res://.import/armor_green_scarf.png-95b5753d6136e39985cb21b34a0f4588.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/data/character_textures/armor_red_scarf.png.import b/game/data/character_textures/armor_red_scarf.png.import deleted file mode 100644 index 58c23c71..00000000 --- a/game/data/character_textures/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-1e21784387f243cdd6b6afd45596cb90.restex" - -[deps] - -source_file="res://data/character_textures/armor_red_scarf.png" -dest_files=[ "res://.import/armor_red_scarf.png-1e21784387f243cdd6b6afd45596cb90.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/data/character_textures/head.png.import b/game/data/character_textures/head.png.import deleted file mode 100644 index 5488a50f..00000000 --- a/game/data/character_textures/head.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/head.png-6c346d79cc700b5abf8b0880d78d84b4.restex" - -[deps] - -source_file="res://data/character_textures/head.png" -dest_files=[ "res://.import/head.png-6c346d79cc700b5abf8b0880d78d84b4.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/data/character_textures/skin.png.import b/game/data/character_textures/skin.png.import deleted file mode 100644 index ed0651c0..00000000 --- a/game/data/character_textures/skin.png.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="packer_image_resource" -type="PackerImageResource" -path="res://.import/skin.png-c10ff9873880cb3857aff7012fd7d298.restex" - -[deps] - -source_file="res://data/character_textures/skin.png" -dest_files=[ "res://.import/skin.png-c10ff9873880cb3857aff7012fd7d298.restex" ] - -[params] - -hdr_as_srgb=false -scale=1.0 diff --git a/game/data/entity_classes/naturalist/entities/1_naturalist.tres b/game/data/entity_classes/naturalist/entities/1_naturalist.tres index 68909a97..b1bc84b2 100644 --- a/game/data/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/entities/1_naturalist.tres @@ -2,10 +2,12 @@ [ext_resource path="res://data/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1] [ext_resource path="res://data/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] -[ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=3] +[ext_resource path="res://data/species/Human/Female/1_human_female.tres" type="EntitySpeciesData" id=3] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4] [ext_resource path="res://data/crafting/1_test_craft.tres" type="CraftRecipe" id=5] + + [resource] resource_name = "Naturalist" id = 1 diff --git a/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres b/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres index ecf4bec6..c5b32c3b 100644 --- a/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -1,9 +1,11 @@ [gd_resource type="EntityData" load_steps=5 format=2] -[ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=1] +[ext_resource path="res://data/species/Human/Female/1_human_female.tres" type="EntitySpeciesData" id=1] [ext_resource path="res://data/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=3] + + [sub_resource type="LootDataBase" id=1] [resource] diff --git a/game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres b/game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres index 3c62a6dc..21e43bef 100644 --- a/game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres +++ b/game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres @@ -1,6 +1,7 @@ [gd_resource type="ItemVisual" load_steps=4 format=2] -[ext_resource path="res://data/character_textures/armor_green_scarf.png" type="Texture" id=1] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarf.png" type="Texture" id=1] + [sub_resource type="ItemVisualEntry" id=1] texture_male = ExtResource( 1 ) diff --git a/game/data/item_visuals/test_base_v2.tres b/game/data/item_visuals/test_base_v2.tres index af51cb22..655ae88a 100644 --- a/game/data/item_visuals/test_base_v2.tres +++ b/game/data/item_visuals/test_base_v2.tres @@ -1,25 +1,25 @@ [gd_resource type="ItemVisual" load_steps=46 format=2] -[ext_resource path="res://data/character_models/neck.dae" type="MeshDataResource" id=1] -[ext_resource path="res://data/character_models/huf_calf.dae" type="MeshDataResource" id=2] -[ext_resource path="res://data/character_models/thigh.dae" type="MeshDataResource" id=3] -[ext_resource path="res://data/character_models/pelvis.dae" type="MeshDataResource" id=4] -[ext_resource path="res://data/character_models/huf_forearm.dae" type="MeshDataResource" id=5] -[ext_resource path="res://data/character_textures/armor_red_scarf.png" type="Texture" id=6] -[ext_resource path="res://data/character_models/spine2.dae" type="MeshDataResource" id=7] -[ext_resource path="res://data/character_textures/head.png" type="Texture" id=8] -[ext_resource path="res://data/character_models/huf_foot.dae" type="MeshDataResource" id=9] -[ext_resource path="res://data/character_models/huf_fingers.dae" type="MeshDataResource" id=10] -[ext_resource path="res://data/character_models/huf_head.dae" type="MeshDataResource" id=11] -[ext_resource path="res://data/character_textures/skin.png" type="Texture" id=12] -[ext_resource path="res://data/character_models/huf_finger.dae" type="MeshDataResource" id=13] -[ext_resource path="res://data/character_models/spine1.dae" type="MeshDataResource" id=14] -[ext_resource path="res://data/character_textures/armor_green_scarf.png" type="Texture" id=15] -[ext_resource path="res://data/character_models/huf_upperarm.dae" type="MeshDataResource" id=16] -[ext_resource path="res://data/character_models/huf_handl.dae" type="MeshDataResource" id=17] -[ext_resource path="res://data/character_models/huf_hand.dae" type="MeshDataResource" id=18] -[ext_resource path="res://data/character_textures/armor_simple_v2.png" type="Texture" id=19] -[ext_resource path="res://data/character_textures/armor_green_scarfv2.png" type="Texture" id=20] +[ext_resource path="res://data/species/Human/Female/character_models/neck.dae" type="MeshDataResource" id=1] +[ext_resource path="res://data/species/Human/Female/character_models/huf_calf.dae" type="MeshDataResource" id=2] +[ext_resource path="res://data/species/Human/Female/character_models/thigh.dae" type="MeshDataResource" id=3] +[ext_resource path="res://data/species/Human/Female/character_models/pelvis.dae" type="MeshDataResource" id=4] +[ext_resource path="res://data/species/Human/Female/character_models/huf_forearm.dae" type="MeshDataResource" id=5] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_red_scarf.png" type="Texture" id=6] +[ext_resource path="res://data/species/Human/Female/character_models/spine2.dae" type="MeshDataResource" id=7] +[ext_resource path="res://data/species/Human/Female/character_textures/head.png" type="Texture" id=8] +[ext_resource path="res://data/species/Human/Female/character_models/huf_foot.dae" type="MeshDataResource" id=9] +[ext_resource path="res://data/species/Human/Female/character_models/huf_fingers.dae" type="MeshDataResource" id=10] +[ext_resource path="res://data/species/Human/Female/character_models/huf_head.dae" type="MeshDataResource" id=11] +[ext_resource path="res://data/species/Human/Female/character_textures/skin.png" type="Texture" id=12] +[ext_resource path="res://data/species/Human/Female/character_models/huf_finger.dae" type="MeshDataResource" id=13] +[ext_resource path="res://data/species/Human/Female/character_models/spine1.dae" type="MeshDataResource" id=14] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarf.png" type="Texture" id=15] +[ext_resource path="res://data/species/Human/Female/character_models/huf_upperarm.dae" type="MeshDataResource" id=16] +[ext_resource path="res://data/species/Human/Female/character_models/huf_handl.dae" type="MeshDataResource" id=17] +[ext_resource path="res://data/species/Human/Female/character_models/huf_hand.dae" type="MeshDataResource" id=18] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_simple_v2.png" type="Texture" id=19] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarfv2.png" type="Texture" id=20] [sub_resource type="ItemVisualEntry" id=1] mesh_male = ExtResource( 11 ) diff --git a/game/data/item_visuals/test_base_v3.tres b/game/data/item_visuals/test_base_v3.tres index 17fbc717..85301407 100644 --- a/game/data/item_visuals/test_base_v3.tres +++ b/game/data/item_visuals/test_base_v3.tres @@ -1,25 +1,25 @@ [gd_resource type="ItemVisual" load_steps=46 format=2] -[ext_resource path="res://data/character_models/huf_neck.dae" type="MeshDataResource" id=1] -[ext_resource path="res://data/character_models/huf_calf.dae" type="MeshDataResource" id=2] -[ext_resource path="res://data/character_models/huf_thigh_left.dae" type="MeshDataResource" id=3] -[ext_resource path="res://data/character_models/huf_pelvis.dae" type="MeshDataResource" id=4] -[ext_resource path="res://data/character_models/huf_forearm.dae" type="MeshDataResource" id=5] -[ext_resource path="res://data/character_textures/armor_simple_v3.png" type="Texture" id=6] -[ext_resource path="res://data/character_models/huf_spine2.dae" type="MeshDataResource" id=7] -[ext_resource path="res://data/character_textures/head_v3.png" type="Texture" id=8] -[ext_resource path="res://data/character_models/huf_foot.dae" type="MeshDataResource" id=9] -[ext_resource path="res://data/character_models/huf_fingers.dae" type="MeshDataResource" id=10] -[ext_resource path="res://data/character_models/huf_head.dae" type="MeshDataResource" id=11] -[ext_resource path="res://data/character_textures/skin_v3.png" type="Texture" id=12] -[ext_resource path="res://data/character_models/huf_finger.dae" type="MeshDataResource" id=13] -[ext_resource path="res://data/character_models/huf_spine1.dae" type="MeshDataResource" id=14] -[ext_resource path="res://data/character_models/huf_thigh_right.dae" type="MeshDataResource" id=15] -[ext_resource path="res://data/character_models/huf_upperarm.dae" type="MeshDataResource" id=16] -[ext_resource path="res://data/character_models/huf_handl.dae" type="MeshDataResource" id=17] -[ext_resource path="res://data/character_models/huf_hand.dae" type="MeshDataResource" id=18] -[ext_resource path="res://data/character_textures/armor_green_scarf_v3.png" type="Texture" id=21] -[ext_resource path="res://data/character_textures/armor_red_scarf_v3.png" type="Texture" id=22] +[ext_resource path="res://data/species/Human/Female/character_models/huf_neck.dae" type="MeshDataResource" id=1] +[ext_resource path="res://data/species/Human/Female/character_models/huf_calf.dae" type="MeshDataResource" id=2] +[ext_resource path="res://data/species/Human/Female/character_models/huf_thigh_left.dae" type="MeshDataResource" id=3] +[ext_resource path="res://data/species/Human/Female/character_models/huf_pelvis.dae" type="MeshDataResource" id=4] +[ext_resource path="res://data/species/Human/Female/character_models/huf_forearm.dae" type="MeshDataResource" id=5] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_simple_v3.png" type="Texture" id=6] +[ext_resource path="res://data/species/Human/Female/character_models/huf_spine2.dae" type="MeshDataResource" id=7] +[ext_resource path="res://data/species/Human/Female/character_textures/head_v3.png" type="Texture" id=8] +[ext_resource path="res://data/species/Human/Female/character_models/huf_foot.dae" type="MeshDataResource" id=9] +[ext_resource path="res://data/species/Human/Female/character_models/huf_fingers.dae" type="MeshDataResource" id=10] +[ext_resource path="res://data/species/Human/Female/character_models/huf_head.dae" type="MeshDataResource" id=11] +[ext_resource path="res://data/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=12] +[ext_resource path="res://data/species/Human/Female/character_models/huf_finger.dae" type="MeshDataResource" id=13] +[ext_resource path="res://data/species/Human/Female/character_models/huf_spine1.dae" type="MeshDataResource" id=14] +[ext_resource path="res://data/species/Human/Female/character_models/huf_thigh_right.dae" type="MeshDataResource" id=15] +[ext_resource path="res://data/species/Human/Female/character_models/huf_upperarm.dae" type="MeshDataResource" id=16] +[ext_resource path="res://data/species/Human/Female/character_models/huf_handl.dae" type="MeshDataResource" id=17] +[ext_resource path="res://data/species/Human/Female/character_models/huf_hand.dae" type="MeshDataResource" id=18] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarf_v3.png" type="Texture" id=21] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_red_scarf_v3.png" type="Texture" id=22] [sub_resource type="ItemVisualEntry" id=1] mesh_male = ExtResource( 11 ) diff --git a/game/data/item_visuals/test_vis1.tres b/game/data/item_visuals/test_vis1.tres index 5d77014f..ffd2fb9f 100644 --- a/game/data/item_visuals/test_vis1.tres +++ b/game/data/item_visuals/test_vis1.tres @@ -1,24 +1,24 @@ [gd_resource type="ItemVisual" load_steps=45 format=2] -[ext_resource path="res://data/character_models/pelvis.dae" type="MeshDataResource" id=1] -[ext_resource path="res://data/character_models/huf_head.dae" type="MeshDataResource" id=2] -[ext_resource path="res://data/character_models/huf_forearm.dae" type="MeshDataResource" id=3] -[ext_resource path="res://data/character_models/neck.dae" type="MeshDataResource" id=4] -[ext_resource path="res://data/character_models/upperarm.dae" type="MeshDataResource" id=5] -[ext_resource path="res://data/character_models/spine1.dae" type="MeshDataResource" id=6] -[ext_resource path="res://data/character_models/spine2.dae" type="MeshDataResource" id=7] -[ext_resource path="res://data/character_models/huf_handl.dae" type="MeshDataResource" id=8] -[ext_resource path="res://data/character_models/huf_finger.dae" type="MeshDataResource" id=9] -[ext_resource path="res://data/character_models/huf_fingers.dae" type="MeshDataResource" id=10] -[ext_resource path="res://data/character_models/huf_hand.dae" type="MeshDataResource" id=11] -[ext_resource path="res://data/character_models/huf_calf.dae" type="MeshDataResource" id=12] -[ext_resource path="res://data/character_models/huf_foot.dae" type="MeshDataResource" id=13] -[ext_resource path="res://data/character_models/thigh.dae" type="MeshDataResource" id=14] -[ext_resource path="res://data/character_textures/skin.png" type="Texture" id=15] -[ext_resource path="res://data/character_textures/armor_simple.png" type="Texture" id=16] -[ext_resource path="res://data/character_textures/head.png" type="Texture" id=17] -[ext_resource path="res://data/character_textures/armor_green_scarf.png" type="Texture" id=18] -[ext_resource path="res://data/character_textures/armor_red_scarf.png" type="Texture" id=19] +[ext_resource path="res://data/species/Human/Female/character_models/pelvis.dae" type="MeshDataResource" id=1] +[ext_resource path="res://data/species/Human/Female/character_models/huf_head.dae" type="MeshDataResource" id=2] +[ext_resource path="res://data/species/Human/Female/character_models/huf_forearm.dae" type="MeshDataResource" id=3] +[ext_resource path="res://data/species/Human/Female/character_models/neck.dae" type="MeshDataResource" id=4] +[ext_resource path="res://data/species/Human/Female/character_models/upperarm.dae" type="MeshDataResource" id=5] +[ext_resource path="res://data/species/Human/Female/character_models/spine1.dae" type="MeshDataResource" id=6] +[ext_resource path="res://data/species/Human/Female/character_models/spine2.dae" type="MeshDataResource" id=7] +[ext_resource path="res://data/species/Human/Female/character_models/huf_handl.dae" type="MeshDataResource" id=8] +[ext_resource path="res://data/species/Human/Female/character_models/huf_finger.dae" type="MeshDataResource" id=9] +[ext_resource path="res://data/species/Human/Female/character_models/huf_fingers.dae" type="MeshDataResource" id=10] +[ext_resource path="res://data/species/Human/Female/character_models/huf_hand.dae" type="MeshDataResource" id=11] +[ext_resource path="res://data/species/Human/Female/character_models/huf_calf.dae" type="MeshDataResource" id=12] +[ext_resource path="res://data/species/Human/Female/character_models/huf_foot.dae" type="MeshDataResource" id=13] +[ext_resource path="res://data/species/Human/Female/character_models/thigh.dae" type="MeshDataResource" id=14] +[ext_resource path="res://data/species/Human/Female/character_textures/skin.png" type="Texture" id=15] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_simple.png" type="Texture" id=16] +[ext_resource path="res://data/species/Human/Female/character_textures/head.png" type="Texture" id=17] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarf.png" type="Texture" id=18] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_red_scarf.png" type="Texture" id=19] [sub_resource type="ItemVisualEntry" id=1] mesh_male = ExtResource( 2 ) diff --git a/game/data/species/1_human_female.tres b/game/data/species/Human/Female/1_human_female.tres similarity index 64% rename from game/data/species/1_human_female.tres rename to game/data/species/Human/Female/1_human_female.tres index e85d268a..7e10b659 100644 --- a/game/data/species/1_human_female.tres +++ b/game/data/species/Human/Female/1_human_female.tres @@ -1,6 +1,6 @@ [gd_resource type="EntitySpeciesData" load_steps=2 format=2] -[ext_resource path="res://data/models/HumanFemale.tres" type="SpeciesModelData" id=1] +[ext_resource path="res://data/species/Human/models/HumanFemale.tres" type="SpeciesModelData" id=1] [resource] resource_name = "Human Female" diff --git a/game/data/character_models/Standard.material b/game/data/species/Human/Female/character_models/Standard.material similarity index 100% rename from game/data/character_models/Standard.material rename to game/data/species/Human/Female/character_models/Standard.material diff --git a/game/data/character_models/Standard_003.material b/game/data/species/Human/Female/character_models/Standard_003.material similarity index 100% rename from game/data/character_models/Standard_003.material rename to game/data/species/Human/Female/character_models/Standard_003.material diff --git a/game/data/character_models/huf_calf.blend b/game/data/species/Human/Female/character_models/huf_calf.blend similarity index 100% rename from game/data/character_models/huf_calf.blend rename to game/data/species/Human/Female/character_models/huf_calf.blend diff --git a/game/data/character_models/huf_calf.dae b/game/data/species/Human/Female/character_models/huf_calf.dae similarity index 100% rename from game/data/character_models/huf_calf.dae rename to game/data/species/Human/Female/character_models/huf_calf.dae diff --git a/game/data/species/Human/Female/character_models/huf_calf.dae.import b/game/data/species/Human/Female/character_models/huf_calf.dae.import new file mode 100644 index 00000000..66fb1f45 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_calf.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_calf.dae-1d3eb2bc0211cea6606d32de94fea39c.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_calf.dae" +dest_files=[ "res://.import/huf_calf.dae-1d3eb2bc0211cea6606d32de94fea39c.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_chest.dae b/game/data/species/Human/Female/character_models/huf_chest.dae similarity index 100% rename from game/data/character_models/huf_chest.dae rename to game/data/species/Human/Female/character_models/huf_chest.dae diff --git a/game/data/species/Human/Female/character_models/huf_chest.dae.import b/game/data/species/Human/Female/character_models/huf_chest.dae.import new file mode 100644 index 00000000..9571fb26 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_chest.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_chest.dae-2119bebd2d9a2e2f9d1bef771f169b07.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_chest.dae" +dest_files=[ "res://.import/huf_chest.dae-2119bebd2d9a2e2f9d1bef771f169b07.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_finger.blend b/game/data/species/Human/Female/character_models/huf_finger.blend similarity index 100% rename from game/data/character_models/huf_finger.blend rename to game/data/species/Human/Female/character_models/huf_finger.blend diff --git a/game/data/character_models/huf_finger.dae b/game/data/species/Human/Female/character_models/huf_finger.dae similarity index 100% rename from game/data/character_models/huf_finger.dae rename to game/data/species/Human/Female/character_models/huf_finger.dae diff --git a/game/data/species/Human/Female/character_models/huf_finger.dae.import b/game/data/species/Human/Female/character_models/huf_finger.dae.import new file mode 100644 index 00000000..0180aa79 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_finger.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_finger.dae-36c15e10e0f036ad48c5190df0f51ede.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_finger.dae" +dest_files=[ "res://.import/huf_finger.dae-36c15e10e0f036ad48c5190df0f51ede.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_fingers.blend b/game/data/species/Human/Female/character_models/huf_fingers.blend similarity index 100% rename from game/data/character_models/huf_fingers.blend rename to game/data/species/Human/Female/character_models/huf_fingers.blend diff --git a/game/data/character_models/huf_fingers.dae b/game/data/species/Human/Female/character_models/huf_fingers.dae similarity index 100% rename from game/data/character_models/huf_fingers.dae rename to game/data/species/Human/Female/character_models/huf_fingers.dae diff --git a/game/data/species/Human/Female/character_models/huf_fingers.dae.import b/game/data/species/Human/Female/character_models/huf_fingers.dae.import new file mode 100644 index 00000000..b729fea7 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_fingers.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_fingers.dae-9290594d1aceab28e7a03871c78e2b90.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_fingers.dae" +dest_files=[ "res://.import/huf_fingers.dae-9290594d1aceab28e7a03871c78e2b90.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_foot.blend b/game/data/species/Human/Female/character_models/huf_foot.blend similarity index 100% rename from game/data/character_models/huf_foot.blend rename to game/data/species/Human/Female/character_models/huf_foot.blend diff --git a/game/data/character_models/huf_foot.dae b/game/data/species/Human/Female/character_models/huf_foot.dae similarity index 100% rename from game/data/character_models/huf_foot.dae rename to game/data/species/Human/Female/character_models/huf_foot.dae diff --git a/game/data/species/Human/Female/character_models/huf_foot.dae.import b/game/data/species/Human/Female/character_models/huf_foot.dae.import new file mode 100644 index 00000000..d7151ce1 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_foot.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_foot.dae-fb70239b5f237b1e4bc3469b910f4e55.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_foot.dae" +dest_files=[ "res://.import/huf_foot.dae-fb70239b5f237b1e4bc3469b910f4e55.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 1.3, 0, -1.571 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_forearm.blend b/game/data/species/Human/Female/character_models/huf_forearm.blend similarity index 100% rename from game/data/character_models/huf_forearm.blend rename to game/data/species/Human/Female/character_models/huf_forearm.blend diff --git a/game/data/character_models/huf_forearm.dae b/game/data/species/Human/Female/character_models/huf_forearm.dae similarity index 100% rename from game/data/character_models/huf_forearm.dae rename to game/data/species/Human/Female/character_models/huf_forearm.dae diff --git a/game/data/species/Human/Female/character_models/huf_forearm.dae.import b/game/data/species/Human/Female/character_models/huf_forearm.dae.import new file mode 100644 index 00000000..556b8a64 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_forearm.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_forearm.dae-3f1e7bc7365c1933c68fc518be3d01b4.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_forearm.dae" +dest_files=[ "res://.import/huf_forearm.dae-3f1e7bc7365c1933c68fc518be3d01b4.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_hand.blend b/game/data/species/Human/Female/character_models/huf_hand.blend similarity index 100% rename from game/data/character_models/huf_hand.blend rename to game/data/species/Human/Female/character_models/huf_hand.blend diff --git a/game/data/character_models/huf_hand.dae b/game/data/species/Human/Female/character_models/huf_hand.dae similarity index 100% rename from game/data/character_models/huf_hand.dae rename to game/data/species/Human/Female/character_models/huf_hand.dae diff --git a/game/data/species/Human/Female/character_models/huf_hand.dae.import b/game/data/species/Human/Female/character_models/huf_hand.dae.import new file mode 100644 index 00000000..29b0ff5a --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_hand.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_hand.dae-e7e4c6f83f24110227386eb43f62029f.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_hand.dae" +dest_files=[ "res://.import/huf_hand.dae-e7e4c6f83f24110227386eb43f62029f.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_handl.blend b/game/data/species/Human/Female/character_models/huf_handl.blend similarity index 100% rename from game/data/character_models/huf_handl.blend rename to game/data/species/Human/Female/character_models/huf_handl.blend diff --git a/game/data/character_models/huf_handl.dae b/game/data/species/Human/Female/character_models/huf_handl.dae similarity index 100% rename from game/data/character_models/huf_handl.dae rename to game/data/species/Human/Female/character_models/huf_handl.dae diff --git a/game/data/species/Human/Female/character_models/huf_handl.dae.import b/game/data/species/Human/Female/character_models/huf_handl.dae.import new file mode 100644 index 00000000..22426295 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_handl.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_handl.dae-0e6ec278c24f4245b2068a95f55ff6ea.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_handl.dae" +dest_files=[ "res://.import/huf_handl.dae-0e6ec278c24f4245b2068a95f55ff6ea.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.571 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_head.blend b/game/data/species/Human/Female/character_models/huf_head.blend similarity index 100% rename from game/data/character_models/huf_head.blend rename to game/data/species/Human/Female/character_models/huf_head.blend diff --git a/game/data/character_models/huf_head.dae b/game/data/species/Human/Female/character_models/huf_head.dae similarity index 100% rename from game/data/character_models/huf_head.dae rename to game/data/species/Human/Female/character_models/huf_head.dae diff --git a/game/data/species/Human/Female/character_models/huf_head.dae.import b/game/data/species/Human/Female/character_models/huf_head.dae.import new file mode 100644 index 00000000..70101507 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_head.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_head.dae-12768e3052bf043c20aa7049c210e839.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_head.dae" +dest_files=[ "res://.import/huf_head.dae-12768e3052bf043c20aa7049c210e839.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_neck.blend b/game/data/species/Human/Female/character_models/huf_neck.blend similarity index 100% rename from game/data/character_models/huf_neck.blend rename to game/data/species/Human/Female/character_models/huf_neck.blend diff --git a/game/data/character_models/huf_neck.dae b/game/data/species/Human/Female/character_models/huf_neck.dae similarity index 100% rename from game/data/character_models/huf_neck.dae rename to game/data/species/Human/Female/character_models/huf_neck.dae diff --git a/game/data/species/Human/Female/character_models/huf_neck.dae.import b/game/data/species/Human/Female/character_models/huf_neck.dae.import new file mode 100644 index 00000000..d2b9be24 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_neck.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_neck.dae-c0ba7f7f99df22c1f5ba27d06d45f450.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_neck.dae" +dest_files=[ "res://.import/huf_neck.dae-c0ba7f7f99df22c1f5ba27d06d45f450.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_pelvis.blend b/game/data/species/Human/Female/character_models/huf_pelvis.blend similarity index 100% rename from game/data/character_models/huf_pelvis.blend rename to game/data/species/Human/Female/character_models/huf_pelvis.blend diff --git a/game/data/character_models/huf_pelvis.dae b/game/data/species/Human/Female/character_models/huf_pelvis.dae similarity index 100% rename from game/data/character_models/huf_pelvis.dae rename to game/data/species/Human/Female/character_models/huf_pelvis.dae diff --git a/game/data/species/Human/Female/character_models/huf_pelvis.dae.import b/game/data/species/Human/Female/character_models/huf_pelvis.dae.import new file mode 100644 index 00000000..ad792e3a --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_pelvis.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_pelvis.dae-7a4012d9a00f2341764c92bc58adb6fb.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_pelvis.dae" +dest_files=[ "res://.import/huf_pelvis.dae-7a4012d9a00f2341764c92bc58adb6fb.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_spine.blend b/game/data/species/Human/Female/character_models/huf_spine.blend similarity index 100% rename from game/data/character_models/huf_spine.blend rename to game/data/species/Human/Female/character_models/huf_spine.blend diff --git a/game/data/character_models/huf_spine1.blend b/game/data/species/Human/Female/character_models/huf_spine1.blend similarity index 100% rename from game/data/character_models/huf_spine1.blend rename to game/data/species/Human/Female/character_models/huf_spine1.blend diff --git a/game/data/character_models/huf_spine1.dae b/game/data/species/Human/Female/character_models/huf_spine1.dae similarity index 100% rename from game/data/character_models/huf_spine1.dae rename to game/data/species/Human/Female/character_models/huf_spine1.dae diff --git a/game/data/species/Human/Female/character_models/huf_spine1.dae.import b/game/data/species/Human/Female/character_models/huf_spine1.dae.import new file mode 100644 index 00000000..d9e648aa --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_spine1.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_spine1.dae-a3c91c3a3e217ea70e3cb255e2e1a14b.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_spine1.dae" +dest_files=[ "res://.import/huf_spine1.dae-a3c91c3a3e217ea70e3cb255e2e1a14b.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_spine2.blend b/game/data/species/Human/Female/character_models/huf_spine2.blend similarity index 100% rename from game/data/character_models/huf_spine2.blend rename to game/data/species/Human/Female/character_models/huf_spine2.blend diff --git a/game/data/character_models/huf_spine2.dae b/game/data/species/Human/Female/character_models/huf_spine2.dae similarity index 100% rename from game/data/character_models/huf_spine2.dae rename to game/data/species/Human/Female/character_models/huf_spine2.dae diff --git a/game/data/species/Human/Female/character_models/huf_spine2.dae.import b/game/data/species/Human/Female/character_models/huf_spine2.dae.import new file mode 100644 index 00000000..e629e299 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_spine2.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_spine2.dae-11a818ce7ccd5ec06a3ccd5daec876df.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_spine2.dae" +dest_files=[ "res://.import/huf_spine2.dae-11a818ce7ccd5ec06a3ccd5daec876df.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh.dae b/game/data/species/Human/Female/character_models/huf_thigh.dae similarity index 100% rename from game/data/character_models/huf_thigh.dae rename to game/data/species/Human/Female/character_models/huf_thigh.dae diff --git a/game/data/species/Human/Female/character_models/huf_thigh.dae.import b/game/data/species/Human/Female/character_models/huf_thigh.dae.import new file mode 100644 index 00000000..a8ffa72b --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_thigh.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_thigh.dae-e24dab071cf82f78afc80ff4a19c1680.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_thigh.dae" +dest_files=[ "res://.import/huf_thigh.dae-e24dab071cf82f78afc80ff4a19c1680.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh_left.blend b/game/data/species/Human/Female/character_models/huf_thigh_left.blend similarity index 100% rename from game/data/character_models/huf_thigh_left.blend rename to game/data/species/Human/Female/character_models/huf_thigh_left.blend diff --git a/game/data/character_models/huf_thigh_left.dae b/game/data/species/Human/Female/character_models/huf_thigh_left.dae similarity index 100% rename from game/data/character_models/huf_thigh_left.dae rename to game/data/species/Human/Female/character_models/huf_thigh_left.dae diff --git a/game/data/species/Human/Female/character_models/huf_thigh_left.dae.import b/game/data/species/Human/Female/character_models/huf_thigh_left.dae.import new file mode 100644 index 00000000..13ff0aa1 --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_thigh_left.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_thigh_left.dae-30c977facdbd501b177603beae557297.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_thigh_left.dae" +dest_files=[ "res://.import/huf_thigh_left.dae-30c977facdbd501b177603beae557297.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_thigh_right.blend b/game/data/species/Human/Female/character_models/huf_thigh_right.blend similarity index 100% rename from game/data/character_models/huf_thigh_right.blend rename to game/data/species/Human/Female/character_models/huf_thigh_right.blend diff --git a/game/data/character_models/huf_thigh_right.dae b/game/data/species/Human/Female/character_models/huf_thigh_right.dae similarity index 100% rename from game/data/character_models/huf_thigh_right.dae rename to game/data/species/Human/Female/character_models/huf_thigh_right.dae diff --git a/game/data/species/Human/Female/character_models/huf_thigh_right.dae.import b/game/data/species/Human/Female/character_models/huf_thigh_right.dae.import new file mode 100644 index 00000000..a81a306b --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_thigh_right.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_thigh_right.dae-7fdbbf192019d6352fd5d96eb3b27349.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_thigh_right.dae" +dest_files=[ "res://.import/huf_thigh_right.dae-7fdbbf192019d6352fd5d96eb3b27349.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/huf_upperarm.blend b/game/data/species/Human/Female/character_models/huf_upperarm.blend similarity index 100% rename from game/data/character_models/huf_upperarm.blend rename to game/data/species/Human/Female/character_models/huf_upperarm.blend diff --git a/game/data/character_models/huf_upperarm.dae b/game/data/species/Human/Female/character_models/huf_upperarm.dae similarity index 100% rename from game/data/character_models/huf_upperarm.dae rename to game/data/species/Human/Female/character_models/huf_upperarm.dae diff --git a/game/data/species/Human/Female/character_models/huf_upperarm.dae.import b/game/data/species/Human/Female/character_models/huf_upperarm.dae.import new file mode 100644 index 00000000..3015b64e --- /dev/null +++ b/game/data/species/Human/Female/character_models/huf_upperarm.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/huf_upperarm.dae-761f084fb1bd0ec248066999663b31bc.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/huf_upperarm.dae" +dest_files=[ "res://.import/huf_upperarm.dae-761f084fb1bd0ec248066999663b31bc.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/neck.dae b/game/data/species/Human/Female/character_models/neck.dae similarity index 100% rename from game/data/character_models/neck.dae rename to game/data/species/Human/Female/character_models/neck.dae diff --git a/game/data/species/Human/Female/character_models/neck.dae.import b/game/data/species/Human/Female/character_models/neck.dae.import new file mode 100644 index 00000000..a9b9b9a7 --- /dev/null +++ b/game/data/species/Human/Female/character_models/neck.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/neck.dae-5941689028f1b79638fa68ef3d484569.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/neck.dae" +dest_files=[ "res://.import/neck.dae-5941689028f1b79638fa68ef3d484569.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/pelvis.dae b/game/data/species/Human/Female/character_models/pelvis.dae similarity index 100% rename from game/data/character_models/pelvis.dae rename to game/data/species/Human/Female/character_models/pelvis.dae diff --git a/game/data/species/Human/Female/character_models/pelvis.dae.import b/game/data/species/Human/Female/character_models/pelvis.dae.import new file mode 100644 index 00000000..4c2f18f9 --- /dev/null +++ b/game/data/species/Human/Female/character_models/pelvis.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/pelvis.dae-d9d37641d29bc61422e7c70f19279944.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/pelvis.dae" +dest_files=[ "res://.import/pelvis.dae-d9d37641d29bc61422e7c70f19279944.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine.dae b/game/data/species/Human/Female/character_models/spine.dae similarity index 100% rename from game/data/character_models/spine.dae rename to game/data/species/Human/Female/character_models/spine.dae diff --git a/game/data/species/Human/Female/character_models/spine.dae.import b/game/data/species/Human/Female/character_models/spine.dae.import new file mode 100644 index 00000000..193a9f31 --- /dev/null +++ b/game/data/species/Human/Female/character_models/spine.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/spine.dae-aa55bd844618e389a682e02d13e6d22a.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/spine.dae" +dest_files=[ "res://.import/spine.dae-aa55bd844618e389a682e02d13e6d22a.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine1.dae b/game/data/species/Human/Female/character_models/spine1.dae similarity index 100% rename from game/data/character_models/spine1.dae rename to game/data/species/Human/Female/character_models/spine1.dae diff --git a/game/data/species/Human/Female/character_models/spine1.dae.import b/game/data/species/Human/Female/character_models/spine1.dae.import new file mode 100644 index 00000000..0939faab --- /dev/null +++ b/game/data/species/Human/Female/character_models/spine1.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/spine1.dae-85787e130602227e6659bcefea74d3f0.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/spine1.dae" +dest_files=[ "res://.import/spine1.dae-85787e130602227e6659bcefea74d3f0.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.571 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/spine2.dae b/game/data/species/Human/Female/character_models/spine2.dae similarity index 100% rename from game/data/character_models/spine2.dae rename to game/data/species/Human/Female/character_models/spine2.dae diff --git a/game/data/species/Human/Female/character_models/spine2.dae.import b/game/data/species/Human/Female/character_models/spine2.dae.import new file mode 100644 index 00000000..a64cb805 --- /dev/null +++ b/game/data/species/Human/Female/character_models/spine2.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/spine2.dae-1b8a8c7c24a6f3d24eaab868f5dd6b21.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/spine2.dae" +dest_files=[ "res://.import/spine2.dae-1b8a8c7c24a6f3d24eaab868f5dd6b21.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/thigh.dae b/game/data/species/Human/Female/character_models/thigh.dae similarity index 100% rename from game/data/character_models/thigh.dae rename to game/data/species/Human/Female/character_models/thigh.dae diff --git a/game/data/species/Human/Female/character_models/thigh.dae.import b/game/data/species/Human/Female/character_models/thigh.dae.import new file mode 100644 index 00000000..2876e782 --- /dev/null +++ b/game/data/species/Human/Female/character_models/thigh.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/thigh.dae-a28966af6a5f998459c1d108afa8a291.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/thigh.dae" +dest_files=[ "res://.import/thigh.dae-a28966af6a5f998459c1d108afa8a291.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_models/upperarm.dae b/game/data/species/Human/Female/character_models/upperarm.dae similarity index 100% rename from game/data/character_models/upperarm.dae rename to game/data/species/Human/Female/character_models/upperarm.dae diff --git a/game/data/species/Human/Female/character_models/upperarm.dae.import b/game/data/species/Human/Female/character_models/upperarm.dae.import new file mode 100644 index 00000000..9b8c1dac --- /dev/null +++ b/game/data/species/Human/Female/character_models/upperarm.dae.import @@ -0,0 +1,16 @@ +[remap] + +importer="collada_mdr" +type="MeshDataResource" +path="res://.import/upperarm.dae-57801f5262a5fd8dfe5caa6e6e20f9dd.res" + +[deps] + +source_file="res://data/species/Human/Female/character_models/upperarm.dae" +dest_files=[ "res://.import/upperarm.dae-57801f5262a5fd8dfe5caa6e6e20f9dd.res" ] + +[params] + +offset=Vector3( 0, 0, 0 ) +rotation=Vector3( 0, 0, -1.5708 ) +scale=Vector3( 0.011, 0.011, 0.011 ) diff --git a/game/data/character_textures/armor_green_scarf.png b/game/data/species/Human/Female/character_textures/armor_green_scarf.png similarity index 100% rename from game/data/character_textures/armor_green_scarf.png rename to game/data/species/Human/Female/character_textures/armor_green_scarf.png diff --git a/game/data/species/Human/Female/character_textures/armor_green_scarf.png.import b/game/data/species/Human/Female/character_textures/armor_green_scarf.png.import new file mode 100644 index 00000000..e789b700 --- /dev/null +++ b/game/data/species/Human/Female/character_textures/armor_green_scarf.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_green_scarf.png-54c8777b1cbb0f02d319a105b1ed1d10.restex" + +[deps] + +source_file="res://data/species/Human/Female/character_textures/armor_green_scarf.png" +dest_files=[ "res://.import/armor_green_scarf.png-54c8777b1cbb0f02d319a105b1ed1d10.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/data/character_textures/armor_green_scarf_readme.txt b/game/data/species/Human/Female/character_textures/armor_green_scarf_readme.txt similarity index 100% rename from game/data/character_textures/armor_green_scarf_readme.txt rename to game/data/species/Human/Female/character_textures/armor_green_scarf_readme.txt diff --git a/game/data/character_textures/armor_green_scarf_v3.png b/game/data/species/Human/Female/character_textures/armor_green_scarf_v3.png similarity index 100% rename from game/data/character_textures/armor_green_scarf_v3.png rename to game/data/species/Human/Female/character_textures/armor_green_scarf_v3.png diff --git a/game/data/character_textures/armor_green_scarf_v3.png.import b/game/data/species/Human/Female/character_textures/armor_green_scarf_v3.png.import similarity index 63% rename from game/data/character_textures/armor_green_scarf_v3.png.import rename to game/data/species/Human/Female/character_textures/armor_green_scarf_v3.png.import index 59ae241e..ec0e8eaf 100644 --- a/game/data/character_textures/armor_green_scarf_v3.png.import +++ b/game/data/species/Human/Female/character_textures/armor_green_scarf_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_green_scarf_v3.png-9263c51f91afe4c6793ecac531efd89e.stex" +path="res://.import/armor_green_scarf_v3.png-153ddb0b8c10301de507b050de31a9c7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/armor_green_scarf_v3.png" -dest_files=[ "res://.import/armor_green_scarf_v3.png-9263c51f91afe4c6793ecac531efd89e.stex" ] +source_file="res://data/species/Human/Female/character_textures/armor_green_scarf_v3.png" +dest_files=[ "res://.import/armor_green_scarf_v3.png-153ddb0b8c10301de507b050de31a9c7.stex" ] [params] diff --git a/game/data/character_textures/armor_green_scarfv2.png b/game/data/species/Human/Female/character_textures/armor_green_scarfv2.png similarity index 100% rename from game/data/character_textures/armor_green_scarfv2.png rename to game/data/species/Human/Female/character_textures/armor_green_scarfv2.png diff --git a/game/data/character_textures/armor_green_scarfv2.png.import b/game/data/species/Human/Female/character_textures/armor_green_scarfv2.png.import similarity index 63% rename from game/data/character_textures/armor_green_scarfv2.png.import rename to game/data/species/Human/Female/character_textures/armor_green_scarfv2.png.import index c764da70..fbb49c9a 100644 --- a/game/data/character_textures/armor_green_scarfv2.png.import +++ b/game/data/species/Human/Female/character_textures/armor_green_scarfv2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_green_scarfv2.png-da6c3218412c8c7bea7413ee37eecba0.stex" +path="res://.import/armor_green_scarfv2.png-9e51ac34d2ba4ff008d8898a37c729ac.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/armor_green_scarfv2.png" -dest_files=[ "res://.import/armor_green_scarfv2.png-da6c3218412c8c7bea7413ee37eecba0.stex" ] +source_file="res://data/species/Human/Female/character_textures/armor_green_scarfv2.png" +dest_files=[ "res://.import/armor_green_scarfv2.png-9e51ac34d2ba4ff008d8898a37c729ac.stex" ] [params] diff --git a/game/data/character_textures/armor_red_scarf.png b/game/data/species/Human/Female/character_textures/armor_red_scarf.png similarity index 100% rename from game/data/character_textures/armor_red_scarf.png rename to game/data/species/Human/Female/character_textures/armor_red_scarf.png diff --git a/game/data/species/Human/Female/character_textures/armor_red_scarf.png.import b/game/data/species/Human/Female/character_textures/armor_red_scarf.png.import new file mode 100644 index 00000000..9a5985f6 --- /dev/null +++ b/game/data/species/Human/Female/character_textures/armor_red_scarf.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_red_scarf.png-7aecdb3ecdc1f505dc98cd60bbc80417.restex" + +[deps] + +source_file="res://data/species/Human/Female/character_textures/armor_red_scarf.png" +dest_files=[ "res://.import/armor_red_scarf.png-7aecdb3ecdc1f505dc98cd60bbc80417.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/data/character_textures/armor_red_scarf_readme.txt b/game/data/species/Human/Female/character_textures/armor_red_scarf_readme.txt similarity index 100% rename from game/data/character_textures/armor_red_scarf_readme.txt rename to game/data/species/Human/Female/character_textures/armor_red_scarf_readme.txt diff --git a/game/data/character_textures/armor_red_scarf_v3.png b/game/data/species/Human/Female/character_textures/armor_red_scarf_v3.png similarity index 100% rename from game/data/character_textures/armor_red_scarf_v3.png rename to game/data/species/Human/Female/character_textures/armor_red_scarf_v3.png diff --git a/game/data/character_textures/armor_red_scarf_v3.png.import b/game/data/species/Human/Female/character_textures/armor_red_scarf_v3.png.import similarity index 64% rename from game/data/character_textures/armor_red_scarf_v3.png.import rename to game/data/species/Human/Female/character_textures/armor_red_scarf_v3.png.import index e549a0aa..c6438af4 100644 --- a/game/data/character_textures/armor_red_scarf_v3.png.import +++ b/game/data/species/Human/Female/character_textures/armor_red_scarf_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_red_scarf_v3.png-84f6e5c6eebd8df51d803efd5c0e7eec.stex" +path="res://.import/armor_red_scarf_v3.png-b24b8760f6c27893002886c3f1fe6e69.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/armor_red_scarf_v3.png" -dest_files=[ "res://.import/armor_red_scarf_v3.png-84f6e5c6eebd8df51d803efd5c0e7eec.stex" ] +source_file="res://data/species/Human/Female/character_textures/armor_red_scarf_v3.png" +dest_files=[ "res://.import/armor_red_scarf_v3.png-b24b8760f6c27893002886c3f1fe6e69.stex" ] [params] diff --git a/game/data/character_textures/armor_simple.png b/game/data/species/Human/Female/character_textures/armor_simple.png similarity index 100% rename from game/data/character_textures/armor_simple.png rename to game/data/species/Human/Female/character_textures/armor_simple.png diff --git a/game/data/species/Human/Female/character_textures/armor_simple.png.import b/game/data/species/Human/Female/character_textures/armor_simple.png.import new file mode 100644 index 00000000..0e6cfac0 --- /dev/null +++ b/game/data/species/Human/Female/character_textures/armor_simple.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/armor_simple.png-996f425b567630b274db75cd1f935fe4.restex" + +[deps] + +source_file="res://data/species/Human/Female/character_textures/armor_simple.png" +dest_files=[ "res://.import/armor_simple.png-996f425b567630b274db75cd1f935fe4.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/data/character_textures/armor_simple_readme.txt b/game/data/species/Human/Female/character_textures/armor_simple_readme.txt similarity index 100% rename from game/data/character_textures/armor_simple_readme.txt rename to game/data/species/Human/Female/character_textures/armor_simple_readme.txt diff --git a/game/data/character_textures/armor_simple_v2.png b/game/data/species/Human/Female/character_textures/armor_simple_v2.png similarity index 100% rename from game/data/character_textures/armor_simple_v2.png rename to game/data/species/Human/Female/character_textures/armor_simple_v2.png diff --git a/game/data/character_textures/armor_simple_v2.png.import b/game/data/species/Human/Female/character_textures/armor_simple_v2.png.import similarity index 64% rename from game/data/character_textures/armor_simple_v2.png.import rename to game/data/species/Human/Female/character_textures/armor_simple_v2.png.import index 30a9069c..3052f155 100644 --- a/game/data/character_textures/armor_simple_v2.png.import +++ b/game/data/species/Human/Female/character_textures/armor_simple_v2.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_simple_v2.png-e6c6a4af172ff9999d28acc160335f0f.stex" +path="res://.import/armor_simple_v2.png-d52794bb077f1d6d5adccf97090ced91.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/armor_simple_v2.png" -dest_files=[ "res://.import/armor_simple_v2.png-e6c6a4af172ff9999d28acc160335f0f.stex" ] +source_file="res://data/species/Human/Female/character_textures/armor_simple_v2.png" +dest_files=[ "res://.import/armor_simple_v2.png-d52794bb077f1d6d5adccf97090ced91.stex" ] [params] diff --git a/game/data/character_textures/armor_simple_v3.png b/game/data/species/Human/Female/character_textures/armor_simple_v3.png similarity index 100% rename from game/data/character_textures/armor_simple_v3.png rename to game/data/species/Human/Female/character_textures/armor_simple_v3.png diff --git a/game/data/character_textures/armor_simple_v3.png.import b/game/data/species/Human/Female/character_textures/armor_simple_v3.png.import similarity index 64% rename from game/data/character_textures/armor_simple_v3.png.import rename to game/data/species/Human/Female/character_textures/armor_simple_v3.png.import index a4a2d586..7fba3987 100644 --- a/game/data/character_textures/armor_simple_v3.png.import +++ b/game/data/species/Human/Female/character_textures/armor_simple_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/armor_simple_v3.png-7313eb8f1cdabed8b1dcd846aba07b51.stex" +path="res://.import/armor_simple_v3.png-bcc74503056792fdfeaa021c7844d79b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/armor_simple_v3.png" -dest_files=[ "res://.import/armor_simple_v3.png-7313eb8f1cdabed8b1dcd846aba07b51.stex" ] +source_file="res://data/species/Human/Female/character_textures/armor_simple_v3.png" +dest_files=[ "res://.import/armor_simple_v3.png-bcc74503056792fdfeaa021c7844d79b.stex" ] [params] diff --git a/game/data/character_textures/head.png b/game/data/species/Human/Female/character_textures/head.png similarity index 100% rename from game/data/character_textures/head.png rename to game/data/species/Human/Female/character_textures/head.png diff --git a/game/data/species/Human/Female/character_textures/head.png.import b/game/data/species/Human/Female/character_textures/head.png.import new file mode 100644 index 00000000..46cf6204 --- /dev/null +++ b/game/data/species/Human/Female/character_textures/head.png.import @@ -0,0 +1,15 @@ +[remap] + +importer="packer_image_resource" +type="PackerImageResource" +path="res://.import/head.png-b21c0f15390b8144e9d012699619499b.restex" + +[deps] + +source_file="res://data/species/Human/Female/character_textures/head.png" +dest_files=[ "res://.import/head.png-b21c0f15390b8144e9d012699619499b.restex" ] + +[params] + +hdr_as_srgb=false +scale=1.0 diff --git a/game/data/character_textures/head_v3.png b/game/data/species/Human/Female/character_textures/head_v3.png similarity index 100% rename from game/data/character_textures/head_v3.png rename to game/data/species/Human/Female/character_textures/head_v3.png diff --git a/game/data/character_textures/head_v3.png.import b/game/data/species/Human/Female/character_textures/head_v3.png.import similarity index 68% rename from game/data/character_textures/head_v3.png.import rename to game/data/species/Human/Female/character_textures/head_v3.png.import index a344fb50..db1bca06 100644 --- a/game/data/character_textures/head_v3.png.import +++ b/game/data/species/Human/Female/character_textures/head_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/head_v3.png-3cfa65b7d1e8ea93eff683ca99ce190b.stex" +path="res://.import/head_v3.png-a6fd2a0adb6145e7620e72baffeda98e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/head_v3.png" -dest_files=[ "res://.import/head_v3.png-3cfa65b7d1e8ea93eff683ca99ce190b.stex" ] +source_file="res://data/species/Human/Female/character_textures/head_v3.png" +dest_files=[ "res://.import/head_v3.png-a6fd2a0adb6145e7620e72baffeda98e.stex" ] [params] diff --git a/game/data/character_textures/skin.png b/game/data/species/Human/Female/character_textures/skin.png similarity index 100% rename from game/data/character_textures/skin.png rename to game/data/species/Human/Female/character_textures/skin.png diff --git a/game/data/character_textures/armor_simple.png.import b/game/data/species/Human/Female/character_textures/skin.png.import similarity index 51% rename from game/data/character_textures/armor_simple.png.import rename to game/data/species/Human/Female/character_textures/skin.png.import index e2aaf1d2..6968cf48 100644 --- a/game/data/character_textures/armor_simple.png.import +++ b/game/data/species/Human/Female/character_textures/skin.png.import @@ -2,12 +2,12 @@ importer="packer_image_resource" type="PackerImageResource" -path="res://.import/armor_simple.png-188193c6cad7cf5dbe3bb67ba053101b.restex" +path="res://.import/skin.png-46cac68c74b27d620d8618c90bbc430d.restex" [deps] -source_file="res://data/character_textures/armor_simple.png" -dest_files=[ "res://.import/armor_simple.png-188193c6cad7cf5dbe3bb67ba053101b.restex" ] +source_file="res://data/species/Human/Female/character_textures/skin.png" +dest_files=[ "res://.import/skin.png-46cac68c74b27d620d8618c90bbc430d.restex" ] [params] diff --git a/game/data/character_textures/skin_v3.png b/game/data/species/Human/Female/character_textures/skin_v3.png similarity index 100% rename from game/data/character_textures/skin_v3.png rename to game/data/species/Human/Female/character_textures/skin_v3.png diff --git a/game/data/character_textures/skin_v3.png.import b/game/data/species/Human/Female/character_textures/skin_v3.png.import similarity index 68% rename from game/data/character_textures/skin_v3.png.import rename to game/data/species/Human/Female/character_textures/skin_v3.png.import index 73a3035f..10f38c60 100644 --- a/game/data/character_textures/skin_v3.png.import +++ b/game/data/species/Human/Female/character_textures/skin_v3.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/skin_v3.png-37de1c9eacee490957ed0a72b21951e3.stex" +path="res://.import/skin_v3.png-3f7bcab51d5881f278816ca742a7376e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/character_textures/skin_v3.png" -dest_files=[ "res://.import/skin_v3.png-37de1c9eacee490957ed0a72b21951e3.stex" ] +source_file="res://data/species/Human/Female/character_textures/skin_v3.png" +dest_files=[ "res://.import/skin_v3.png-3f7bcab51d5881f278816ca742a7376e.stex" ] [params] diff --git a/game/data/models/HumanFemale.tres b/game/data/species/Human/models/HumanFemale.tres similarity index 63% rename from game/data/models/HumanFemale.tres rename to game/data/species/Human/models/HumanFemale.tres index 8671e9d6..9e795d44 100644 --- a/game/data/models/HumanFemale.tres +++ b/game/data/species/Human/models/HumanFemale.tres @@ -1,6 +1,6 @@ [gd_resource type="SpeciesModelData" load_steps=2 format=2] -[ext_resource path="res://data/models/HumanFemale.tscn" type="PackedScene" id=1] +[ext_resource path="res://data/species/Human/models/HumanFemale.tscn" type="PackedScene" id=1] [resource] resource_name = "Human Female" diff --git a/game/data/models/HumanFemale.tscn b/game/data/species/Human/models/HumanFemale.tscn similarity index 89% rename from game/data/models/HumanFemale.tscn rename to game/data/species/Human/models/HumanFemale.tscn index 30e7d6f3..ddb3b3fa 100644 --- a/game/data/models/HumanFemale.tscn +++ b/game/data/species/Human/models/HumanFemale.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://data/models/armature_model_orig_v2.tscn" type="PackedScene" id=1] -[ext_resource path="res://player/Body.gd" type="Script" id=6] +[ext_resource path="res://player/Body.gd" type="Script" id=1] +[ext_resource path="res://data/species/Human/models/armature_model_orig_v2.tscn" type="PackedScene" id=2] + [sub_resource type="CapsuleShape" id=1] radius = 0.266582 @@ -11,7 +12,7 @@ height = 0.927641 extents = Vector3( 0.216228, 0.0681041, 0.183397 ) [node name="HumanFemale" type="KinematicBody"] -script = ExtResource( 6 ) +script = ExtResource( 1 ) model_path = NodePath("../HumanFemale/Rotation_Helper/Model") character_skeleton_path = NodePath("../HumanFemale/Rotation_Helper/Model/character") @@ -28,7 +29,7 @@ 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="character" parent="Rotation_Helper/Model" instance=ExtResource( 1 )] +[node name="character" parent="Rotation_Helper/Model" instance=ExtResource( 2 )] mesh_instance_path = NodePath("../../../../HumanFemale/Rotation_Helper/Model/character/armature/Armature/Skeleton/MeshInstance") skeleton_path = NodePath("../../../../HumanFemale/Rotation_Helper/Model/character/armature/Armature/Skeleton") left_hand_attach_point_path = NodePath("../../../../HumanFemale/Rotation_Helper/Model/character/armature/Armature/Skeleton/LeftHandAttachment/LeftHandAP") diff --git a/game/data/models/Material_003.material b/game/data/species/Human/models/Material_003.material similarity index 100% rename from game/data/models/Material_003.material rename to game/data/species/Human/models/Material_003.material diff --git a/game/data/models/armature.blend b/game/data/species/Human/models/armature.blend similarity index 100% rename from game/data/models/armature.blend rename to game/data/species/Human/models/armature.blend diff --git a/game/data/models/armature.dae b/game/data/species/Human/models/armature.dae similarity index 100% rename from game/data/models/armature.dae rename to game/data/species/Human/models/armature.dae diff --git a/game/data/models/armature.dae.import b/game/data/species/Human/models/armature.dae.import similarity index 99% rename from game/data/models/armature.dae.import rename to game/data/species/Human/models/armature.dae.import index d4010455..e99f5a50 100644 --- a/game/data/models/armature.dae.import +++ b/game/data/species/Human/models/armature.dae.import @@ -2,12 +2,12 @@ importer="scene" type="PackedScene" -path="res://.import/armature.dae-21ffdeb89146f59da7d265600df6c7cc.scn" +path="res://.import/armature.dae-53231601bb723a07ee7eb4d500ea6069.scn" [deps] -source_file="res://data/models/armature.dae" -dest_files=[ "res://.import/armature.dae-21ffdeb89146f59da7d265600df6c7cc.scn" ] +source_file="res://data/species/Human/models/armature.dae" +dest_files=[ "res://.import/armature.dae-53231601bb723a07ee7eb4d500ea6069.scn" ] [params] diff --git a/game/data/models/armature_model_orig_v2.tscn b/game/data/species/Human/models/armature_model_orig_v2.tscn similarity index 96% rename from game/data/models/armature_model_orig_v2.tscn rename to game/data/species/Human/models/armature_model_orig_v2.tscn index a02fbd3b..0e42b82f 100644 --- a/game/data/models/armature_model_orig_v2.tscn +++ b/game/data/species/Human/models/armature_model_orig_v2.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=38 format=2] -[ext_resource path="res://data/models/armature.dae" type="PackedScene" id=1] -[ext_resource path="res://data/materials/3_standard_character_material.tres" type="Material" id=2] -[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=3] -[ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=4] +[ext_resource path="res://data/item_visuals/test_base_v3.tres" type="ItemVisual" id=1] +[ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2] +[ext_resource path="res://data/materials/3_standard_character_material.tres" type="Material" id=3] +[ext_resource path="res://test_weapons/shield_d.mesh" type="ArrayMesh" id=4] [ext_resource path="res://test_weapons/sword_i.mesh" type="ArrayMesh" id=5] -[ext_resource path="res://data/item_visuals/test_base_v3.tres" type="ItemVisual" id=6] -[ext_resource path="res://test_weapons/shield_d.mesh" type="ArrayMesh" id=7] -[ext_resource path="res://data/materials/9_standard_character_material_notex.tres" type="Material" id=8] +[ext_resource path="res://data/species/Human/models/armature.dae" type="PackedScene" id=6] +[ext_resource path="res://data/materials/9_standard_character_material_notex.tres" type="Material" id=7] +[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8] + [sub_resource type="Skin" id=1] bind_count = 31 @@ -216,19 +217,19 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00126277, 0, -0.000325084 ) model_dirty = true animation_player_path = NodePath("armature/AnimationPlayer") animation_tree_path = NodePath("AnimationTree") -script = ExtResource( 3 ) +script = ExtResource( 8 ) automatic_build = true use_threads = true mesh_instance_path = NodePath("armature/Armature/Skeleton/MeshInstance") skeleton_path = NodePath("armature/Armature/Skeleton") -materials = [ ExtResource( 2 ), ExtResource( 2 ), ExtResource( 8 ) ] +materials = [ ExtResource( 3 ), ExtResource( 3 ), ExtResource( 7 ) ] left_hand_attach_point_path = NodePath("armature/Armature/Skeleton/LeftHandAttachment/LeftHandAP") right_hand_attach_point_path = NodePath("armature/Armature/Skeleton/RightHandAttachment/RightHandAP") torso_attach_point_path = NodePath("armature/Armature/Skeleton/NeckAttachment/TorsoAP") root_attach_point_path = NodePath("armature/Armature/Skeleton/RootAttachment/RootAP") -viss = [ ExtResource( 6 ) ] +viss = [ ExtResource( 1 ) ] -[node name="armature" parent="." instance=ExtResource( 1 )] +[node name="armature" parent="." instance=ExtResource( 6 )] [node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"] skin = SubResource( 1 ) @@ -239,7 +240,7 @@ bone_name = "left_hand" [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 ) -script = ExtResource( 4 ) +script = ExtResource( 2 ) [node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"] transform = Transform( -0.0425592, -0.998135, 0.0431264, -0.127963, 0.0482404, 0.990537, -0.990882, 0.0366505, -0.129781, -0.274708, 0.765201, -0.00470273 ) @@ -247,7 +248,7 @@ bone_name = "right_hand" [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 ) -script = ExtResource( 4 ) +script = ExtResource( 2 ) [node name="RootAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"] transform = Transform( 1, 0, 0, 0, 0, -1, 0, 1, 0, -3.23883e-05, 0, 0.000216131 ) @@ -255,7 +256,7 @@ bone_name = "root" [node name="RootAP" type="Spatial" parent="armature/Armature/Skeleton/RootAttachment"] transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0 ) -script = ExtResource( 4 ) +script = ExtResource( 2 ) [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"] transform = Transform( 0.99995, -0.00134125, 0.00993415, 0.0099976, 0.0730947, -0.997194, 0.000611389, 0.997323, 0.0731092, 0.00126205, 1.31264, 9.72227e-05 ) @@ -263,7 +264,7 @@ bone_name = "neck" [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 ) -script = ExtResource( 4 ) +script = ExtResource( 2 ) [node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"] transform = Transform( 0.999886, 5.70244e-09, -0.0150737, -0.0150737, 4.71811e-07, -0.999886, 1.41015e-09, 1, 4.71844e-07, 0.00650302, 0.77115, -4.94765e-10 ) @@ -286,7 +287,7 @@ bone_name = "spine_2" transform = Transform( -0.430811, -0.000122875, 0.129993, 8.54071e-05, -0.45, -0.000142502, 0.130026, -0.000112184, 0.430809, 0.000957399, -0.0715881, -0.0057677 ) [node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton/BoneAttachment/Spatial"] -mesh = ExtResource( 7 ) +mesh = ExtResource( 4 ) material/0 = null [node name="AnimationTree" type="AnimationTree" parent="."] diff --git a/game/data/models/armature_new.blend b/game/data/species/Human/models/armature_new.blend similarity index 100% rename from game/data/models/armature_new.blend rename to game/data/species/Human/models/armature_new.blend diff --git a/game/data/models/armature_old.blend b/game/data/species/Human/models/armature_old.blend similarity index 100% rename from game/data/models/armature_old.blend rename to game/data/species/Human/models/armature_old.blend diff --git a/game/data/models/ttt.png b/game/data/species/Human/models/ttt.png similarity index 100% rename from game/data/models/ttt.png rename to game/data/species/Human/models/ttt.png diff --git a/game/data/models/ttt.png.import b/game/data/species/Human/models/ttt.png.import similarity index 70% rename from game/data/models/ttt.png.import rename to game/data/species/Human/models/ttt.png.import index ade5d993..886affd8 100644 --- a/game/data/models/ttt.png.import +++ b/game/data/species/Human/models/ttt.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ttt.png-0185682edec66eea5f16d7601fab19c5.stex" +path="res://.import/ttt.png-1a66b5c54f9e73c0ec8a5c571a408944.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/models/ttt.png" -dest_files=[ "res://.import/ttt.png-0185682edec66eea5f16d7601fab19c5.stex" ] +source_file="res://data/species/Human/models/ttt.png" +dest_files=[ "res://.import/ttt.png-1a66b5c54f9e73c0ec8a5c571a408944.stex" ] [params] diff --git a/game/player/DisplayPlayer.tscn b/game/player/DisplayPlayer.tscn index dea41d61..9524a3f1 100644 --- a/game/player/DisplayPlayer.tscn +++ b/game/player/DisplayPlayer.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://player/DisplayPlayer.gd" type="Script" id=1] -[ext_resource path="res://data/models/armature_model_orig_v2.tscn" type="PackedScene" id=2] +[ext_resource path="res://data/species/Human/models/armature_model_orig_v2.tscn" type="PackedScene" id=2] [ext_resource path="res://player/EntityModel.gd" type="Script" id=3] + + [node name="DisplayPlayer" type="Entity" groups=[ "players", ]]