From 0bef0a2339269a931d28b54c3f9cb9b741df233a Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 26 Apr 2020 12:55:55 +0200 Subject: [PATCH] Moved the naturalist based mob into naturalist's folder. --- .../naturalist/effect_data/aspect_of_scorpions.tres | 1 - .../naturalist/entities/2_naturalist_mob.tres} | 12 ++++++------ game/data/entity_classes/naturalist/resource_db.tres | 5 +++-- .../naturalist/spells/14_amplify_pain_rank_1.tres | 1 - game/data/resource_db.tres | 2 +- game/data/spells/35_strike.tres | 1 - game/scripts/game_modules/GameModule.gd | 8 ++++++-- 7 files changed, 16 insertions(+), 14 deletions(-) rename game/data/{entities/1_naturalist.tres => entity_classes/naturalist/entities/2_naturalist_mob.tres} (69%) diff --git a/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres b/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres index 2cb4cc49..4f390adb 100644 --- a/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres +++ b/game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres @@ -4,7 +4,6 @@ [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] [ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3] - [resource] script = ExtResource( 2 ) spell_cast_effect_left_hand = ExtResource( 1 ) diff --git a/game/data/entities/1_naturalist.tres b/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres similarity index 69% rename from game/data/entities/1_naturalist.tres rename to game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres index c56e6c58..ecf4bec6 100644 --- a/game/data/entities/1_naturalist.tres +++ b/game/data/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -1,8 +1,8 @@ [gd_resource type="EntityData" load_steps=5 format=2] -[ext_resource path="res://data/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=1] -[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=2] -[ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=3] +[ext_resource path="res://data/species/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] @@ -12,7 +12,7 @@ id = 1 entity_type = 4 entity_controller = 1 text_name = "Naturalist" -entity_species_data = ExtResource( 3 ) -entity_class_data = ExtResource( 1 ) +entity_species_data = ExtResource( 1 ) +entity_class_data = ExtResource( 2 ) loot_db = SubResource( 1 ) -script = ExtResource( 2 ) +script = ExtResource( 3 ) diff --git a/game/data/entity_classes/naturalist/resource_db.tres b/game/data/entity_classes/naturalist/resource_db.tres index 52efb470..9e674754 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=36 format=2] +[gd_resource type="ESSResourceDBStatic" load_steps=37 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] @@ -35,8 +35,9 @@ [ext_resource path="res://data/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=33] [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] [resource] -entity_datas = [ ExtResource( 35 ) ] +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 ) ] 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/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres b/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres index 5d66d5ac..cc83bcd4 100644 --- a/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres +++ b/game/data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres @@ -6,7 +6,6 @@ [ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] [ext_resource path="res://data/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] - [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) spell_cast_effect_left_hand = ExtResource( 1 ) diff --git a/game/data/resource_db.tres b/game/data/resource_db.tres index dc09cc10..fa2d2ee3 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/entities", "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/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" ) diff --git a/game/data/spells/35_strike.tres b/game/data/spells/35_strike.tres index d5f69e38..bdb7f43a 100644 --- a/game/data/spells/35_strike.tres +++ b/game/data/spells/35_strike.tres @@ -6,7 +6,6 @@ [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] - [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 3 ) spell_cast_effect_left_hand = ExtResource( 5 ) diff --git a/game/scripts/game_modules/GameModule.gd b/game/scripts/game_modules/GameModule.gd index c2b749bc..5287def7 100644 --- a/game/scripts/game_modules/GameModule.gd +++ b/game/scripts/game_modules/GameModule.gd @@ -9,8 +9,12 @@ func load_module(): ESS.resource_db.add_entity_resource_db(resource_db) -# var r : ESSResourceDB = ESS.resource_db -# + var r : ESSResourceDB = ESS.resource_db + + for e in r.get_entity_datas(): + print(e.resource_path) + print(e.get_id()) + # for s in r.get_spells(): # print(s.resource_name) # print(s.get_id())