oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

UNDO CHANGES IN escoria-core

Browse Source
This commit is contained in:
Eneko Nieto
2023-02-13 18:20:52 +01:00
parent cfc45d0c56
commit 143086c4f3
6 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gymkhana/addons/escoria-ui-return-monkey-island/game.gd
View File

@@ -70,6 +70,8 @@ var _is_gamepad_connected = false
# Tracks the mouse's current position onscreen.
var _current_mouse_pos = Vector2.ZERO
# A reference to the node handling tooltip2
var tooltip2_node: Object
func _ready():
$tooltip_layer/tooltip.connect("tooltip_size_updated", self, "update_tooltip_following_mouse_position")
@@ -306,6 +308,7 @@ func inventory_item_focused(inventory_item_global_id: String) -> void:
func inventory_item_unfocused() -> void:
$tooltip_layer/tooltip.set_target("")
$tooltip_layer/tooltip2.set_target("")
func open_inventory():
@@ -439,6 +442,7 @@ func _on_event_done(_return_code: int, _event_name: String):
escoria.action_manager.clear_current_action()
$mouse_layer/verbs_menu.clear_tool_texture()
$tooltip_layer/tooltip.set_target("")
$tooltip_layer/tooltip2.set_target("")
func _on_MenuButton_pressed() -> void:

4
gymkhana/addons/escoria-ui-return-monkey-island/item.gd Normal file
View File

@@ -0,0 +1,4 @@
extends ESCItem
# The text for the tooltip of action2
export(String) var tooltip2_name

2
gymkhana/rooms/home/room01.tscn
View File

@@ -4,7 +4,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
[ext_resource path="res://gymkhana/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/item.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7]
[ext_resource path="res://gymkhana/rooms/home/room1background.png" type="Texture" id=8]