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

Documentation and Optimization Part 1 (#2)

Browse Source 
Authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-06-16 10:12:51 +02:00
committed by GitHub
parent a22805d0e6
commit 4e09f522ff
109 changed files with 3556 additions and 2043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
game/ui/ui_9verbs/inventory/inventory_ui.tscn
View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-core/game/scenes/inventory/inventory_ui.gd" type="Script" id=1]
[ext_resource path="res://game/items/ESCORIA_ALL_ITEMS.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/ui/ui_9verbs/inventory/inventory_ui_container.gd" type="Script" id=3]
[node name="inventory_ui" type="PanelContainer"]
@@ -26,6 +25,3 @@ custom_constants/vseparation = 16
custom_constants/hseparation = 16
columns = 4
script = ExtResource( 3 )
[node name="ESCORIA_ALL_ITEMS" parent="." instance=ExtResource( 2 )]
position = Vector2( 269.391, 275.003 )

4
game/ui/ui_mouse_icons/game.gd
View File

@@ -88,8 +88,8 @@ func left_click_on_inventory_item(inventory_item_global_id : String, event : Inp
).node
if item.get_node("sprite").texture:
$ui/verbs_layer/verbs_menu.set_tool_texture(item.get_node("sprite").texture)
elif item.inventory_item_scene_file.instance().texture_normal:
$ui/verbs_layer/verbs_menu.set_tool_texture(item.inventory_item_scene_file.instance().texture_normal)
elif item.inventory_item.texture_normal:
$ui/verbs_layer/verbs_menu.set_tool_texture(item.inventory_item.texture_normal)
func right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:

6
game/ui/ui_mouse_icons/inventory/inventory_ui.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://addons/escoria-core/game/scenes/inventory/inventory_ui.gd" type="Script" id=1]
[ext_resource path="res://game/ui/ui_mouse_icons/images/inventory_bg.png" type="Texture" id=2]
@@ -6,7 +6,6 @@
[ext_resource path="res://game/ui/ui_mouse_icons/inventory/inventory_showhide.gd" type="Script" id=4]
[ext_resource path="res://game/ui/ui_mouse_icons/images/frame.png" type="Texture" id=5]
[ext_resource path="res://game/ui/ui_mouse_icons/images/inventory_icon.png" type="Texture" id=6]
[ext_resource path="res://game/items/ESCORIA_ALL_ITEMS.tscn" type="PackedScene" id=7]
[sub_resource type="Animation" id=1]
resource_name = "hide"
@@ -100,9 +99,6 @@ __meta__ = {
}
inventory_ui_container = NodePath("inventory_button/panel/MarginContainer/ScrollContainer/container")
[node name="ESCORIA_ALL_ITEMS" parent="." instance=ExtResource( 7 )]
position = Vector2( 269.391, 275.003 )
[node name="inventory_button" type="TextureButton" parent="."]
margin_right = 256.0
margin_bottom = 322.0