Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-12-25 01:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to the latest ESS, to get bugfixes, and the getter style upgrade.

Browse Source
This commit is contained in:
Relintai 2020-02-26 21:22:30 +01:00
parent 89eb0940fd
commit 67d412abfb
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -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"}}
{"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"}}

4
game/player/Mob.gd
View File

@ -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

4
game/scripts/ai/EntityAIGD.gd
View File

@ -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

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

@ -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:

4
game/scripts/entities/EntityClassDataGD.gd
View File

@ -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

2
game/scripts/entities/EntityDataGD.gd
View File

@ -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())

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

@ -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

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

@ -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()

4
game/ui/unitframes/TargetUnitframe.gd
View File

@ -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)