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 equipment method name update.

Browse Source
This commit is contained in:
Relintai 2020-04-28 12:34:28 +02:00
parent 84e341bcc6
commit cbe4e31d3a
3 changed files with 6 additions and 6 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": "90ad406d73ea252bb7fb74a7c9d58979fbbd355c"}, "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": "62d3928ceddaeb2026dfd4a557d963a33a19a38b"}, "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"}}

2
game/ui/bags/BagEntry.gd
View File

@ -184,7 +184,7 @@ func drop_data(pos, esd) -> void:
player.crequest_item_swap(slot_id, esd.get_meta("slot_id")) player.crequest_item_swap(slot_id, esd.get_meta("slot_id"))
setup_icon() setup_icon()
elif esd.type == ESDragAndDrop.ES_DRAG_AND_DROP_TYPE_EQUIPPED_ITEM: elif esd.type == ESDragAndDrop.ES_DRAG_AND_DROP_TYPE_EQUIPPED_ITEM:
player.crequest_equip(ESS.resource_db.get_item_template_path(esd.item_path).id, slot_id) player.equip_crequest(ESS.resource_db.get_item_template_path(esd.item_path).id, slot_id)
setup_icon() setup_icon()
func set_slot_id(pslot_id : int) -> void: func set_slot_id(pslot_id : int) -> void:

8
game/ui/bags/EquipmentSlot.gd
View File

@ -41,14 +41,14 @@ func set_tooltip_node(tooltip : Popup) -> void:
func set_player(player: Entity) -> void: func set_player(player: Entity) -> void:
if _player != null: if _player != null:
_player.disconnect("con_equip_success", self, "con_equip_success") _player.disconnect("equip_con_success", self, "equip_con_success")
_player = player _player = player
if _player == null: if _player == null:
return return
_player.connect("con_equip_success", self, "con_equip_success") _player.connect("equip_con_success", self, "equip_con_success")
func drop_data(position, data): func drop_data(position, data):
if _player == null: if _player == null:
@ -61,7 +61,7 @@ func drop_data(position, data):
return return
if dd.type == ESDragAndDrop.ES_DRAG_AND_DROP_TYPE_INVENTORY_ITEM: if dd.type == ESDragAndDrop.ES_DRAG_AND_DROP_TYPE_INVENTORY_ITEM:
_player.crequest_equip(equip_slot, dd.get_meta("slot_id")) _player.equip_crequest(equip_slot, dd.get_meta("slot_id"))
func can_drop_data(position, data): func can_drop_data(position, data):
if _player == null: if _player == null:
@ -93,7 +93,7 @@ func get_drag_data(position):
return esd return esd
func con_equip_success(entity: Entity, pequip_slot: int, item: ItemInstance, old_item: ItemInstance, bag_slot: int): func equip_con_success(entity: Entity, pequip_slot: int, item: ItemInstance, old_item: ItemInstance, bag_slot: int):
if equip_slot != pequip_slot: if equip_slot != pequip_slot:
return return