From 7723a03defd511e5c47d021c74d15c896da734d3 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 13:25:29 +0200 Subject: [PATCH] Moved a few things into a new core module. Also updated HEADS to get a typo fix for ESS. --- HEADS | 2 +- .../{ => core}/crafting/1_test_craft.tres | 4 +- .../2_chest_of_the_infinite_wisdom.tres | 8 +- .../entity_resources/1_mana_resource.tres | 0 .../data/{ => core}/entity_skills/1_test.tres | 0 game/data/core/game_module.tres | 8 + .../{ => core}/item_templates/1_gold.tres | 2 +- .../{ => core}/item_templates/2_test.tres | 8 +- .../3_chest_of_the_infinite_wisdom.tres | 12 +- .../1_chest_of_the_infinite_wisdom.tres | 0 .../{ => core}/item_visuals/test_base_v2.tres | 0 .../{ => core}/item_visuals/test_base_v3.tres | 266 +++++++++--------- .../{ => core}/item_visuals/test_vis1.tres | 0 game/data/core/resource_db.tres | 15 + .../naturalist/1_naturalist.tres | 3 +- .../naturalist/entities/1_naturalist.tres | 6 +- .../spells/10_aspect_of_scorpions_rank_1.tres | 3 +- .../naturalist/spells/36_regrow.tres | 3 +- game/data/resource_db.tres | 1 - .../Human/models/armature_model_orig_v2.tscn | 3 +- 20 files changed, 186 insertions(+), 158 deletions(-) rename game/data/{ => core}/crafting/1_test_craft.tres (80%) rename game/data/{ => core}/crafting/2_chest_of_the_infinite_wisdom.tres (67%) rename game/data/{ => core}/entity_resources/1_mana_resource.tres (100%) rename game/data/{ => core}/entity_skills/1_test.tres (100%) create mode 100644 game/data/core/game_module.tres rename game/data/{ => core}/item_templates/1_gold.tres (100%) rename game/data/{ => core}/item_templates/2_test.tres (75%) rename game/data/{ => core}/item_templates/3_chest_of_the_infinite_wisdom.tres (81%) rename game/data/{ => core}/item_visuals/1_chest_of_the_infinite_wisdom.tres (100%) rename game/data/{ => core}/item_visuals/test_base_v2.tres (100%) rename game/data/{ => core}/item_visuals/test_base_v3.tres (55%) rename game/data/{ => core}/item_visuals/test_vis1.tres (100%) create mode 100644 game/data/core/resource_db.tres diff --git a/HEADS b/HEADS index ac8d1cca..ddcddaf6 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "fdcff467f17a8efb725ea71a10182a33e63704e6"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file +{"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "85e06a4ca99d64b4002b94ecfa556c36360c80c3"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file diff --git a/game/data/crafting/1_test_craft.tres b/game/data/core/crafting/1_test_craft.tres similarity index 80% rename from game/data/crafting/1_test_craft.tres rename to game/data/core/crafting/1_test_craft.tres index 94f06023..5cea6fee 100644 --- a/game/data/crafting/1_test_craft.tres +++ b/game/data/core/crafting/1_test_craft.tres @@ -1,7 +1,7 @@ [gd_resource type="CraftRecipe" load_steps=8 format=2] -[ext_resource path="res://data/item_templates/2_test.tres" type="ItemTemplate" id=1] -[ext_resource path="res://data/item_templates/1_gold.tres" type="ItemTemplate" id=2] +[ext_resource path="res://data/core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://data/core/item_templates/1_gold.tres" type="ItemTemplate" id=2] [sub_resource type="CraftRecipeHelper" id=1] item = ExtResource( 2 ) diff --git a/game/data/crafting/2_chest_of_the_infinite_wisdom.tres b/game/data/core/crafting/2_chest_of_the_infinite_wisdom.tres similarity index 67% rename from game/data/crafting/2_chest_of_the_infinite_wisdom.tres rename to game/data/core/crafting/2_chest_of_the_infinite_wisdom.tres index 0a2e4a44..43633776 100644 --- a/game/data/crafting/2_chest_of_the_infinite_wisdom.tres +++ b/game/data/core/crafting/2_chest_of_the_infinite_wisdom.tres @@ -1,14 +1,14 @@ [gd_resource type="CraftRecipe" load_steps=5 format=2] -[ext_resource path="res://data/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=1] -[ext_resource path="res://data/item_templates/2_test.tres" type="ItemTemplate" id=2] +[ext_resource path="res://data/core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://data/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] [sub_resource type="CraftRecipeHelper" id=1] -item = ExtResource( 2 ) +item = ExtResource( 1 ) count = 1 [sub_resource type="CraftRecipeHelper" id=2] -item = ExtResource( 1 ) +item = ExtResource( 2 ) count = 1 [resource] diff --git a/game/data/entity_resources/1_mana_resource.tres b/game/data/core/entity_resources/1_mana_resource.tres similarity index 100% rename from game/data/entity_resources/1_mana_resource.tres rename to game/data/core/entity_resources/1_mana_resource.tres diff --git a/game/data/entity_skills/1_test.tres b/game/data/core/entity_skills/1_test.tres similarity index 100% rename from game/data/entity_skills/1_test.tres rename to game/data/core/entity_skills/1_test.tres diff --git a/game/data/core/game_module.tres b/game/data/core/game_module.tres new file mode 100644 index 00000000..8c8813b8 --- /dev/null +++ b/game/data/core/game_module.tres @@ -0,0 +1,8 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://scripts/game_modules/GameModule.gd" type="Script" id=1] +[ext_resource path="res://data/core/resource_db.tres" type="ESSResourceDBStatic" id=2] + +[resource] +script = ExtResource( 1 ) +resource_db = ExtResource( 2 ) diff --git a/game/data/item_templates/1_gold.tres b/game/data/core/item_templates/1_gold.tres similarity index 100% rename from game/data/item_templates/1_gold.tres rename to game/data/core/item_templates/1_gold.tres index b2d791e6..24e9272a 100644 --- a/game/data/item_templates/1_gold.tres +++ b/game/data/core/item_templates/1_gold.tres @@ -5,6 +5,6 @@ [resource] resource_name = "Gold" id = 1 -text_name = "Gold" item_type = 13 icon = ExtResource( 1 ) +text_name = "Gold" diff --git a/game/data/item_templates/2_test.tres b/game/data/core/item_templates/2_test.tres similarity index 75% rename from game/data/item_templates/2_test.tres rename to game/data/core/item_templates/2_test.tres index ee4b1cee..e588483f 100644 --- a/game/data/item_templates/2_test.tres +++ b/game/data/core/item_templates/2_test.tres @@ -1,14 +1,14 @@ [gd_resource type="ItemTemplate" load_steps=4 format=2] -[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=1] [ext_resource path="res://data/icons/3_iron_bar.tres" type="Texture" id=2] -[ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=3] +[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] [resource] resource_name = "Iron Bar" id = 2 stack_size = 10 icon = ExtResource( 2 ) -use_spell = ExtResource( 3 ) +use_spell = ExtResource( 1 ) text_name = "Iron Bar" -script = ExtResource( 1 ) +script = ExtResource( 3 ) diff --git a/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres b/game/data/core/item_templates/3_chest_of_the_infinite_wisdom.tres similarity index 81% rename from game/data/item_templates/3_chest_of_the_infinite_wisdom.tres rename to game/data/core/item_templates/3_chest_of_the_infinite_wisdom.tres index 36f736db..3a66731d 100644 --- a/game/data/item_templates/3_chest_of_the_infinite_wisdom.tres +++ b/game/data/core/item_templates/3_chest_of_the_infinite_wisdom.tres @@ -1,8 +1,8 @@ [gd_resource type="ItemTemplate" load_steps=5 format=2] -[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1] -[ext_resource path="res://data/item_visuals/1_chest_of_the_infinite_wisdom.tres" type="ItemVisual" id=2] -[ext_resource path="res://data/icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=3] +[ext_resource path="res://data/core/item_visuals/1_chest_of_the_infinite_wisdom.tres" type="ItemVisual" id=1] +[ext_resource path="res://data/icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=2] +[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] [ext_resource path="res://data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4] [resource] @@ -12,8 +12,8 @@ item_type = 1 rarity = 6 armor_type = 1 equip_slot = 3 -item_visual = ExtResource( 2 ) -icon = ExtResource( 3 ) +item_visual = ExtResource( 1 ) +icon = ExtResource( 2 ) use_spell = ExtResource( 4 ) text_name = "Chest of the Infinite Wisdom" item_stat_modifier_count = 2 @@ -33,4 +33,4 @@ Modifiers_1/max_bonus_mod = 0.0 Modifiers_1/min_percent_mod = 0.0 Modifiers_1/max_percent_mod = 0.0 Modifiers_1/scaling_factor = 1.0 -script = ExtResource( 1 ) +script = ExtResource( 3 ) diff --git a/game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres b/game/data/core/item_visuals/1_chest_of_the_infinite_wisdom.tres similarity index 100% rename from game/data/item_visuals/1_chest_of_the_infinite_wisdom.tres rename to game/data/core/item_visuals/1_chest_of_the_infinite_wisdom.tres diff --git a/game/data/item_visuals/test_base_v2.tres b/game/data/core/item_visuals/test_base_v2.tres similarity index 100% rename from game/data/item_visuals/test_base_v2.tres rename to game/data/core/item_visuals/test_base_v2.tres diff --git a/game/data/item_visuals/test_base_v3.tres b/game/data/core/item_visuals/test_base_v3.tres similarity index 55% rename from game/data/item_visuals/test_base_v3.tres rename to game/data/core/item_visuals/test_base_v3.tres index 85301407..5091e7a9 100644 --- a/game/data/item_visuals/test_base_v3.tres +++ b/game/data/core/item_visuals/test_base_v3.tres @@ -1,175 +1,175 @@ [gd_resource type="ItemVisual" load_steps=46 format=2] -[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_pelvis.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] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_red_scarf_v3.png" type="Texture" id=3] +[ext_resource path="res://data/species/Human/Female/character_models/huf_finger.dae" type="MeshDataResource" id=4] +[ext_resource path="res://data/species/Human/Female/character_models/huf_spine2.dae" type="MeshDataResource" id=5] +[ext_resource path="res://data/species/Human/Female/character_textures/head_v3.png" type="Texture" id=6] +[ext_resource path="res://data/species/Human/Female/character_models/huf_forearm.dae" type="MeshDataResource" id=7] +[ext_resource path="res://data/species/Human/Female/character_models/huf_fingers.dae" type="MeshDataResource" id=8] +[ext_resource path="res://data/species/Human/Female/character_models/huf_thigh_left.dae" type="MeshDataResource" id=9] +[ext_resource path="res://data/species/Human/Female/character_models/huf_hand.dae" type="MeshDataResource" id=10] +[ext_resource path="res://data/species/Human/Female/character_models/huf_thigh_right.dae" type="MeshDataResource" id=11] +[ext_resource path="res://data/species/Human/Female/character_models/huf_upperarm.dae" type="MeshDataResource" id=12] +[ext_resource path="res://data/species/Human/Female/character_models/huf_handl.dae" type="MeshDataResource" id=13] +[ext_resource path="res://data/species/Human/Female/character_models/huf_neck.dae" type="MeshDataResource" id=14] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_green_scarf_v3.png" type="Texture" id=15] +[ext_resource path="res://data/species/Human/Female/character_textures/armor_simple_v3.png" type="Texture" id=16] +[ext_resource path="res://data/species/Human/Female/character_models/huf_head.dae" type="MeshDataResource" id=17] +[ext_resource path="res://data/species/Human/Female/character_textures/skin_v3.png" type="Texture" id=18] +[ext_resource path="res://data/species/Human/Female/character_models/huf_foot.dae" type="MeshDataResource" id=19] +[ext_resource path="res://data/species/Human/Female/character_models/huf_spine1.dae" type="MeshDataResource" id=20] [sub_resource type="ItemVisualEntry" id=1] -mesh_male = ExtResource( 11 ) -mesh_female = ExtResource( 11 ) -texture_male = ExtResource( 8 ) -texture_female = ExtResource( 8 ) +mesh_male = ExtResource( 17 ) +mesh_female = ExtResource( 17 ) +texture_male = ExtResource( 6 ) +texture_female = ExtResource( 6 ) [sub_resource type="ItemVisualEntry" id=2] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=3] -mesh_male = ExtResource( 10 ) -mesh_female = ExtResource( 10 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) +mesh_male = ExtResource( 8 ) +mesh_female = ExtResource( 8 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) [sub_resource type="ItemVisualEntry" id=4] -mesh_male = ExtResource( 10 ) -mesh_female = ExtResource( 10 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) +mesh_male = ExtResource( 8 ) +mesh_female = ExtResource( 8 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) [sub_resource type="ItemVisualEntry" id=5] -mesh_male = ExtResource( 9 ) -mesh_female = ExtResource( 9 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +mesh_male = ExtResource( 19 ) +mesh_female = ExtResource( 19 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=6] -mesh_male = ExtResource( 5 ) -mesh_female = ExtResource( 5 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +mesh_male = ExtResource( 7 ) +mesh_female = ExtResource( 7 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=7] -mesh_male = ExtResource( 17 ) -mesh_female = ExtResource( 17 ) -texture_male = ExtResource( 21 ) -texture_female = ExtResource( 21 ) +mesh_male = ExtResource( 13 ) +mesh_female = ExtResource( 13 ) +texture_male = ExtResource( 15 ) +texture_female = ExtResource( 15 ) [sub_resource type="ItemVisualEntry" id=8] -mesh_male = ExtResource( 3 ) -mesh_female = ExtResource( 3 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +mesh_male = ExtResource( 9 ) +mesh_female = ExtResource( 9 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=9] -mesh_male = ExtResource( 13 ) -mesh_female = ExtResource( 13 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=10] -mesh_male = ExtResource( 13 ) -mesh_female = ExtResource( 13 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=11] -mesh_male = ExtResource( 16 ) -mesh_female = ExtResource( 16 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=12] -mesh_male = ExtResource( 1 ) -mesh_female = ExtResource( 1 ) -texture_male = ExtResource( 21 ) -texture_female = ExtResource( 21 ) - -[sub_resource type="ItemVisualEntry" id=13] mesh_male = ExtResource( 4 ) mesh_female = ExtResource( 4 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=10] +mesh_male = ExtResource( 4 ) +mesh_female = ExtResource( 4 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=11] +mesh_male = ExtResource( 12 ) +mesh_female = ExtResource( 12 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=12] +mesh_male = ExtResource( 14 ) +mesh_female = ExtResource( 14 ) +texture_male = ExtResource( 15 ) +texture_female = ExtResource( 15 ) + +[sub_resource type="ItemVisualEntry" id=13] +mesh_male = ExtResource( 1 ) +mesh_female = ExtResource( 1 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=14] mesh_male = ExtResource( 2 ) mesh_female = ExtResource( 2 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=15] -mesh_male = ExtResource( 10 ) -mesh_female = ExtResource( 10 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) +mesh_male = ExtResource( 8 ) +mesh_female = ExtResource( 8 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) [sub_resource type="ItemVisualEntry" id=16] -mesh_male = ExtResource( 10 ) -mesh_female = ExtResource( 10 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) +mesh_male = ExtResource( 8 ) +mesh_female = ExtResource( 8 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) [sub_resource type="ItemVisualEntry" id=17] -mesh_male = ExtResource( 9 ) -mesh_female = ExtResource( 9 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) +mesh_male = ExtResource( 19 ) +mesh_female = ExtResource( 19 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) [sub_resource type="ItemVisualEntry" id=18] -mesh_male = ExtResource( 5 ) -mesh_female = ExtResource( 5 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) - -[sub_resource type="ItemVisualEntry" id=19] -mesh_male = ExtResource( 18 ) -mesh_female = ExtResource( 18 ) -texture_male = ExtResource( 21 ) -texture_female = ExtResource( 21 ) - -[sub_resource type="ItemVisualEntry" id=20] -mesh_male = ExtResource( 15 ) -mesh_female = ExtResource( 15 ) -texture_male = ExtResource( 6 ) -texture_female = ExtResource( 6 ) - -[sub_resource type="ItemVisualEntry" id=21] -mesh_male = ExtResource( 13 ) -mesh_female = ExtResource( 13 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=22] -mesh_male = ExtResource( 13 ) -mesh_female = ExtResource( 13 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=23] -mesh_male = ExtResource( 16 ) -mesh_female = ExtResource( 16 ) -texture_male = ExtResource( 12 ) -texture_female = ExtResource( 12 ) - -[sub_resource type="ItemVisualEntry" id=24] -mesh_male = ExtResource( 14 ) -mesh_female = ExtResource( 14 ) -texture_male = ExtResource( 22 ) -texture_female = ExtResource( 22 ) - -[sub_resource type="ItemVisualEntry" id=25] mesh_male = ExtResource( 7 ) mesh_female = ExtResource( 7 ) -texture_male = ExtResource( 22 ) -texture_female = ExtResource( 22 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) + +[sub_resource type="ItemVisualEntry" id=19] +mesh_male = ExtResource( 10 ) +mesh_female = ExtResource( 10 ) +texture_male = ExtResource( 15 ) +texture_female = ExtResource( 15 ) + +[sub_resource type="ItemVisualEntry" id=20] +mesh_male = ExtResource( 11 ) +mesh_female = ExtResource( 11 ) +texture_male = ExtResource( 16 ) +texture_female = ExtResource( 16 ) + +[sub_resource type="ItemVisualEntry" id=21] +mesh_male = ExtResource( 4 ) +mesh_female = ExtResource( 4 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=22] +mesh_male = ExtResource( 4 ) +mesh_female = ExtResource( 4 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=23] +mesh_male = ExtResource( 12 ) +mesh_female = ExtResource( 12 ) +texture_male = ExtResource( 18 ) +texture_female = ExtResource( 18 ) + +[sub_resource type="ItemVisualEntry" id=24] +mesh_male = ExtResource( 20 ) +mesh_female = ExtResource( 20 ) +texture_male = ExtResource( 3 ) +texture_female = ExtResource( 3 ) + +[sub_resource type="ItemVisualEntry" id=25] +mesh_male = ExtResource( 5 ) +mesh_female = ExtResource( 5 ) +texture_male = ExtResource( 3 ) +texture_female = ExtResource( 3 ) [resource] layer = 1 diff --git a/game/data/item_visuals/test_vis1.tres b/game/data/core/item_visuals/test_vis1.tres similarity index 100% rename from game/data/item_visuals/test_vis1.tres rename to game/data/core/item_visuals/test_vis1.tres diff --git a/game/data/core/resource_db.tres b/game/data/core/resource_db.tres new file mode 100644 index 00000000..392cdde0 --- /dev/null +++ b/game/data/core/resource_db.tres @@ -0,0 +1,15 @@ +[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2] + +[ext_resource path="res://data/core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://data/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] +[ext_resource path="res://data/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=3] +[ext_resource path="res://data/core/entity_skills/1_test.tres" type="EntitySkillData" id=4] +[ext_resource path="res://data/core/item_templates/1_gold.tres" type="ItemTemplate" id=5] +[ext_resource path="res://data/core/crafting/1_test_craft.tres" type="CraftRecipe" id=6] +[ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=7] + +[resource] +entity_resources = [ ExtResource( 7 ) ] +entity_skills = [ ExtResource( 4 ) ] +craft_recipes = [ ExtResource( 6 ), ExtResource( 3 ) ] +item_templates = [ ExtResource( 5 ), ExtResource( 1 ), ExtResource( 2 ) ] diff --git a/game/data/entity_classes/naturalist/1_naturalist.tres b/game/data/entity_classes/naturalist/1_naturalist.tres index bf5f2512..4e9cd625 100644 --- a/game/data/entity_classes/naturalist/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/1_naturalist.tres @@ -7,7 +7,7 @@ [ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5] [ext_resource path="res://data/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=6] [ext_resource path="res://data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7] -[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=8] +[ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=8] [ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=9] [ext_resource path="res://data/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=10] [ext_resource path="res://data/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=11] @@ -26,6 +26,7 @@ [ext_resource path="res://data/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=24] + [sub_resource type="EntityAI" id=1] script = ExtResource( 9 ) diff --git a/game/data/entity_classes/naturalist/entities/1_naturalist.tres b/game/data/entity_classes/naturalist/entities/1_naturalist.tres index 29da62fa..77cc3ea0 100644 --- a/game/data/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/entities/1_naturalist.tres @@ -1,10 +1,12 @@ [gd_resource type="EntityData" load_steps=6 format=2] -[ext_resource path="res://data/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1] +[ext_resource path="res://data/core/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/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] +[ext_resource path="res://data/core/crafting/1_test_craft.tres" type="CraftRecipe" id=5] + + [resource] resource_name = "Naturalist" diff --git a/game/data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres index aef27267..5e3205aa 100644 --- a/game/data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres @@ -1,11 +1,12 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=1] +[ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=1] [ext_resource path="res://data/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=2] [ext_resource path="res://data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4] [ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5] + [sub_resource type="EntityResourceCostData" id=1] entity_resource_data = ExtResource( 1 ) cost = 100 diff --git a/game/data/entity_classes/naturalist/spells/36_regrow.tres b/game/data/entity_classes/naturalist/spells/36_regrow.tres index 82fcacbc..dd1d4300 100644 --- a/game/data/entity_classes/naturalist/spells/36_regrow.tres +++ b/game/data/entity_classes/naturalist/spells/36_regrow.tres @@ -1,9 +1,10 @@ [gd_resource type="Spell" load_steps=5 format=2] -[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=1] +[ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] [ext_resource path="res://data/entity_classes/naturalist/icons/root.tres" type="Texture" id=3] + [sub_resource type="EntityResourceCostData" id=1] entity_resource_data = ExtResource( 1 ) cost = 100 diff --git a/game/data/resource_db.tres b/game/data/resource_db.tres index bbc1ac6e..019a84cc 100644 --- a/game/data/resource_db.tres +++ b/game/data/resource_db.tres @@ -2,4 +2,3 @@ [resource] xp_data_path = "res://data/xp/xp_data.tres" -folders = PoolStringArray( "res://data/entity_skills", "res://data/crafting", "res://data/item_templates", "res://data/species", "res://data/mob_data", "res://data/world_spells", "res://data/entity_resources" ) diff --git a/game/data/species/Human/models/armature_model_orig_v2.tscn b/game/data/species/Human/models/armature_model_orig_v2.tscn index 0e42b82f..311aa56d 100644 --- a/game/data/species/Human/models/armature_model_orig_v2.tscn +++ b/game/data/species/Human/models/armature_model_orig_v2.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=38 format=2] -[ext_resource path="res://data/item_visuals/test_base_v3.tres" type="ItemVisual" id=1] +[ext_resource path="res://data/core/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] @@ -10,6 +10,7 @@ [ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8] + [sub_resource type="Skin" id=1] bind_count = 31 bind/0/name = ""