From 0f4093fc440233fe8df586dafb0605efc6c7fca4 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 29 Apr 2020 18:14:46 +0200 Subject: [PATCH] Update ESS, so StatData is inside EntityData instead of EntityClassData. --- HEADS | 2 +- .../naturalist/1_naturalist.tres | 182 +---------------- .../naturalist/entities/1_naturalist.tres | 184 +++++++++++++++++- .../naturalist/entities/2_naturalist_mob.tres | 183 ++++++++++++++++- 4 files changed, 367 insertions(+), 184 deletions(-) diff --git a/HEADS b/HEADS index ba0abdd1..5cded21d 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "60609ff0ed357a38b58126791f7372c8aa3e446e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "19fd2ea109ddbc6ba0b55c2f63009185218b2afc"}, "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": "c8ea7798483bedfee333d5493de540509bd3e243", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "94d2ddf73b4d0adad1afc94615ac840531f72565"}, "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/modules/entity_classes/naturalist/1_naturalist.tres b/game/modules/entity_classes/naturalist/1_naturalist.tres index f29d4cc5..525091f0 100644 --- a/game/modules/entity_classes/naturalist/1_naturalist.tres +++ b/game/modules/entity_classes/naturalist/1_naturalist.tres @@ -1,4 +1,4 @@ -[gd_resource type="EntityClassData" load_steps=72 format=2] +[gd_resource type="EntityClassData" load_steps=29 format=2] [ext_resource path="res://modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] [ext_resource path="res://modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2] @@ -38,190 +38,10 @@ Talent_2_0 = ExtResource( 4 ) id = 1 talent_rows = [ SubResource( 2 ), SubResource( 3 ) ] -[sub_resource type="SimpleLevelStatData" id=5] -agility = 3 -strength = 4 -stamina = 5 -intellect = 6 -spirit = 4 - -[sub_resource type="StatDataEntry" id=6] -base = 12.0 - -[sub_resource type="StatDataEntry" id=7] -stat_id = 12 - -[sub_resource type="StatDataEntry" id=8] -stat_id = 13 - -[sub_resource type="StatDataEntry" id=9] -stat_id = 19 - -[sub_resource type="StatDataEntry" id=10] -stat_id = 34 - -[sub_resource type="StatDataEntry" id=11] -stat_id = 21 - -[sub_resource type="StatDataEntry" id=12] -stat_id = 24 - -[sub_resource type="StatDataEntry" id=13] -stat_id = 38 - -[sub_resource type="StatDataEntry" id=14] -stat_id = 36 - -[sub_resource type="StatDataEntry" id=15] -stat_id = 31 - -[sub_resource type="StatDataEntry" id=16] -stat_id = 32 - -[sub_resource type="StatDataEntry" id=17] -stat_id = 8 -base = 1.5 - -[sub_resource type="StatDataEntry" id=18] -stat_id = 9 - -[sub_resource type="StatDataEntry" id=19] -stat_id = 10 - -[sub_resource type="StatDataEntry" id=20] -stat_id = 25 - -[sub_resource type="StatDataEntry" id=21] -stat_id = 5 -base = 100.0 - -[sub_resource type="StatDataEntry" id=22] -stat_id = 28 - -[sub_resource type="StatDataEntry" id=23] -stat_id = 3 -base = 20.0 - -[sub_resource type="StatDataEntry" id=24] -stat_id = 33 - -[sub_resource type="StatDataEntry" id=25] -stat_id = 6 - -[sub_resource type="StatDataEntry" id=26] -stat_id = 15 - -[sub_resource type="StatDataEntry" id=27] -stat_id = 16 - -[sub_resource type="StatDataEntry" id=28] -stat_id = 26 - -[sub_resource type="StatDataEntry" id=29] -stat_id = 22 - -[sub_resource type="StatDataEntry" id=30] -stat_id = 30 - -[sub_resource type="StatDataEntry" id=31] -stat_id = 20 - -[sub_resource type="StatDataEntry" id=32] -stat_id = 39 - -[sub_resource type="StatDataEntry" id=33] -stat_id = 11 - -[sub_resource type="StatDataEntry" id=34] -stat_id = 29 - -[sub_resource type="StatDataEntry" id=35] -stat_id = 35 - -[sub_resource type="StatDataEntry" id=36] - -[sub_resource type="StatDataEntry" id=37] -stat_id = 17 - -[sub_resource type="StatDataEntry" id=38] -stat_id = 18 - -[sub_resource type="StatDataEntry" id=39] -stat_id = 27 - -[sub_resource type="StatDataEntry" id=40] -stat_id = 23 - -[sub_resource type="StatDataEntry" id=41] -stat_id = 14 - -[sub_resource type="StatDataEntry" id=42] -stat_id = 4 -base = 9.0 - -[sub_resource type="StatDataEntry" id=43] -stat_id = 2 -base = 17.0 - -[sub_resource type="StatDataEntry" id=44] -stat_id = 1 -base = 8.0 - -[sub_resource type="StatDataEntry" id=45] -stat_id = 37 - -[sub_resource type="StatDataEntry" id=46] -stat_id = 40 - -[sub_resource type="StatData" id=47] -level_stat_data = SubResource( 5 ) -stat/agility = SubResource( 6 ) -stat/strength = SubResource( 44 ) -stat/stamina = SubResource( 43 ) -stat/intellect = SubResource( 23 ) -stat/spirit = SubResource( 42 ) -stat/health = SubResource( 21 ) -stat/mana = SubResource( 25 ) -stat/speed = SubResource( 36 ) -stat/global_cooldown = SubResource( 17 ) -stat/haste = SubResource( 18 ) -stat/haste_rating = SubResource( 19 ) -stat/resilience = SubResource( 33 ) -stat/armor = SubResource( 7 ) -stat/attack_power = SubResource( 8 ) -stat/spell_power = SubResource( 41 ) -stat/melee_crit = SubResource( 26 ) -stat/melee_crit_bonus = SubResource( 27 ) -stat/spell_crit = SubResource( 37 ) -stat/spell_crit_bonus = SubResource( 38 ) -stat/block = SubResource( 9 ) -stat/parry = SubResource( 31 ) -stat/damage_reduction = SubResource( 11 ) -stat/melee_damage_reduction = SubResource( 29 ) -stat/spell_damage_reduction = SubResource( 40 ) -stat/damage_taken = SubResource( 12 ) -stat/heal_taken = SubResource( 20 ) -stat/melee_damage = SubResource( 28 ) -stat/spell_damage = SubResource( 39 ) -stat/holy_resist = SubResource( 22 ) -stat/shadow_resist = SubResource( 34 ) -stat/nature_resist = SubResource( 30 ) -stat/fire_resist = SubResource( 15 ) -stat/frost_resist = SubResource( 16 ) -stat/lightning_resist = SubResource( 24 ) -stat/chaos_resist = SubResource( 10 ) -stat/silence_resist = SubResource( 35 ) -stat/fear_resist = SubResource( 14 ) -stat/stun_resist = SubResource( 45 ) -stat/energy = SubResource( 13 ) -stat/rage = SubResource( 32 ) -stat/xp_rate = SubResource( 46 ) - [resource] resource_name = "Naturalist" id = 1 text_name = "Naturalist" -stat_data = SubResource( 47 ) 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 ) ] diff --git a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres index f6c79df0..04f7c578 100644 --- a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres @@ -1,4 +1,4 @@ -[gd_resource type="EntityData" load_steps=6 format=2] +[gd_resource type="EntityData" load_steps=49 format=2] [ext_resource path="res://modules/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] @@ -6,6 +6,187 @@ [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4] [ext_resource path="res://modules/core/crafting/1_test_craft.tres" type="CraftRecipe" id=5] +[sub_resource type="SimpleLevelStatData" id=43] +agility = 3 +strength = 4 +stamina = 5 +intellect = 6 +spirit = 4 + +[sub_resource type="StatDataEntry" id=2] +base = 16.0 + +[sub_resource type="StatDataEntry" id=3] +stat_id = 12 + +[sub_resource type="StatDataEntry" id=4] +stat_id = 13 + +[sub_resource type="StatDataEntry" id=5] +stat_id = 19 + +[sub_resource type="StatDataEntry" id=6] +stat_id = 34 + +[sub_resource type="StatDataEntry" id=7] +stat_id = 21 + +[sub_resource type="StatDataEntry" id=8] +stat_id = 24 + +[sub_resource type="StatDataEntry" id=9] +stat_id = 38 + +[sub_resource type="StatDataEntry" id=10] +stat_id = 36 + +[sub_resource type="StatDataEntry" id=11] +stat_id = 31 + +[sub_resource type="StatDataEntry" id=12] +stat_id = 32 + +[sub_resource type="StatDataEntry" id=13] +stat_id = 8 +base = 1.5 + +[sub_resource type="StatDataEntry" id=14] +stat_id = 9 + +[sub_resource type="StatDataEntry" id=15] +stat_id = 10 + +[sub_resource type="StatDataEntry" id=16] +stat_id = 25 + +[sub_resource type="StatDataEntry" id=17] +stat_id = 5 +base = 100.0 + +[sub_resource type="StatDataEntry" id=18] +stat_id = 28 + +[sub_resource type="StatDataEntry" id=19] +stat_id = 3 +base = 18.0 + +[sub_resource type="StatDataEntry" id=20] +stat_id = 33 + +[sub_resource type="StatDataEntry" id=21] +stat_id = 6 +base = 100.0 + +[sub_resource type="StatDataEntry" id=22] +stat_id = 15 + +[sub_resource type="StatDataEntry" id=23] +stat_id = 16 + +[sub_resource type="StatDataEntry" id=24] +stat_id = 26 + +[sub_resource type="StatDataEntry" id=25] +stat_id = 22 + +[sub_resource type="StatDataEntry" id=26] +stat_id = 30 + +[sub_resource type="StatDataEntry" id=27] +stat_id = 20 + +[sub_resource type="StatDataEntry" id=28] +stat_id = 39 + +[sub_resource type="StatDataEntry" id=29] +stat_id = 11 + +[sub_resource type="StatDataEntry" id=30] +stat_id = 29 + +[sub_resource type="StatDataEntry" id=31] +stat_id = 35 + +[sub_resource type="StatDataEntry" id=32] +stat_id = 7 + +[sub_resource type="StatDataEntry" id=33] +stat_id = 17 + +[sub_resource type="StatDataEntry" id=34] +stat_id = 18 + +[sub_resource type="StatDataEntry" id=35] +stat_id = 27 + +[sub_resource type="StatDataEntry" id=36] +stat_id = 23 + +[sub_resource type="StatDataEntry" id=37] +stat_id = 14 + +[sub_resource type="StatDataEntry" id=38] +stat_id = 4 +base = 13.0 + +[sub_resource type="StatDataEntry" id=39] +stat_id = 2 +base = 18.0 + +[sub_resource type="StatDataEntry" id=40] +stat_id = 1 +base = 16.0 + +[sub_resource type="StatDataEntry" id=41] +stat_id = 37 + +[sub_resource type="StatDataEntry" id=42] +stat_id = 40 + +[sub_resource type="StatData" id=44] +level_stat_data = SubResource( 43 ) +stat/agility = SubResource( 2 ) +stat/strength = SubResource( 40 ) +stat/stamina = SubResource( 39 ) +stat/intellect = SubResource( 19 ) +stat/spirit = SubResource( 38 ) +stat/health = SubResource( 17 ) +stat/mana = SubResource( 21 ) +stat/speed = SubResource( 32 ) +stat/global_cooldown = SubResource( 13 ) +stat/haste = SubResource( 14 ) +stat/haste_rating = SubResource( 15 ) +stat/resilience = SubResource( 29 ) +stat/armor = SubResource( 3 ) +stat/attack_power = SubResource( 4 ) +stat/spell_power = SubResource( 37 ) +stat/melee_crit = SubResource( 22 ) +stat/melee_crit_bonus = SubResource( 23 ) +stat/spell_crit = SubResource( 33 ) +stat/spell_crit_bonus = SubResource( 34 ) +stat/block = SubResource( 5 ) +stat/parry = SubResource( 27 ) +stat/damage_reduction = SubResource( 7 ) +stat/melee_damage_reduction = SubResource( 25 ) +stat/spell_damage_reduction = SubResource( 36 ) +stat/damage_taken = SubResource( 8 ) +stat/heal_taken = SubResource( 16 ) +stat/melee_damage = SubResource( 24 ) +stat/spell_damage = SubResource( 35 ) +stat/holy_resist = SubResource( 18 ) +stat/shadow_resist = SubResource( 30 ) +stat/nature_resist = SubResource( 26 ) +stat/fire_resist = SubResource( 11 ) +stat/frost_resist = SubResource( 12 ) +stat/lightning_resist = SubResource( 20 ) +stat/chaos_resist = SubResource( 6 ) +stat/silence_resist = SubResource( 31 ) +stat/fear_resist = SubResource( 10 ) +stat/stun_resist = SubResource( 41 ) +stat/energy = SubResource( 9 ) +stat/rage = SubResource( 28 ) +stat/xp_rate = SubResource( 42 ) + [resource] resource_name = "Naturalist" id = 1 @@ -14,6 +195,7 @@ entity_controller = 1 is_playable = true text_name = "Naturalist" bag_size = 24 +stat_data = SubResource( 44 ) entity_species_data = ExtResource( 3 ) entity_class_data = ExtResource( 2 ) craft_recipes = [ ExtResource( 5 ), ExtResource( 1 ) ] diff --git a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres index f840337b..fb4e08ab 100644 --- a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -1,4 +1,4 @@ -[gd_resource type="EntityData" load_steps=5 format=2] +[gd_resource type="EntityData" load_steps=48 format=2] [ext_resource path="res://modules/species/Human/Female/1_human_female.tres" type="EntitySpeciesData" id=1] [ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] @@ -6,12 +6,193 @@ [sub_resource type="LootDataBase" id=1] +[sub_resource type="SimpleLevelStatData" id=2] +agility = 3 +strength = 4 +stamina = 4 +intellect = 3 +spirit = 5 + +[sub_resource type="StatDataEntry" id=3] +base = 12.0 + +[sub_resource type="StatDataEntry" id=4] +stat_id = 12 + +[sub_resource type="StatDataEntry" id=5] +stat_id = 13 + +[sub_resource type="StatDataEntry" id=6] +stat_id = 19 + +[sub_resource type="StatDataEntry" id=7] +stat_id = 34 + +[sub_resource type="StatDataEntry" id=8] +stat_id = 21 + +[sub_resource type="StatDataEntry" id=9] +stat_id = 24 + +[sub_resource type="StatDataEntry" id=10] +stat_id = 38 + +[sub_resource type="StatDataEntry" id=11] +stat_id = 36 + +[sub_resource type="StatDataEntry" id=12] +stat_id = 31 + +[sub_resource type="StatDataEntry" id=13] +stat_id = 32 + +[sub_resource type="StatDataEntry" id=14] +stat_id = 8 + +[sub_resource type="StatDataEntry" id=15] +stat_id = 9 + +[sub_resource type="StatDataEntry" id=16] +stat_id = 10 + +[sub_resource type="StatDataEntry" id=17] +stat_id = 25 + +[sub_resource type="StatDataEntry" id=18] +stat_id = 5 +base = 60.0 + +[sub_resource type="StatDataEntry" id=19] +stat_id = 28 + +[sub_resource type="StatDataEntry" id=20] +stat_id = 3 +base = 11.0 + +[sub_resource type="StatDataEntry" id=21] +stat_id = 33 + +[sub_resource type="StatDataEntry" id=22] +stat_id = 6 +base = 30.0 + +[sub_resource type="StatDataEntry" id=23] +stat_id = 15 + +[sub_resource type="StatDataEntry" id=24] +stat_id = 16 + +[sub_resource type="StatDataEntry" id=25] +stat_id = 26 + +[sub_resource type="StatDataEntry" id=26] +stat_id = 22 + +[sub_resource type="StatDataEntry" id=27] +stat_id = 30 + +[sub_resource type="StatDataEntry" id=28] +stat_id = 20 + +[sub_resource type="StatDataEntry" id=29] +stat_id = 39 + +[sub_resource type="StatDataEntry" id=30] +stat_id = 11 + +[sub_resource type="StatDataEntry" id=31] +stat_id = 29 + +[sub_resource type="StatDataEntry" id=32] +stat_id = 35 + +[sub_resource type="StatDataEntry" id=33] +stat_id = 7 + +[sub_resource type="StatDataEntry" id=34] +stat_id = 17 + +[sub_resource type="StatDataEntry" id=35] +stat_id = 18 + +[sub_resource type="StatDataEntry" id=36] +stat_id = 27 + +[sub_resource type="StatDataEntry" id=37] +stat_id = 23 + +[sub_resource type="StatDataEntry" id=38] +stat_id = 14 + +[sub_resource type="StatDataEntry" id=39] +stat_id = 4 +base = 8.0 + +[sub_resource type="StatDataEntry" id=40] +stat_id = 2 +base = 13.0 + +[sub_resource type="StatDataEntry" id=41] +stat_id = 1 +base = 14.0 + +[sub_resource type="StatDataEntry" id=42] +stat_id = 37 + +[sub_resource type="StatDataEntry" id=43] +stat_id = 40 + +[sub_resource type="StatData" id=44] +level_stat_data = SubResource( 2 ) +stat/agility = SubResource( 3 ) +stat/strength = SubResource( 41 ) +stat/stamina = SubResource( 40 ) +stat/intellect = SubResource( 20 ) +stat/spirit = SubResource( 39 ) +stat/health = SubResource( 18 ) +stat/mana = SubResource( 22 ) +stat/speed = SubResource( 33 ) +stat/global_cooldown = SubResource( 14 ) +stat/haste = SubResource( 15 ) +stat/haste_rating = SubResource( 16 ) +stat/resilience = SubResource( 30 ) +stat/armor = SubResource( 4 ) +stat/attack_power = SubResource( 5 ) +stat/spell_power = SubResource( 38 ) +stat/melee_crit = SubResource( 23 ) +stat/melee_crit_bonus = SubResource( 24 ) +stat/spell_crit = SubResource( 34 ) +stat/spell_crit_bonus = SubResource( 35 ) +stat/block = SubResource( 6 ) +stat/parry = SubResource( 28 ) +stat/damage_reduction = SubResource( 8 ) +stat/melee_damage_reduction = SubResource( 26 ) +stat/spell_damage_reduction = SubResource( 37 ) +stat/damage_taken = SubResource( 9 ) +stat/heal_taken = SubResource( 17 ) +stat/melee_damage = SubResource( 25 ) +stat/spell_damage = SubResource( 36 ) +stat/holy_resist = SubResource( 19 ) +stat/shadow_resist = SubResource( 31 ) +stat/nature_resist = SubResource( 27 ) +stat/fire_resist = SubResource( 12 ) +stat/frost_resist = SubResource( 13 ) +stat/lightning_resist = SubResource( 21 ) +stat/chaos_resist = SubResource( 7 ) +stat/silence_resist = SubResource( 32 ) +stat/fear_resist = SubResource( 11 ) +stat/stun_resist = SubResource( 42 ) +stat/energy = SubResource( 10 ) +stat/rage = SubResource( 29 ) +stat/xp_rate = SubResource( 43 ) + [resource] resource_name = "Naturalist" id = 1 entity_type = 4 entity_controller = 1 text_name = "Naturalist" +stat_data = SubResource( 44 ) entity_species_data = ExtResource( 1 ) entity_class_data = ExtResource( 2 ) loot_db = SubResource( 1 )