diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/item.gd b/gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd similarity index 100% rename from gymkhana/addons/escoria-ui-return-monkey-island/item.gd rename to gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index 5f7d2da0..8256f781 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -262,10 +262,9 @@ func left_double_click_on_item(item_global_id: String, event: InputEvent) -> voi ## INVENTORY ## func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: click_on_item(inventory_item_global_id, event, ACTION1) - escoria.action_manager.do( - escoria.action_manager.ACTION.ITEM_LEFT_CLICK, - [inventory_item_global_id, event] - ) + +func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: + click_on_item(inventory_item_global_id, event, ACTION2) func inventory_item_focused(inventory_item_global_id: String) -> void: diff --git a/gymkhana/items/inventory/I_Bombona.tscn b/gymkhana/items/inventory/I_Bombona.tscn index 511e2e4d..e7f07c5f 100644 --- a/gymkhana/items/inventory/I_Bombona.tscn +++ b/gymkhana/items/inventory/I_Bombona.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://game/items/inventory/wrench.png" type="Texture" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/item.gd" type="Script" id=27] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=27] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip-reworked/tooltip-action2.tscn" type="PackedScene" id=28] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip-reworked/tooltip-action1.tscn" type="PackedScene" id=29] diff --git a/gymkhana/rooms/home/home.tscn b/gymkhana/rooms/home/home.tscn index 3eb1253b..cba7855d 100644 --- a/gymkhana/rooms/home/home.tscn +++ b/gymkhana/rooms/home/home.tscn @@ -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://gymkhana/addons/escoria-ui-return-monkey-island/item.gd" type="Script" id=5] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.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] diff --git a/gymkhana/start_game.esc b/gymkhana/start_game.esc index 50b623f0..1fa7cb7e 100644 --- a/gymkhana/start_game.esc +++ b/gymkhana/start_game.esc @@ -8,4 +8,4 @@ play_snd res://game/sfx/Game-Menu_Looping.mp3 _music :newgame # 1/ Simple scene -change_scene res://gymkhana/rooms/home/home.tscn +change_scene res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn diff --git a/project.godot b/project.godot index 55d3d263..17b0d35f 100644 --- a/project.godot +++ b/project.godot @@ -322,7 +322,7 @@ _global_script_classes=[ { "base": "ESCItem", "class": "ESCItemWithTooltip", "language": "GDScript", -"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/item.gd" +"path": "res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" }, { "base": "Position2D", "class": "ESCLocation", @@ -752,7 +752,7 @@ _global_script_class_icons={ "ESCInventoryItem": "", "ESCInventoryManager": "", "ESCItem": "res://addons/escoria-core/design/esc_item.svg", -"ESCItemWithTooltip": "res://addons/escoria-core/design/esc_item.svg", +"ESCItemWithTooltip": "", "ESCLocation": "res://addons/escoria-core/design/esc_location.svg", "ESCMain": "", "ESCMigration": "",