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

fix: Corrected variable name (#428)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-02 16:32:46 +01:00
committed by GitHub
parent e39483c0f5
commit d42c973369
9 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
game/items/escitems/button.tscn
View File

@@ -65,13 +65,12 @@ tracks/0/keys = {
}
[node name="button" type="Area2D"]
pause_mode = 1
script = ExtResource( 1 )
tooltip_name = "Button"
default_action = "use"
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 0, 0 )
}
animations = null
[node name="lines" type="Line2D" parent="."]
position = Vector2( 0, -266.591 )

2
game/items/inventory/r5_empty_sheet.tscn
View File

@@ -14,7 +14,7 @@ esc_script = "res://game/items/inventory/empty_sheet.esc"
tooltip_name = "Empty sheet"
default_action = "look"
default_action_inventory = "look"
combine_if_action_used_among = PoolStringArray( "use", "give" )
combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
use_from_inventory_only = true
inventory_texture = ExtResource( 3 )
dialog_color = Color( 1, 1, 1, 1 )

2
game/items/inventory/r5_filled_sheet.tscn
View File

@@ -11,7 +11,7 @@ script = ExtResource( 1 )
global_id = "r5_filled_sheet"
esc_script = "res://game/items/inventory/filled_sheet.esc"
tooltip_name = "Filled sheet"
combine_if_action_used_among = PoolStringArray( "use", "give" )
combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
combine_is_one_way = true
use_from_inventory_only = true
inventory_texture = ExtResource( 3 )

2
game/items/inventory/r5_pen.tscn
View File

@@ -14,7 +14,7 @@ esc_script = "res://game/items/inventory/pen.esc"
tooltip_name = "Pen"
default_action = "look"
default_action_inventory = "look"
combine_if_action_used_among = PoolStringArray( "use", "give" )
combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
use_from_inventory_only = true
inventory_texture = ExtResource( 1 )
dialog_color = Color( 1, 1, 1, 1 )

2
game/items/inventory/r5_wrench.tscn
View File

@@ -14,7 +14,7 @@ esc_script = "res://game/items/inventory/wrench.esc"
tooltip_name = "Wrench"
default_action = "look"
default_action_inventory = "look"
combine_if_action_used_among = PoolStringArray( "use" )
combine_when_selected_action_is_in = PoolStringArray( "use" )
use_from_inventory_only = true
inventory_texture = ExtResource( 3 )
dialog_color = Color( 1, 1, 1, 1 )

2
game/items/inventory/r9_bottle.tscn
View File

@@ -15,7 +15,7 @@ esc_script = "res://game/items/inventory/bottle.esc"
tooltip_name = "Bottle"
default_action = "pickup"
default_action_inventory = "look"
combine_if_action_used_among = PoolStringArray( "use" )
combine_when_selected_action_is_in = PoolStringArray( "use" )
use_from_inventory_only = true
inventory_texture = ExtResource( 1 )
dialog_color = Color( 1, 1, 1, 1 )