Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ESS. I moved the stats from EntityData to EntityClassData.

Browse Source
This commit is contained in:
Relintai 2020-10-18 23:16:29 +02:00
parent 6358d0237d
commit 61fef54f5c
9 changed files with 49 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "fe16d4573ffc5d200b2d0a155917455c2a1226a6"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "a714e81db38457c80d37fe9d77956684d6c932d8"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}
{"engine": {"3.2": "cc3c671f3b636cbfac9fc74095d5bee753e71ed5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "c7a98e704dd62782b9f8b4a22b74787278574657"}, "entity_spell_system": {"master": "ee099a0f0effd3c98f67e1a9228f35266dfb9774"}, "ui_extensions": {"master": "07c50b139fd3db4cb813db9955187f9530b754bb"}, "voxelman": {"master": "a714e81db38457c80d37fe9d77956684d6c932d8"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "b852ab0e525addbd11ebcdd7d16b7536171837be"}, "procedural_animations": {"master": "ec465a7a683a047cd373959bb022bde1321fb72d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "bfb60df21570415b1860c25c2dae7722cf158ed9"}, "mesh_utils": {"master": "3365df3faf89a4c29c3b4664b53e9007e4e6267b"}, "broken_seals_module": {"master": "9f89e2a4e7b59351ac4cb4c4dc5f88e5b60a2f15"}, "thread_pool": {"master": "b1030eaf92ba595c56ae8caac90b58081303d16f"}}

4
game/modules/entity_classes/naturalist/1_naturalist.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="EntityClassData" load_steps=27 format=2]
[gd_resource type="EntityClassData" load_steps=28 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]
@ -25,6 +25,7 @@
[ext_resource path="res://modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=23]
[ext_resource path="res://modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=24]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee.tres" type="CharacterSpec" id=25]
[ext_resource path="res://modules/entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=26]
[sub_resource type="EntityAI" id=1]
script = ExtResource( 9 )
@ -33,6 +34,7 @@ script = ExtResource( 9 )
resource_name = "Naturalist"
id = 1
text_name = "Naturalist"
stat_data = ExtResource( 26 )
entity_resources = [ ExtResource( 4 ) ]
specs = [ ExtResource( 6 ), ExtResource( 25 ), ExtResource( 8 ) ]
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 ) ]

4
game/modules/entity_classes/naturalist/1_naturalist_vendor.tres
View File

