From 67d412abfba8469dac7bfc90e889b286ddf49da6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 26 Feb 2020 21:22:30 +0100 Subject: [PATCH] Update to the latest ESS, to get bugfixes, and the getter style upgrade. --- HEADS | 2 +- game/player/Mob.gd | 4 ++-- game/scripts/ai/EntityAIGD.gd | 4 ++-- game/scripts/auras/aura_script.gd | 8 ++++---- game/scripts/entities/EntityClassDataGD.gd | 4 ++-- game/scripts/entities/EntityDataGD.gd | 2 +- game/scripts/spells/amplify_pain.gd | 4 ++-- game/scripts/spells/gd_spell_script.gd | 6 +++--- game/ui/unitframes/TargetUnitframe.gd | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/HEADS b/HEADS index b7c65500..a7ac1ac6 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "2486590bd38f729982a3265862eea82130a0cc23"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "36063410f99f7e44b2169d66ccb0730c9890d462"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file +{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "36063410f99f7e44b2169d66ccb0730c9890d462"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file diff --git a/game/player/Mob.gd b/game/player/Mob.gd index 4bb5f4cb..7807062e 100644 --- a/game/player/Mob.gd +++ b/game/player/Mob.gd @@ -218,8 +218,8 @@ func _son_death(): return #warning-ignore:unused_variable - for i in range(sget_aura_count()): - sremove_aura(sget_aura(0)) + for i in range(gets_aura_count()): + removes_aura(gets_aura(0)) dead = true diff --git a/game/scripts/ai/EntityAIGD.gd b/game/scripts/ai/EntityAIGD.gd index 0cfbae1b..96b6882b 100644 --- a/game/scripts/ai/EntityAIGD.gd +++ b/game/scripts/ai/EntityAIGD.gd @@ -91,12 +91,12 @@ func attack(delta): continue if taskey == null: - if target.sget_aura_by(owner, tas["aura_id"]) == null and not owner.hass_cooldown(spell_id): + if target.gets_aura_by(owner, tas["aura_id"]) == null and not owner.hass_cooldown(spell_id): owner.crequest_spell_cast(spell_id) cast = true break else: - if target.sget_aura_with_group_by(owner, taskey) == null and not owner.hass_cooldown(spell_id): + if target.gets_aura_with_group_by(owner, taskey) == null and not owner.hass_cooldown(spell_id): owner.crequest_spell_cast(spell_id) cast = true break diff --git a/game/scripts/auras/aura_script.gd b/game/scripts/auras/aura_script.gd index 4c344c12..6a8d5697 100644 --- a/game/scripts/auras/aura_script.gd +++ b/game/scripts/auras/aura_script.gd @@ -47,7 +47,7 @@ func _handle_aura_heal(aura_data : AuraData, shi : SpellHealInfo) -> void: func _sapply(info : AuraApplyInfo) -> void: # var add : bool = false - var ad : AuraData = info.target.sget_aura_by(info.caster, info.aura.id) + var ad : AuraData = info.target.gets_aura_by(info.caster, info.aura.id) if ad == null: # add = true @@ -65,10 +65,10 @@ func _sapply(info : AuraApplyInfo) -> void: var t : int = 1 << i if states_add & t != 0: - info.target.sadd_state_ref(i) + info.target.adds_state_ref(i) - info.target.sadd_aura(ad); + info.target.adds_aura(ad); else: ad.remaining_time = time @@ -86,7 +86,7 @@ func _sdeapply(data : AuraData) -> void: var t : int = 1 << i if states_add & t != 0: - data.owner.sremove_state_ref(i) + data.owner.removes_state_ref(i) func _con_aura_added(data : AuraData) -> void: if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null: diff --git a/game/scripts/entities/EntityClassDataGD.gd b/game/scripts/entities/EntityClassDataGD.gd index f1745f42..0cf3491a 100644 --- a/game/scripts/entities/EntityClassDataGD.gd +++ b/game/scripts/entities/EntityClassDataGD.gd @@ -72,12 +72,12 @@ func _sai_attack(entity): continue if taskey == null: - if target.sget_aura_by(entity, tas["aura_id"]) == null and not entity.hass_cooldown(spell_id): + if target.gets_aura_by(entity, tas["aura_id"]) == null and not entity.hass_cooldown(spell_id): entity.crequest_spell_cast(spell_id) cast = true break else: - if target.sget_aura_with_group_by(entity, taskey) == null and not entity.hass_cooldown(spell_id): + if target.gets_aura_with_group_by(entity, taskey) == null and not entity.hass_cooldown(spell_id): entity.crequest_spell_cast(spell_id) cast = true break diff --git a/game/scripts/entities/EntityDataGD.gd b/game/scripts/entities/EntityDataGD.gd index c71aa031..bad3efaa 100644 --- a/game/scripts/entities/EntityDataGD.gd +++ b/game/scripts/entities/EntityDataGD.gd @@ -36,7 +36,7 @@ func _sinteract(entity: Entity) -> void: var loot : Array = Array() - ldb.get_loot(loot) + ldb.get_loot() var bag : Bag = Bag.new() bag.set_size(loot.size()) diff --git a/game/scripts/spells/amplify_pain.gd b/game/scripts/spells/amplify_pain.gd index e7c2c1c0..23255332 100644 --- a/game/scripts/spells/amplify_pain.gd +++ b/game/scripts/spells/amplify_pain.gd @@ -26,9 +26,9 @@ func _sfinish_cast(info : SpellCastInfo) -> void: if not is_instance_valid(target): return - for i in range(target.sget_aura_count()): + for i in range(target.gets_aura_count()): - var ad : AuraData = target.sget_aura(i) + var ad : AuraData = target.gets_aura(i) if ad.caster == info.caster: var aura : Aura = ad.aura diff --git a/game/scripts/spells/gd_spell_script.gd b/game/scripts/spells/gd_spell_script.gd index 0d416222..12511e2f 100644 --- a/game/scripts/spells/gd_spell_script.gd +++ b/game/scripts/spells/gd_spell_script.gd @@ -148,12 +148,12 @@ func handle_effect(info : SpellCastInfo) -> void: var ad : AuraData = null if aura.aura_group != null: - ad = info.target.sget_aura_with_group_by(info.caster, aura.aura_group) + ad = info.target.gets_aura_with_group_by(info.caster, aura.aura_group) else: - ad = info.target.sget_aura_by(info.caster, aura.get_id()) + ad = info.target.gets_aura_by(info.caster, aura.get_id()) if ad != null: - info.target.sremove_aura_exact(ad) + info.target.removes_aura_exact(ad) var ainfo : AuraApplyInfo = AuraApplyInfo.new() diff --git a/game/ui/unitframes/TargetUnitframe.gd b/game/ui/unitframes/TargetUnitframe.gd index d8c9b863..a1f307dd 100644 --- a/game/ui/unitframes/TargetUnitframe.gd +++ b/game/ui/unitframes/TargetUnitframe.gd @@ -61,8 +61,8 @@ func set_player(p_player : Entity) -> void: _player = p_player - for index in range(_player.cget_aura_count()): - var aura : AuraData = _player.cget_aura(index) + for index in range(_player.getc_aura_count()): + var aura : AuraData = _player.getc_aura(index) on_caura_added(aura)