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 event handler renames.

Browse Source
This commit is contained in:
Relintai 2020-04-28 20:49:03 +02:00
parent 3efc211e52
commit 73bbe9bbca
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "60609ff0ed357a38b58126791f7372c8aa3e446e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "0a9d4d3c7216f0232222cf9fb106518234c187df"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} {"engine": {"3.2": "60609ff0ed357a38b58126791f7372c8aa3e446e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "2c47f9f55058ba2caab980e605eb90f6ffc93282"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}

6
game/player/Body.gd
View File

@ -501,18 +501,18 @@ func cmouseover(event):
if last_mouse_over != null and last_mouse_over != mo: if last_mouse_over != null and last_mouse_over != mo:
if is_instance_valid(last_mouse_over): if is_instance_valid(last_mouse_over):
last_mouse_over.onc_mouse_exit() last_mouse_over.notification_cmouse_exit()
last_mouse_over = null last_mouse_over = null
if last_mouse_over == null: if last_mouse_over == null:
mo.onc_mouse_enter() mo.notification_cmouse_enter()
last_mouse_over = mo last_mouse_over = mo
return return
if last_mouse_over != null: if last_mouse_over != null:
last_mouse_over.onc_mouse_exit() last_mouse_over.notification_cmouse_exit()
last_mouse_over = null last_mouse_over = null
func analog_force_change(vector, touchpad): func analog_force_change(vector, touchpad):

16
game/player/Mob.gd
View File

@ -47,16 +47,16 @@ func sstart_attack(entity : Entity) -> void:
starget = entity starget = entity
func _onc_mouse_enter() -> void: func _notification_cmouse_enter() -> void:
if centity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_LOOT: if centity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_LOOT:
Input.set_default_cursor_shape(Input.CURSOR_CROSS) Input.set_default_cursor_shape(Input.CURSOR_CROSS)
else: else:
Input.set_default_cursor_shape(Input.CURSOR_MOVE) Input.set_default_cursor_shape(Input.CURSOR_MOVE)
func _onc_mouse_exit() -> void: func _notification_cmouse_exit() -> void:
Input.set_default_cursor_shape(Input.CURSOR_ARROW) Input.set_default_cursor_shape(Input.CURSOR_ARROW)
func _son_death(): func _notification_sdeath():
if dead: if dead:
return return
@ -104,7 +104,7 @@ func _notification_cheal(what, info):
if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT: if what == SpellEnums.NOTIFICATION_DAMAGE_DAMAGE_DEALT:
WorldNumbers.heal(get_body().translation, 1.6, info.heal, info.crit) WorldNumbers.heal(get_body().translation, 1.6, info.heal, info.crit)
func _son_xp_gained(value : int) -> void: func _notification_sxp_gained(value : int) -> void:
if not ESS.get_resource_db().get_xp_data().can_character_level_up(gets_character_level()): if not ESS.get_resource_db().get_xp_data().can_character_level_up(gets_character_level()):
return return
@ -114,12 +114,12 @@ func _son_xp_gained(value : int) -> void:
levelup_scharacter(1) levelup_scharacter(1)
scharacter_xp = 0 scharacter_xp = 0
func _son_class_level_up(value: int): func _notification_sclass_level_up(value: int):
._son_class_level_up(value) ._notification_sclass_level_up(value)
refresh_spells(value) refresh_spells(value)
func _son_character_level_up(value: int) -> void: func _notification_scharacter_level_up(value: int) -> void:
._son_character_level_up(value) ._notification_scharacter_level_up(value)
refresh_spells(value) refresh_spells(value)
func refresh_spells(value: int): func refresh_spells(value: int):

12
game/player/NamePlate.gd
View File

@ -57,10 +57,10 @@ func _ready():
name_label.text = entity.centity_name name_label.text = entity.centity_name
entity.connect("cname_changed", self, "cname_changed") entity.connect("cname_changed", self, "cname_changed")
entity.connect("onc_mouse_entered", self, "onc_entity_mouse_entered") entity.connect("notification_cmouse_entered", self, "onc_entity_mouse_entered")
entity.connect("onc_mouse_exited", self, "onc_entity_mouse_exited") entity.connect("notification_cmouse_exited", self, "onc_entity_mouse_exited")
entity.connect("onc_targeted", self, "onc_targeted") entity.connect("notification_ctargeted", self, "notification_ctargeted")
entity.connect("onc_untargeted", self, "onc_untargeted") entity.connect("notification_cuntargeted", self, "notification_cuntargeted")
modulate = normal_color modulate = normal_color
set_scale(normal_scale) set_scale(normal_scale)
@ -151,13 +151,13 @@ func onc_entity_mouse_exited() -> void:
modulate = normal_color modulate = normal_color
interpolate_scale(normal_scale) interpolate_scale(normal_scale)
func onc_targeted() -> void: func notification_ctargeted() -> void:
targeted = true targeted = true
modulate = targeted_color modulate = targeted_color
interpolate_scale(targeted_scale) interpolate_scale(targeted_scale)
func onc_untargeted() -> void: func notification_cuntargeted() -> void:
targeted = false targeted = false
modulate = normal_color modulate = normal_color

