From 6842b7cd658de20803c6ad8a5e09fbd8409e4f2a Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 13:14:51 +0200 Subject: [PATCH] Organized/cleaned up the rest of the spells. --- game/data/auras/1_test1.tres | 11 ---------- .../{ => elementalist}/2_elementalist.tres | 14 +++++++----- .../character_specs/2_elementalist_fire.tres | 0 .../character_specs/3_elementalist_water.tres | 0 .../character_specs/4_elementalist_ice.tres | 0 .../elementalist}/spells/31_overload.tres | 0 .../elementalist}/spells/32_heat.tres | 0 .../elementalist}/spells/33_normal.tres | 0 .../elementalist}/spells/34_cold.tres | 0 .../naturalist/1_naturalist.tres | 9 ++++---- .../naturalist/entities/1_naturalist.tres | 2 -- .../naturalist/entities/2_naturalist_mob.tres | 2 -- .../naturalist/resource_db.tres | 6 +++-- .../naturalist}/spells/35_strike.tres | 22 +++++++++---------- .../naturalist}/spells/36_regrow.tres | 12 +++++----- .../1_chest_of_the_infinite_wisdom.tres | 1 - game/data/resource_db.tres | 2 +- game/data/spells/1_test_spell.tres | 19 ---------------- game/data/spells/2_test_cast_spell.tres | 15 ------------- 19 files changed, 34 insertions(+), 81 deletions(-) delete mode 100644 game/data/auras/1_test1.tres rename game/data/entity_classes/{ => elementalist}/2_elementalist.tres (86%) rename game/data/{ => entity_classes/elementalist}/character_specs/2_elementalist_fire.tres (100%) rename game/data/{ => entity_classes/elementalist}/character_specs/3_elementalist_water.tres (100%) rename game/data/{ => entity_classes/elementalist}/character_specs/4_elementalist_ice.tres (100%) rename game/data/{ => entity_classes/elementalist}/spells/31_overload.tres (100%) rename game/data/{ => entity_classes/elementalist}/spells/32_heat.tres (100%) rename game/data/{ => entity_classes/elementalist}/spells/33_normal.tres (100%) rename game/data/{ => entity_classes/elementalist}/spells/34_cold.tres (100%) rename game/data/{ => entity_classes/naturalist}/spells/35_strike.tres (74%) rename game/data/{ => entity_classes/naturalist}/spells/36_regrow.tres (79%) delete mode 100644 game/data/spells/1_test_spell.tres delete mode 100644 game/data/spells/2_test_cast_spell.tres diff --git a/game/data/auras/1_test1.tres b/game/data/auras/1_test1.tres deleted file mode 100644 index 4dc573a9..00000000 --- a/game/data/auras/1_test1.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="Aura" load_steps=3 format=2] - -[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] -[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] - -[resource] -id = 1 -icon = ExtResource( 2 ) -aura_type = 1 -text_description = "Test" -script = ExtResource( 1 ) diff --git a/game/data/entity_classes/2_elementalist.tres b/game/data/entity_classes/elementalist/2_elementalist.tres similarity index 86% rename from game/data/entity_classes/2_elementalist.tres rename to game/data/entity_classes/elementalist/2_elementalist.tres index a9dff542..32d8887a 100644 --- a/game/data/entity_classes/2_elementalist.tres +++ b/game/data/entity_classes/elementalist/2_elementalist.tres @@ -1,12 +1,14 @@ [gd_resource type="EntityClassData" load_steps=51 format=2] [ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=1] -[ext_resource path="res://data/character_specs/2_elementalist_fire.tres" type="CharacterSpec" id=2] -[ext_resource path="res://data/character_specs/3_elementalist_water.tres" type="CharacterSpec" id=3] -[ext_resource path="res://data/character_specs/4_elementalist_ice.tres" type="CharacterSpec" id=4] -[ext_resource path="res://data/spells/34_cold.tres" type="Spell" id=5] -[ext_resource path="res://data/spells/32_heat.tres" type="Spell" id=6] -[ext_resource path="res://data/spells/33_normal.tres" type="Spell" id=7] +[ext_resource path="res://data/entity_classes/elementalist/character_specs/2_elementalist_fire.tres" type="CharacterSpec" id=2] +[ext_resource path="res://data/entity_classes/elementalist/character_specs/3_elementalist_water.tres" type="CharacterSpec" id=3] +[ext_resource path="res://data/entity_classes/elementalist/character_specs/4_elementalist_ice.tres" type="CharacterSpec" id=4] +[ext_resource path="res://data/entity_classes/elementalist/spells/34_cold.tres" type="Spell" id=5] +[ext_resource path="res://data/entity_classes/elementalist/spells/32_heat.tres" type="Spell" id=6] +[ext_resource path="res://data/entity_classes/elementalist/spells/33_normal.tres" type="Spell" id=7] + + [sub_resource type="SimpleLevelStatData" id=1] agility = 4 diff --git a/game/data/character_specs/2_elementalist_fire.tres b/game/data/entity_classes/elementalist/character_specs/2_elementalist_fire.tres similarity index 100% rename from game/data/character_specs/2_elementalist_fire.tres rename to game/data/entity_classes/elementalist/character_specs/2_elementalist_fire.tres diff --git a/game/data/character_specs/3_elementalist_water.tres b/game/data/entity_classes/elementalist/character_specs/3_elementalist_water.tres similarity index 100% rename from game/data/character_specs/3_elementalist_water.tres rename to game/data/entity_classes/elementalist/character_specs/3_elementalist_water.tres diff --git a/game/data/character_specs/4_elementalist_ice.tres b/game/data/entity_classes/elementalist/character_specs/4_elementalist_ice.tres similarity index 100% rename from game/data/character_specs/4_elementalist_ice.tres rename to game/data/entity_classes/elementalist/character_specs/4_elementalist_ice.tres diff --git a/game/data/spells/31_overload.tres b/game/data/entity_classes/elementalist/spells/31_overload.tres similarity index 100% rename from game/data/spells/31_overload.tres rename to game/data/entity_classes/elementalist/spells/31_overload.tres diff --git a/game/data/spells/32_heat.tres b/game/data/entity_classes/elementalist/spells/32_heat.tres similarity index 100% rename from game/data/spells/32_heat.tres rename to game/data/entity_classes/elementalist/spells/32_heat.tres diff --git a/game/data/spells/33_normal.tres b/game/data/entity_classes/elementalist/spells/33_normal.tres similarity index 100% rename from game/data/spells/33_normal.tres rename to game/data/entity_classes/elementalist/spells/33_normal.tres diff --git a/game/data/spells/34_cold.tres b/game/data/entity_classes/elementalist/spells/34_cold.tres similarity index 100% rename from game/data/spells/34_cold.tres rename to game/data/entity_classes/elementalist/spells/34_cold.tres diff --git a/game/data/entity_classes/naturalist/1_naturalist.tres b/game/data/entity_classes/naturalist/1_naturalist.tres index 650a71cd..bf5f2512 100644 --- a/game/data/entity_classes/naturalist/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/1_naturalist.tres @@ -1,4 +1,4 @@ -[gd_resource type="EntityClassData" load_steps=73 format=2] +[gd_resource type="EntityClassData" load_steps=72 format=2] [ext_resource path="res://data/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] [ext_resource path="res://data/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2] @@ -13,18 +13,18 @@ [ext_resource path="res://data/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=11] [ext_resource path="res://data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=12] [ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13] -[ext_resource path="res://data/spells/36_regrow.tres" type="Spell" id=14] +[ext_resource path="res://data/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=14] [ext_resource path="res://data/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=15] [ext_resource path="res://data/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=16] [ext_resource path="res://data/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=17] [ext_resource path="res://data/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=18] [ext_resource path="res://data/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=19] [ext_resource path="res://data/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=20] -[ext_resource path="res://data/spells/35_strike.tres" type="Spell" id=21] +[ext_resource path="res://data/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=21] [ext_resource path="res://data/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=22] [ext_resource path="res://data/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=23] [ext_resource path="res://data/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=24] -[ext_resource path="res://data/auras/1_test1.tres" type="Aura" id=25] + [sub_resource type="EntityAI" id=1] script = ExtResource( 9 ) @@ -231,6 +231,5 @@ entity_resources = [ ExtResource( 8 ) ] specs = [ SubResource( 4 ) ] spells = [ ExtResource( 7 ), ExtResource( 3 ), ExtResource( 15 ), ExtResource( 5 ), ExtResource( 12 ), ExtResource( 23 ), ExtResource( 1 ), ExtResource( 10 ), ExtResource( 24 ), ExtResource( 2 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 20 ), ExtResource( 11 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 21 ), ExtResource( 14 ) ] start_spells = [ ExtResource( 7 ), ExtResource( 21 ), ExtResource( 14 ) ] -auras = [ ExtResource( 25 ) ] ais = [ SubResource( 1 ) ] script = ExtResource( 13 ) diff --git a/game/data/entity_classes/naturalist/entities/1_naturalist.tres b/game/data/entity_classes/naturalist/entities/1_naturalist.tres index b1bc84b2..29da62fa 100644 --- a/game/data/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/entities/1_naturalist.tres @@ -6,8 +6,6 @@ [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 c5b32c3b..851904d3 100644 --- a/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -4,8 +4,6 @@ [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/entity_classes/naturalist/resource_db.tres b/game/data/entity_classes/naturalist/resource_db.tres index 9e674754..0dc2f211 100644 --- a/game/data/entity_classes/naturalist/resource_db.tres +++ b/game/data/entity_classes/naturalist/resource_db.tres @@ -1,4 +1,4 @@ -[gd_resource type="ESSResourceDBStatic" load_steps=37 format=2] +[gd_resource type="ESSResourceDBStatic" load_steps=39 format=2] [ext_resource path="res://data/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] [ext_resource path="res://data/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=2] @@ -36,8 +36,10 @@ [ext_resource path="res://data/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=34] [ext_resource path="res://data/entity_classes/naturalist/entities/1_naturalist.tres" type="EntityData" id=35] [ext_resource path="res://data/entity_classes/naturalist/entities/2_naturalist_mob.tres" type="EntityData" id=36] +[ext_resource path="res://data/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=37] +[ext_resource path="res://data/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=38] [resource] entity_datas = [ ExtResource( 36 ), ExtResource( 35 ) ] -spells = [ ExtResource( 11 ), ExtResource( 5 ), ExtResource( 25 ), ExtResource( 9 ), ExtResource( 23 ), ExtResource( 33 ), ExtResource( 1 ), ExtResource( 13 ), ExtResource( 34 ), ExtResource( 4 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 27 ), ExtResource( 31 ), ExtResource( 14 ), ExtResource( 32 ), ExtResource( 26 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 22 ) ] +spells = [ ExtResource( 11 ), ExtResource( 5 ), ExtResource( 25 ), ExtResource( 9 ), ExtResource( 23 ), ExtResource( 33 ), ExtResource( 1 ), ExtResource( 13 ), ExtResource( 34 ), ExtResource( 4 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 27 ), ExtResource( 31 ), ExtResource( 14 ), ExtResource( 32 ), ExtResource( 26 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 22 ), ExtResource( 37 ), ExtResource( 38 ) ] auras = [ ExtResource( 12 ), ExtResource( 8 ), ExtResource( 29 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 7 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 21 ), ExtResource( 24 ) ] diff --git a/game/data/spells/35_strike.tres b/game/data/entity_classes/naturalist/spells/35_strike.tres similarity index 74% rename from game/data/spells/35_strike.tres rename to game/data/entity_classes/naturalist/spells/35_strike.tres index bdb7f43a..4f59af2f 100644 --- a/game/data/spells/35_strike.tres +++ b/game/data/entity_classes/naturalist/spells/35_strike.tres @@ -1,18 +1,18 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1] -[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] -[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=3] -[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] +[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=2] +[ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] +[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=4] +[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=5] [sub_resource type="SpellEffectVisual" id=1] -script = ExtResource( 3 ) -spell_cast_effect_left_hand = ExtResource( 5 ) -spell_cast_effect_right_hand = ExtResource( 5 ) +script = ExtResource( 1 ) +spell_cast_effect_left_hand = ExtResource( 3 ) +spell_cast_effect_right_hand = ExtResource( 3 ) torso_aura_effect_time = 0.0 root_aura_effect_time = 0.0 -torso_spell_cast_finish_effect = ExtResource( 4 ) +torso_spell_cast_finish_effect = ExtResource( 2 ) torso_spell_cast_finish_effect_time = 0.4 root_spell_cast_finish_effect_time = 1.0 @@ -21,7 +21,7 @@ resource_name = "Strike" id = 35 spell_type = 1 rank = 1 -icon = ExtResource( 2 ) +icon = ExtResource( 5 ) needs_target = true visual_spell_effects = SubResource( 1 ) text_name = "Strike" @@ -39,4 +39,4 @@ damage_scale_stat = 41 damage_scale_coeff = 1.0 aoe_targetType = -1910718371 aoe_colliderType = 1065353216 -script = ExtResource( 1 ) +script = ExtResource( 4 ) diff --git a/game/data/spells/36_regrow.tres b/game/data/entity_classes/naturalist/spells/36_regrow.tres similarity index 79% rename from game/data/spells/36_regrow.tres rename to game/data/entity_classes/naturalist/spells/36_regrow.tres index be48f287..82fcacbc 100644 --- a/game/data/spells/36_regrow.tres +++ b/game/data/entity_classes/naturalist/spells/36_regrow.tres @@ -1,11 +1,11 @@ [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://data/entity_classes/naturalist/icons/root.tres" type="Texture" id=2] -[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=3] +[ext_resource path="res://data/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( 3 ) +entity_resource_data = ExtResource( 1 ) cost = 100 [resource] @@ -14,7 +14,7 @@ id = 36 spell_type = 8 target_relation_type = 5 rank = 1 -icon = ExtResource( 2 ) +icon = ExtResource( 3 ) text_name = "Regrow" text_description = "Heals you for %%heal_min to %%heal_max ." range_enabled = true @@ -27,4 +27,4 @@ heal_max = 18 heal_scale_stat = 14 heal_scale_coeff = 0.1 resource_cost = SubResource( 1 ) -script = ExtResource( 1 ) +script = ExtResource( 2 ) 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 21e43bef..f0fd46ff 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 @@ -2,7 +2,6 @@ [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 ) texture_female = ExtResource( 1 ) diff --git a/game/data/resource_db.tres b/game/data/resource_db.tres index fa2d2ee3..bbc1ac6e 100644 --- a/game/data/resource_db.tres +++ b/game/data/resource_db.tres @@ -2,4 +2,4 @@ [resource] xp_data_path = "res://data/xp/xp_data.tres" -folders = PoolStringArray( "res://data/entity_skills", "res://data/spells", "res://data/auras", "res://data/crafting", "res://data/item_templates", "res://data/species", "res://data/mob_data", "res://data/world_spells", "res://data/entity_resources" ) +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/spells/1_test_spell.tres b/game/data/spells/1_test_spell.tres deleted file mode 100644 index de6aa111..00000000 --- a/game/data/spells/1_test_spell.tres +++ /dev/null @@ -1,19 +0,0 @@ -[gd_resource type="Spell" load_steps=3 format=2] - -[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] -[ext_resource path="res://data/entity_classes/naturalist/icons/test.tres" type="Texture" id=2] - - -[resource] -resource_name = "adadadadadad" -spell_type = 16 -target_relation_type = -138672214 -rank = 1 -icon = ExtResource( 2 ) -needs_target = true -text_name = "adadadadadad" -damage_min = 200 -damage_max = 300 -aoe_targetType = 1431112251 -aoe_colliderType = 827465778 -script = ExtResource( 1 ) diff --git a/game/data/spells/2_test_cast_spell.tres b/game/data/spells/2_test_cast_spell.tres deleted file mode 100644 index 5d77894a..00000000 --- a/game/data/spells/2_test_cast_spell.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="Spell" load_steps=3 format=2] - -[ext_resource path="res://data/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=1] -[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] - - -[resource] -id = 2 -spell_type = 16 -target_type = -2147461888 -target_relation_type = 4 -rank = 1 -icon = ExtResource( 1 ) -aoe_targetType = -2147459840 -script = ExtResource( 2 )