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

Renamed item.gd to esc_item_with_tooltip.gd

Browse Source 
Trasera cocina as start room
This commit is contained in:
Eneko Nieto
2023-02-16 16:56:57 +01:00
parent c9e9445f57
commit 6f1d2d89da
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
gymkhana/addons/escoria-ui-return-monkey-island/item.gd → gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd
View File

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

@@ -262,10 +262,9 @@ func left_double_click_on_item(item_global_id: String, event: InputEvent) -> voi
## INVENTORY ## ## INVENTORY ##
func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void: func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
click_on_item(inventory_item_global_id, event, ACTION1) click_on_item(inventory_item_global_id, event, ACTION1)
escoria.action_manager.do(
escoria.action_manager.ACTION.ITEM_LEFT_CLICK, func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
[inventory_item_global_id, event] click_on_item(inventory_item_global_id, event, ACTION2)
)
func inventory_item_focused(inventory_item_global_id: String) -> void: func inventory_item_focused(inventory_item_global_id: String) -> void:

2
gymkhana/items/inventory/I_Bombona.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource path="res://game/items/inventory/wrench.png" type="Texture" id=1] [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://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-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] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/tooltip-reworked/tooltip-action1.tscn" type="PackedScene" id=29]

2
gymkhana/rooms/home/home.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://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://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/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_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://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] [ext_resource path="res://gymkhana/rooms/home/room1background.png" type="Texture" id=8]

2
gymkhana/start_game.esc
View File

@@ -8,4 +8,4 @@ play_snd res://game/sfx/Game-Menu_Looping.mp3 _music
:newgame :newgame
# 1/ Simple scene # 1/ Simple scene
change_scene res://gymkhana/rooms/home/home.tscn change_scene res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn

4
project.godot
View File

@@ -322,7 +322,7 @@ _global_script_classes=[ {
"base": "ESCItem", "base": "ESCItem",
"class": "ESCItemWithTooltip", "class": "ESCItemWithTooltip",
"language": "GDScript", "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", "base": "Position2D",
"class": "ESCLocation", "class": "ESCLocation",
@@ -752,7 +752,7 @@ _global_script_class_icons={
"ESCInventoryItem": "", "ESCInventoryItem": "",
"ESCInventoryManager": "", "ESCInventoryManager": "",
"ESCItem": "res://addons/escoria-core/design/esc_item.svg", "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", "ESCLocation": "res://addons/escoria-core/design/esc_location.svg",
"ESCMain": "", "ESCMain": "",
"ESCMigration": "", "ESCMigration": "",