@ -1,7 +1,8 @@
[gd_resource type="EntityClassData" load_steps=7 format=2]
[gd_resource type="EntityClassData" 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/entity_classes/naturalist/stats/mob_statdata.tres" type="StatData" id=3]
[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13]
[sub_resource type="VendorItemDataEntry" id=1]
@ -17,5 +18,6 @@ vendor_datas = [ SubResource( 1 ), SubResource( 2 ) ]
resource_name = "Naturalist"
id = 1
text_name = "Naturalist"
stat_data = ExtResource( 3 )
vendor_item_data = SubResource( 3 )
script = ExtResource( 13 )

21
game/modules/entity_classes/naturalist/entities/1_naturalist.tres
View File

@ -1,27 +1,9 @@
[gd_resource type="EntityData" load_steps=6 format=2]
[gd_resource type="EntityData" load_steps=4 format=2]
[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2]
[ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=3]
[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 4
strength = 3
stamina = 6
intellect = 5
spirit = 3
[sub_resource type="StatData" id=2]
level_stat_data = SubResource( 1 )
stat/agility = 23.0
stat/strength = 14.0
stat/stamina = 23.0
stat/intellect = 19.0
stat/spirit = 3.0
stat/health = 100.0
stat/mana = 100.0
stat/global_cooldown = 1.5
[resource]
resource_name = "Naturalist"
id = 1
@ -30,7 +12,6 @@ entity_controller = 1
is_playable = true
text_name = "Naturalist"
bag_size = 24
stat_data = SubResource( 2 )
entity_species_data = ExtResource( 3 )
entity_class_data = ExtResource( 2 )
script = ExtResource( 4 )

21
game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="EntityData" load_steps=7 format=2]
[gd_resource type="EntityData" load_steps=5 format=2]
[ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2]
@ -6,31 +6,12 @@
[sub_resource type="LootDataBase" id=1]
[sub_resource type="SimpleLevelStatData" id=2]
agility = 3
strength = 2
stamina = 3
intellect = 4
spirit = 5
[sub_resource type="StatData" id=3]
level_stat_data = SubResource( 2 )
stat/agility = 14.0
stat/strength = 15.0
stat/stamina = 13.0
stat/intellect = 13.0
stat/spirit = 10.0
stat/health = 20.0
stat/mana = 20.0
stat/global_cooldown = 1.5
[resource]
resource_name = "Naturalist"
id = 2
entity_type = 4
entity_controller = 2
text_name = "Naturalist"
stat_data = SubResource( 3 )
entity_species_data = ExtResource( 1 )
entity_class_data = ExtResource( 2 )
loot_db = SubResource( 1 )

21
game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres
View File

@ -1,34 +1,15 @@
[gd_resource type="EntityData" load_steps=6 format=2]
[gd_resource type="EntityData" load_steps=4 format=2]
[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1]
[ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=3]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 3
strength = 2
stamina = 3
intellect = 4
spirit = 5
[sub_resource type="StatData" id=2]
level_stat_data = SubResource( 1 )
stat/agility = 14.0
stat/strength = 15.0
stat/stamina = 13.0
stat/intellect = 13.0
stat/spirit = 10.0
stat/health = 20.0
stat/mana = 20.0
stat/global_cooldown = 1.5
[resource]
resource_name = "Naturalist Trainer"
id = 3
entity_type = 4
entity_interaction_type = 4
text_name = "Naturalist Trainer"
stat_data = SubResource( 2 )
entity_species_data = ExtResource( 2 )
entity_class_data = ExtResource( 3 )
script = ExtResource( 1 )

21
game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres
View File

@ -1,34 +1,15 @@
[gd_resource type="EntityData" load_steps=6 format=2]
[gd_resource type="EntityData" load_steps=4 format=2]
[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1]
[ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=3]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 3
strength = 2
stamina = 3
intellect = 4
spirit = 5
[sub_resource type="StatData" id=2]
level_stat_data = SubResource( 1 )
stat/agility = 14.0
stat/strength = 15.0
stat/stamina = 13.0
stat/intellect = 13.0
stat/spirit = 10.0
stat/health = 20.0
stat/mana = 20.0
stat/global_cooldown = 1.5
[resource]
resource_name = "Naturalist Vendor"
id = 3
entity_type = 4
entity_interaction_type = 5
text_name = "Naturalist Vendor"
stat_data = SubResource( 2 )
entity_species_data = ExtResource( 2 )
entity_class_data = ExtResource( 3 )
script = ExtResource( 1 )

19
game/modules/entity_classes/naturalist/stats/mob_statdata.tres Normal file
View File

@ -0,0 +1,19 @@
[gd_resource type="StatData" load_steps=2 format=2]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 3
strength = 2
stamina = 3
intellect = 4
spirit = 5
[resource]
level_stat_data = SubResource( 1 )
stat/agility = 14.0
stat/strength = 15.0
stat/stamina = 13.0
stat/intellect = 13.0
stat/spirit = 10.0
stat/health = 20.0
stat/mana = 20.0
stat/global_cooldown = 1.5

19
game/modules/entity_classes/naturalist/stats/player_statdata.tres Normal file
View File

@ -0,0 +1,19 @@
[gd_resource type="StatData" load_steps=2 format=2]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 4
strength = 3
stamina = 6
intellect = 5
spirit = 3
[resource]
level_stat_data = SubResource( 1 )
stat/agility = 23.0
stat/strength = 14.0
stat/stamina = 23.0
stat/intellect = 19.0
stat/spirit = 3.0
stat/health = 100.0
stat/mana = 100.0
stat/global_cooldown = 1.5