diff --git a/game/modules/core/crafting/1_test_craft.tres b/game/core/crafting/1_test_craft.tres similarity index 79% rename from game/modules/core/crafting/1_test_craft.tres rename to game/core/crafting/1_test_craft.tres index 3b5e4836..e4d01c04 100644 --- a/game/modules/core/crafting/1_test_craft.tres +++ b/game/core/crafting/1_test_craft.tres @@ -1,7 +1,7 @@ [gd_resource type="CraftRecipe" load_steps=8 format=2] -[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1] -[ext_resource path="res://modules/core/item_templates/1_gold.tres" type="ItemTemplate" id=2] +[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://core/item_templates/1_gold.tres" type="ItemTemplate" id=2] [sub_resource type="CraftRecipeHelper" id=1] item = ExtResource( 2 ) diff --git a/game/modules/core/crafting/2_chest_of_the_infinite_wisdom.tres b/game/core/crafting/2_chest_of_the_infinite_wisdom.tres similarity index 67% rename from game/modules/core/crafting/2_chest_of_the_infinite_wisdom.tres rename to game/core/crafting/2_chest_of_the_infinite_wisdom.tres index 84a6a101..cb105df6 100644 --- a/game/modules/core/crafting/2_chest_of_the_infinite_wisdom.tres +++ b/game/core/crafting/2_chest_of_the_infinite_wisdom.tres @@ -1,7 +1,7 @@ [gd_resource type="CraftRecipe" load_steps=5 format=2] -[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1] -[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] +[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] [sub_resource type="CraftRecipeHelper" id=1] item = ExtResource( 1 ) diff --git a/game/modules/core/entity_resources/1_mana_resource.tres b/game/core/entity_resources/1_mana_resource.tres similarity index 100% rename from game/modules/core/entity_resources/1_mana_resource.tres rename to game/core/entity_resources/1_mana_resource.tres diff --git a/game/modules/core/entity_skills/1_test.tres b/game/core/entity_skills/1_test.tres similarity index 100% rename from game/modules/core/entity_skills/1_test.tres rename to game/core/entity_skills/1_test.tres diff --git a/game/modules/core/game_module.tres b/game/core/game_module.tres similarity index 69% rename from game/modules/core/game_module.tres rename to game/core/game_module.tres index 855842ee..86c799e4 100644 --- a/game/modules/core/game_module.tres +++ b/game/core/game_module.tres @@ -1,7 +1,7 @@ [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://modules/core/resource_db.tres" type="ESSResourceDBStatic" id=2] +[ext_resource path="res://core/resource_db.tres" type="ESSResourceDBStatic" id=2] [resource] script = ExtResource( 1 ) diff --git a/game/modules/core/item_templates/1_gold.tres b/game/core/item_templates/1_gold.tres similarity index 100% rename from game/modules/core/item_templates/1_gold.tres rename to game/core/item_templates/1_gold.tres diff --git a/game/modules/core/item_templates/2_test.tres b/game/core/item_templates/2_test.tres similarity index 75% rename from game/modules/core/item_templates/2_test.tres rename to game/core/item_templates/2_test.tres index 5827f1c6..3c74ee24 100644 --- a/game/modules/core/item_templates/2_test.tres +++ b/game/core/item_templates/2_test.tres @@ -1,14 +1,14 @@ [gd_resource type="ItemTemplate" load_steps=4 format=2] -[ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=1] +[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1] [ext_resource path="res://icons/3_iron_bar.tres" type="Texture" id=2] -[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] +[ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=3] [resource] resource_name = "Iron Bar" id = 2 stack_size = 10 icon = ExtResource( 2 ) -use_spell = ExtResource( 1 ) +use_spell = ExtResource( 3 ) text_name = "Iron Bar" -script = ExtResource( 3 ) +script = ExtResource( 1 ) diff --git a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres b/game/core/item_templates/3_chest_of_the_infinite_wisdom.tres similarity index 71% rename from game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres rename to game/core/item_templates/3_chest_of_the_infinite_wisdom.tres index 9f77fd57..97549762 100644 --- a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres +++ b/game/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://modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres" type="ModelVisual" id=1] -[ext_resource path="res://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://core/model_visuals/1_chest_of_the_infinite_wisdom.tres" type="ModelVisual" id=1] +[ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=2] +[ext_resource path="res://icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=3] [ext_resource path="res://entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4] [resource] @@ -13,7 +13,7 @@ rarity = 6 armor_type = 1 equip_slot = 3 model_visual = ExtResource( 1 ) -icon = ExtResource( 2 ) +icon = ExtResource( 3 ) use_spell = ExtResource( 4 ) text_name = "Chest of the Infinite Wisdom" -script = ExtResource( 3 ) +script = ExtResource( 2 ) diff --git a/game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres b/game/core/model_visuals/1_chest_of_the_infinite_wisdom.tres similarity index 100% rename from game/modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres rename to game/core/model_visuals/1_chest_of_the_infinite_wisdom.tres diff --git a/game/modules/core/model_visuals/test_base_v2.tres b/game/core/model_visuals/test_base_v2.tres similarity index 100% rename from game/modules/core/model_visuals/test_base_v2.tres rename to game/core/model_visuals/test_base_v2.tres diff --git a/game/modules/core/model_visuals/test_base_v3.tres b/game/core/model_visuals/test_base_v3.tres similarity index 54% rename from game/modules/core/model_visuals/test_base_v3.tres rename to game/core/model_visuals/test_base_v3.tres index 9ef4454b..1bdba296 100644 --- a/game/modules/core/model_visuals/test_base_v3.tres +++ b/game/core/model_visuals/test_base_v3.tres @@ -1,33 +1,33 @@ [gd_resource type="ModelVisual" load_steps=28 format=2] -[ext_resource path="res://models/entities/human/female/left_upper_arm.tres" type="ModelVisualEntry" id=1] -[ext_resource path="res://models/entities/human/female/right_fingers_end.tres" type="ModelVisualEntry" id=2] -[ext_resource path="res://models/entities/human/female/head.tres" type="ModelVisualEntry" id=3] -[ext_resource path="res://models/entities/human/female/left_foot.tres" type="ModelVisualEntry" id=4] -[ext_resource path="res://models/entities/human/female/neck.tres" type="ModelVisualEntry" id=5] -[ext_resource path="res://models/entities/human/female/pelvis.tres" type="ModelVisualEntry" id=6] -[ext_resource path="res://models/entities/human/female/right_forearm.tres" type="ModelVisualEntry" id=7] -[ext_resource path="res://models/entities/human/female/right_thigh.tres" type="ModelVisualEntry" id=8] -[ext_resource path="res://models/entities/human/female/left_calf.tres" type="ModelVisualEntry" id=9] -[ext_resource path="res://models/entities/human/female/right_calf.tres" type="ModelVisualEntry" id=10] -[ext_resource path="res://models/entities/human/female/right_foot.tres" type="ModelVisualEntry" id=11] -[ext_resource path="res://models/entities/human/female/spine_2.tres" type="ModelVisualEntry" id=12] -[ext_resource path="res://models/entities/human/female/left_thunm_base.tres" type="ModelVisualEntry" id=13] -[ext_resource path="res://models/entities/human/female/spine_1.tres" type="ModelVisualEntry" id=14] -[ext_resource path="res://models/entities/human/female/right_upper_arm.tres" type="ModelVisualEntry" id=15] -[ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestShield.tres" type="ModelVisualEntry" id=16] -[ext_resource path="res://models/entities/human/female/left_forearm.tres" type="ModelVisualEntry" id=17] -[ext_resource path="res://models/entities/human/female/left_thigh.tres" type="ModelVisualEntry" id=18] -[ext_resource path="res://models/entities/human/female/left_hand.tres" type="ModelVisualEntry" id=19] -[ext_resource path="res://models/entities/human/female/left_thumb_end.tres" type="ModelVisualEntry" id=20] +[ext_resource path="res://models/entities/human/female/left_calf.tres" type="ModelVisualEntry" id=1] +[ext_resource path="res://models/entities/human/female/pelvis.tres" type="ModelVisualEntry" id=2] +[ext_resource path="res://models/entities/human/female/spine_1.tres" type="ModelVisualEntry" id=3] +[ext_resource path="res://models/entities/human/female/left_thunm_base.tres" type="ModelVisualEntry" id=4] +[ext_resource path="res://models/entities/human/female/left_upper_arm.tres" type="ModelVisualEntry" id=5] +[ext_resource path="res://models/entities/human/female/neck.tres" type="ModelVisualEntry" id=6] +[ext_resource path="res://models/entities/human/female/head.tres" type="ModelVisualEntry" id=7] +[ext_resource path="res://models/entities/human/female/right_foot.tres" type="ModelVisualEntry" id=8] +[ext_resource path="res://models/entities/human/female/right_forearm.tres" type="ModelVisualEntry" id=9] +[ext_resource path="res://models/entities/human/female/left_thumb_end.tres" type="ModelVisualEntry" id=10] +[ext_resource path="res://models/entities/human/female/right_calf.tres" type="ModelVisualEntry" id=11] +[ext_resource path="res://models/entities/human/female/left_thigh.tres" type="ModelVisualEntry" id=12] +[ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestShield.tres" type="ModelVisualEntry" id=13] +[ext_resource path="res://models/entities/human/female/left_foot.tres" type="ModelVisualEntry" id=14] +[ext_resource path="res://models/entities/human/female/right_thigh.tres" type="ModelVisualEntry" id=15] +[ext_resource path="res://models/entities/human/female/right_fingers_end.tres" type="ModelVisualEntry" id=16] +[ext_resource path="res://models/entities/human/female/right_upper_arm.tres" type="ModelVisualEntry" id=17] +[ext_resource path="res://models/entities/human/female/spine_2.tres" type="ModelVisualEntry" id=18] +[ext_resource path="res://models/entities/human/female/left_fingers_end.tres" type="ModelVisualEntry" id=19] +[ext_resource path="res://models/entities/human/female/left_hand.tres" type="ModelVisualEntry" id=20] [ext_resource path="res://models/entities/human/female/right_hand.tres" type="ModelVisualEntry" id=21] [ext_resource path="res://models/entities/human/female/left_fingers_base.tres" type="ModelVisualEntry" id=22] -[ext_resource path="res://models/entities/human/female/right_fingers_base.tres" type="ModelVisualEntry" id=23] -[ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestOnehander.tres" type="ModelVisualEntry" id=24] -[ext_resource path="res://models/entities/human/female/left_fingers_end.tres" type="ModelVisualEntry" id=25] -[ext_resource path="res://models/entities/human/female/right_thumb_end.tres" type="ModelVisualEntry" id=26] -[ext_resource path="res://models/entities/human/female/right_thumb_base.tres" type="ModelVisualEntry" id=27] +[ext_resource path="res://models/weapons/cethiels_weapons_3d/model_visuals/TestOnehander.tres" type="ModelVisualEntry" id=23] +[ext_resource path="res://models/entities/human/female/right_fingers_base.tres" type="ModelVisualEntry" id=24] +[ext_resource path="res://models/entities/human/female/right_thumb_end.tres" type="ModelVisualEntry" id=25] +[ext_resource path="res://models/entities/human/female/right_thumb_base.tres" type="ModelVisualEntry" id=26] +[ext_resource path="res://models/entities/human/female/left_forearm.tres" type="ModelVisualEntry" id=27] [resource] layer = 1 -get_visual_entries = [ ExtResource( 6 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 5 ), ExtResource( 3 ), ExtResource( 1 ), ExtResource( 17 ), ExtResource( 19 ), ExtResource( 13 ), ExtResource( 20 ), ExtResource( 22 ), ExtResource( 25 ), ExtResource( 15 ), ExtResource( 7 ), ExtResource( 21 ), ExtResource( 27 ), ExtResource( 26 ), ExtResource( 23 ), ExtResource( 2 ), ExtResource( 18 ), ExtResource( 9 ), ExtResource( 4 ), ExtResource( 8 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 16 ), ExtResource( 24 ) ] +get_visual_entries = [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 18 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 5 ), ExtResource( 27 ), ExtResource( 20 ), ExtResource( 4 ), ExtResource( 10 ), ExtResource( 22 ), ExtResource( 19 ), ExtResource( 17 ), ExtResource( 9 ), ExtResource( 21 ), ExtResource( 26 ), ExtResource( 25 ), ExtResource( 24 ), ExtResource( 16 ), ExtResource( 12 ), ExtResource( 1 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 11 ), ExtResource( 8 ), ExtResource( 13 ), ExtResource( 23 ) ] diff --git a/game/modules/core/model_visuals/test_vis1.tres b/game/core/model_visuals/test_vis1.tres similarity index 100% rename from game/modules/core/model_visuals/test_vis1.tres rename to game/core/model_visuals/test_vis1.tres diff --git a/game/core/resource_db.tres b/game/core/resource_db.tres new file mode 100644 index 00000000..00d75d35 --- /dev/null +++ b/game/core/resource_db.tres @@ -0,0 +1,15 @@ +[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2] + +[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=1] +[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] +[ext_resource path="res://core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=3] +[ext_resource path="res://core/entity_skills/1_test.tres" type="EntitySkillData" id=4] +[ext_resource path="res://core/item_templates/1_gold.tres" type="ItemTemplate" id=5] +[ext_resource path="res://core/crafting/1_test_craft.tres" type="CraftRecipe" id=6] +[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" 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/entity_classes/naturalist/1_naturalist.tres b/game/entity_classes/naturalist/1_naturalist.tres index 6e87dada..d7069ee0 100644 --- a/game/entity_classes/naturalist/1_naturalist.tres +++ b/game/entity_classes/naturalist/1_naturalist.tres @@ -9,7 +9,7 @@ [ext_resource path="res://entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=7] [ext_resource path="res://entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=8] [ext_resource path="res://entity_classes/naturalist/specs/aspects.tres" type="CharacterSpec" id=9] -[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=10] +[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=10] [ext_resource path="res://entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=11] [ext_resource path="res://entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=12] [ext_resource path="res://entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=13] diff --git a/game/entity_classes/naturalist/1_naturalist_vendor.tres b/game/entity_classes/naturalist/1_naturalist_vendor.tres index e6506b40..020dab38 100644 --- a/game/entity_classes/naturalist/1_naturalist_vendor.tres +++ b/game/entity_classes/naturalist/1_naturalist_vendor.tres @@ -1,7 +1,7 @@ [gd_resource type="EntityClassData" load_steps=8 format=2] -[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=1] -[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=2] +[ext_resource path="res://core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=1] +[ext_resource path="res://core/item_templates/2_test.tres" type="ItemTemplate" id=2] [ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=3] [ext_resource path="res://entity_classes/naturalist/stats/mob_statdata.tres" type="StatData" id=4] diff --git a/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres index bedc2690..2dd9ced4 100644 --- a/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres @@ -4,7 +4,7 @@ [ext_resource path="res://entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=2] [ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=3] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4] -[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=5] +[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=5] [sub_resource type="EntityResourceCostDataResource" id=1] cost = 34 diff --git a/game/entity_classes/naturalist/spells/36_regrow.tres b/game/entity_classes/naturalist/spells/36_regrow.tres index d0f28126..b2c9c0ab 100644 --- a/game/entity_classes/naturalist/spells/36_regrow.tres +++ b/game/entity_classes/naturalist/spells/36_regrow.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=5 format=2] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] -[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=2] +[ext_resource path="res://core/entity_resources/1_mana_resource.tres" type="EntityResource" id=2] [ext_resource path="res://entity_classes/naturalist/icons/root.tres" type="Texture" id=3] [sub_resource type="EntityResourceCostDataResource" id=1] diff --git a/game/models/entities/human/models/armature_huf.tscn b/game/models/entities/human/models/armature_huf.tscn index 9f5d76d1..1a2f3fe5 100644 --- a/game/models/entities/human/models/armature_huf.tscn +++ b/game/models/entities/human/models/armature_huf.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2] [ext_resource path="res://models/entities/human/models/cast-end.tres" type="Animation" id=3] [ext_resource path="res://models/entities/human/models/idle-loop.tres" type="Animation" id=4] -[ext_resource path="res://modules/core/model_visuals/test_base_v3.tres" type="ModelVisual" id=5] +[ext_resource path="res://core/model_visuals/test_base_v3.tres" type="ModelVisual" id=5] [ext_resource path="res://models/entities/human/models/armature.tscn" type="PackedScene" id=6] [ext_resource path="res://models/entities/human/models/rest.tres" type="Animation" id=7] [ext_resource path="res://models/entities/human/models/casting-loop.tres" type="Animation" id=8] diff --git a/game/modules/core/resource_db.tres b/game/modules/core/resource_db.tres deleted file mode 100644 index d17c5ed8..00000000 --- a/game/modules/core/resource_db.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2] - -[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1] -[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] -[ext_resource path="res://modules/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=3] -[ext_resource path="res://modules/core/entity_skills/1_test.tres" type="EntitySkillData" id=4] -[ext_resource path="res://modules/core/item_templates/1_gold.tres" type="ItemTemplate" id=5] -[ext_resource path="res://modules/core/crafting/1_test_craft.tres" type="CraftRecipe" id=6] -[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" 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 ) ]