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 to get the aura trigger and stat attribute reworks.

Browse Source
This commit is contained in:
Relintai 2020-06-06 17:01:08 +02:00
parent bb56fb05c5
commit ea6daeb5d4
2 changed files with 6 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": "9f4a14ba97394d1fc08d123c40699c03f56b6aad", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "6a3716bc420164edceb7fd213a412e5ba11fa474"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}} {"engine": {"3.2": "9f4a14ba97394d1fc08d123c40699c03f56b6aad", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "8ed462ece29ad74067842571b4ce70b97b6b10ae"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "7c93cc8f52a60746aa43c0a78631baecbabfe6dc"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "e4f048d67c171c34995763519e6d21bf40df29a7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

12
game/scripts/auras/aura_script.gd
View File

@ -58,9 +58,8 @@ func _sapply(info : AuraApplyInfo) -> void:
setup_aura_data(ad, info); setup_aura_data(ad, info);
for i in range(get_aura_stat_attribute_count()): for i in range(stat_attribute_get_count()):
var stat_attribute : AuraStatAttribute = get_aura_stat_attribute(i) info.target.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
info.target.stat_mod(id, stat_attribute.base_mod, stat_attribute.bonus_mod, stat_attribute.percent_mod)
if states_add != 0: if states_add != 0:
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX): for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
@ -76,10 +75,9 @@ func _sapply(info : AuraApplyInfo) -> void:
func _sdeapply(data : AuraData) -> void: func _sdeapply(data : AuraData) -> void:
for i in range(get_aura_stat_attribute_count()): for i in range(stat_attribute_get_count()):
var stat_attribute : AuraStatAttribute = get_aura_stat_attribute(i) data.owner.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
data.owner.stat_mod(id, -stat_attribute.base_mod, -stat_attribute.bonus_mod, -stat_attribute.percent_mod)
if states_add != 0: if states_add != 0:
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX): for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
var t : int = 1 << i var t : int = 1 << i