2
game/scripts/resources/HealthResource.gd
View File

@ -32,7 +32,7 @@ func _init():
func _ons_added(entity): func _ons_added(entity):
refresh() refresh()
func _ons_stat_changed(stat : Stat): func _notification_sstat_changed(stat : Stat):
if stat.id == stamina_stat_id || stat.id == health_stat_id: if stat.id == stamina_stat_id || stat.id == health_stat_id:
refresh() refresh()

2
game/scripts/resources/ManaResource.gd
View File

@ -36,7 +36,7 @@ func _init():
func _ons_added(entity): func _ons_added(entity):
refresh() refresh()
func _ons_stat_changed(stat : Stat): func _notification_sstat_changed(stat : Stat):
if stat.id == int_id || stat.id == spirit_id: if stat.id == int_id || stat.id == spirit_id:
refresh() refresh()

2
game/scripts/resources/SpeedResource.gd
View File

@ -33,7 +33,7 @@ func _init():
func _ons_added(entity): func _ons_added(entity):
refresh() refresh()
func _ons_stat_changed(stat : Stat): func _notification_sstat_changed(stat : Stat):
if stat.id == speed_stat_id: if stat.id == speed_stat_id:
refresh() refresh()

10
game/ui/unitframes/UnitframeBase.gd
View File

@ -55,7 +55,7 @@ func set_player(p_player: Entity) -> void:
_player.disconnect("cname_changed", self, "cname_changed") _player.disconnect("cname_changed", self, "cname_changed")
_player.disconnect("con_level_up", self, "clevel_changed") _player.disconnect("con_level_up", self, "clevel_changed")
_player.disconnect("con_level_changed", self, "clevel_changed") _player.disconnect("con_level_changed", self, "clevel_changed")
_player.disconnect("con_xp_gained", self, "con_xp_gained") _player.disconnect("notification_cxp_gained", self, "notification_cxp_gained")
_player.disconnect("centity_data_changed", self, "centity_data_changed") _player.disconnect("centity_data_changed", self, "centity_data_changed")
_player.disconnect("centity_resource_added", self, "centity_resource_added") _player.disconnect("centity_resource_added", self, "centity_resource_added")
@ -71,9 +71,9 @@ func set_player(p_player: Entity) -> void:
_player = p_player _player = p_player
_player.connect("cname_changed", self, "cname_changed") _player.connect("cname_changed", self, "cname_changed")
_player.connect("con_character_level_up", self, "clevel_changed") _player.connect("notification_ccharacter_level_up", self, "clevel_changed")
_player.connect("con_character_level_changed", self, "clevel_changed") _player.connect("con_character_level_changed", self, "clevel_changed")
_player.connect("con_xp_gained", self, "con_xp_gained") _player.connect("notification_cxp_gained", self, "notification_cxp_gained")
_player.connect("centity_data_changed", self, "centity_data_changed") _player.connect("centity_data_changed", self, "centity_data_changed")
_player.connect("centity_resource_added", self, "centity_resource_added") _player.connect("centity_resource_added", self, "centity_resource_added")
@ -88,7 +88,7 @@ func set_player(p_player: Entity) -> void:
_level_text.text = str(_player.ccharacter_level) _level_text.text = str(_player.ccharacter_level)
clevel_changed(_player, 0) clevel_changed(_player, 0)
con_xp_gained(_player, 0) notification_cxp_gained(_player, 0)
func centity_resource_added(res : EntityResource): func centity_resource_added(res : EntityResource):
if res is ManaResource: if res is ManaResource:
@ -138,7 +138,7 @@ func clevel_changed(entity: Entity, value : int) -> void:
_xp_range.min_value = 0 _xp_range.min_value = 0
_xp_range.max_value = ESS.get_resource_db().get_xp_data().get_character_xp(_player.ccharacter_level) _xp_range.max_value = ESS.get_resource_db().get_xp_data().get_character_xp(_player.ccharacter_level)
func con_xp_gained(entity: Entity, val: int) -> void: func notification_cxp_gained(entity: Entity, val: int) -> void:
_xp_range.value = _player.ccharacter_xp _xp_range.value = _player.ccharacter_xp
func centity_data_changed(data: EntityData) -> void: func centity_data_changed(data: EntityData) -> void: