Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-22 02:17:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ESS to get the Damage and heal Info cleanups, also added a five rank talent to Strike.

Browse Source
This commit is contained in:
Relintai 2020-07-29 18:29:31 +02:00
parent 3be8851297
commit 68794c63ae
12 changed files with 121 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "24a85e3b7cfb6f816a991c7d9cfe783a79166a6b"}, "ui_extensions": {"master": "6db99122c27e87840f2da2cfa8934b0d0510004e"}, "voxelman": {"master": "768728139ede479dad006913e2f86d3f85edae57"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "a9bab9896de71966b9c9056869871e618c64cba7"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0ed644e4a4e7867a49fbe7c727b500305f7077f8"}, "mesh_utils": {"master": "65a802ff39a601bd1a55675023871e09500943ef"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "164ad82feb05842cb944c2907b65e521f8c7c465"}}
{"engine": {"3.2": "e36c100365e02367ec119eea5b6aef35d151de5f", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "1aa751f9590f18dfd02fe847711b135674870b05"}, "ui_extensions": {"master": "6db99122c27e87840f2da2cfa8934b0d0510004e"}, "voxelman": {"master": "768728139ede479dad006913e2f86d3f85edae57"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "a9bab9896de71966b9c9056869871e618c64cba7"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0ed644e4a4e7867a49fbe7c727b500305f7077f8"}, "mesh_utils": {"master": "65a802ff39a601bd1a55675023871e09500943ef"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "164ad82feb05842cb944c2907b65e521f8c7c465"}}

11
game/modules/entity_classes/naturalist/resource_db.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="ESSResourceDBStatic" load_steps=45 format=2]
[gd_resource type="ESSResourceDBStatic" load_steps=50 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/auras/16_ironbark_rank_1.tres" type="Aura" id=2]
@ -42,10 +42,15 @@
[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Aura" id=40]
[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Aura" id=41]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Aura" id=42]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Aura" id=43]
[ext_resource path="res://modules/entity_classes/naturalist/specs/talent_regrow_r1.tres" type="Aura" id=43]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Aura" id=44]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Aura" id=45]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Aura" id=46]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Aura" id=47]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Aura" id=48]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Aura" id=49]
[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 ), 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 ), ExtResource( 39 ), ExtResource( 41 ), ExtResource( 40 ), ExtResource( 43 ), ExtResource( 44 ), ExtResource( 42 ) ]
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 ), ExtResource( 39 ), ExtResource( 41 ), ExtResource( 40 ), ExtResource( 43 ), ExtResource( 44 ), ExtResource( 42 ), ExtResource( 46 ), ExtResource( 49 ), ExtResource( 48 ), ExtResource( 47 ), ExtResource( 45 ) ]

16
game/modules/entity_classes/naturalist/specs/melee.tres
View File

@ -1,5 +1,19 @@
[gd_resource type="CharacterSpec" format=2]
[gd_resource type="CharacterSpec" load_steps=6 format=2]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Aura" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Aura" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Aura" id=3]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Aura" id=4]
[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Aura" id=5]
[resource]
resource_name = "Melee"
text_name = "Melee"
num_rows = 1
row_0/size = 1
row_0/column_0/size = 5
row_0/column_0/entry_0 = ExtResource( 1 )
row_0/column_0/entry_1 = ExtResource( 5 )
row_0/column_0/entry_2 = ExtResource( 4 )
row_0/column_0/entry_3 = ExtResource( 3 )
row_0/column_0/entry_4 = ExtResource( 2 )

16
game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres Normal file
View File

@ -0,0 +1,16 @@
[gd_resource type="Aura" load_steps=3 format=2]
[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
[resource]
resource_name = "Improved Strike"
icon = ExtResource( 2 )
rank = 1
aura_type = 6
hide = true
text_name = "Improved Strike"
text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
script = ExtResource( 1 )
spell_name = "Strike"
mod_value = 40.0

16
game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres Normal file
View File

@ -0,0 +1,16 @@
[gd_resource type="Aura" load_steps=3 format=2]
[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
[resource]
resource_name = "Improved Strike"
icon = ExtResource( 2 )
rank = 1
aura_type = 6
hide = true
text_name = "Improved Strike"
text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
script = ExtResource( 1 )
spell_name = "Strike"
mod_value = 200.0

16
game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres Normal file
View File

@ -0,0 +1,16 @@
[gd_resource type="Aura" load_steps=3 format=2]
[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
[resource]
resource_name = "Improved Strike"
icon = ExtResource( 2 )
rank = 1
aura_type = 6
hide = true
text_name = "Improved Strike"
text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
script = ExtResource( 1 )
spell_name = "Strike"
mod_value = 60.0

16
game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres Normal file
View File

@ -0,0 +1,16 @@
[gd_resource type="Aura" load_steps=3 format=2]
[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
[resource]
resource_name = "Improved Strike"
icon = ExtResource( 2 )
rank = 1
aura_type = 6
hide = true
text_name = "Improved Strike"
text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
script = ExtResource( 1 )
spell_name = "Strike"
mod_value = 80.0

16
game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres Normal file
View File

@ -0,0 +1,16 @@
[gd_resource type="Aura" load_steps=3 format=2]
[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
[resource]
resource_name = "Improved Strike"
icon = ExtResource( 2 )
rank = 1
aura_type = 6
hide = true
text_name = "Improved Strike"
text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
script = ExtResource( 1 )
spell_name = "Strike"
mod_value = 100.0

2
game/modules/entity_classes/naturalist/specs/nature.tres
View File

@ -1,7 +1,7 @@
[gd_resource type="CharacterSpec" load_steps=4 format=2]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Aura" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Aura" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/specs/talent_regrow_r1.tres" type="Aura" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Aura" id=3]
[resource]

0
game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres → game/modules/entity_classes/naturalist/specs/talent_regrow_r1.tres
View File

14
game/scripts/auras/SpellDamageModAura.gd Normal file
View File

@ -0,0 +1,14 @@
extends "aura_script.gd"
export(String) var spell_name : String
export(float) var mod_value : float
func _sapply_passives_damage_deal(data : SpellDamageInfo):
var spell : Spell = data.spell_source_get()
if !spell:
return
if spell.get_name() == spell_name:
data.damage *= (100.0 + mod_value) / 100.0

4
game/scripts/spells/gd_spell_script.gd
View File

@ -158,7 +158,7 @@ func handle_effect(info : SpellCastInfo) -> void:
if damage_enabled and info.target:
var sdi : SpellDamageInfo = SpellDamageInfo.new()
sdi.damage_source = self
sdi.spell_source = self
sdi.dealer = info.caster
sdi.receiver = info.target
@ -167,7 +167,7 @@ func handle_effect(info : SpellCastInfo) -> void:
if heal_enabled and info.target:
var shi : SpellHealInfo = SpellHealInfo.new()
shi.heal_source = self
shi.spell_source = self
shi.dealer = info.caster
shi.receiver = info.target