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

Added management of overlapped item in room 9.

Browse Source
This commit is contained in:
Julian Murgia
2021-02-03 22:40:50 +01:00
parent 89d52c32f8
commit 4f2977ea98
9 changed files with 89 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
game/items/ESCORIA_ALL_ITEMS.tscn
View File

@@ -1,29 +1,31 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://game/items/escitems/empty_sheet_escitem.tscn" type="PackedScene" id=1]
[ext_resource path="res://game/items/escitems/pen_escitem.tscn" type="PackedScene" id=2]
[ext_resource path="res://game/items/escitems/wrench_escitem.tscn" type="PackedScene" id=3]
[ext_resource path="res://game/items/escitems/filled_sheet_escitem.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/items_inventory.gd" type="Script" id=5]
[ext_resource path="res://game/items/escitems/bottle_escitem.tscn" type="PackedScene" id=6]
[node name="ESCORIA_ALL_ITEMS" type="Node2D"]
visible = false
script = ExtResource( 5 )
[node name="empty_sheet" parent="." instance=ExtResource( 1 )]
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 0, 0 )
}
[node name="filled_sheet" parent="." instance=ExtResource( 4 )]
position = Vector2( -29.7823, 133.569 )
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( -29.7823, 133.569 )
}
[node name="pen" parent="." instance=ExtResource( 2 )]
position = Vector2( 136.277, 13.5374 )
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 136.277, 13.5374 )
}
@@ -33,3 +35,9 @@ position = Vector2( 293.311, 2.70747 )
interact_positions = {
"default": Vector2( 293.311, 2.70747 )
}
[node name="bottle" parent="." instance=ExtResource( 6 )]
position = Vector2( 59.4604, 167.678 )
interact_positions = {
"default": Vector2( 0, 0 )
}

8
game/items/escitems/bottle.esc Executable file
View File

@@ -0,0 +1,8 @@
:look
say player "It's a bottle."
stop
:pickup
inventory_add r9_bottle true
set_active r9_bottle false

28
game/items/escitems/bottle_escitem.tscn Normal file
View File

@@ -0,0 +1,28 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/escitem.gd" type="Script" id=1]
[ext_resource path="res://game/items/textures/genericItem_color_127.png" type="Texture" id=2]
[ext_resource path="res://game/items/inventory/bottle_escinventoryitem.tscn" type="PackedScene" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 28.3873, 74.7806 )
[node name="bottle" type="Area2D"]
z_index = 1
script = ExtResource( 1 )
global_id = "r9_bottle"
esc_script = "res://game/items/escitems/bottle.esc"
tooltip_name = "Bottle"
default_action = "pickup"
use_from_inventory_only = true
inventory_item_scene_file = ExtResource( 3 )
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 59.3937, 58.8658 )
}
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )

14
game/items/inventory/bottle_escinventoryitem.tscn Normal file
View File

@@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://game/items/textures/genericItem_color_127.png" type="Texture" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/inventory_item.gd" type="Script" id=2]
[node name="empty_sheet" type="TextureButton"]
margin_right = 50.0
margin_bottom = 140.0
texture_normal = ExtResource( 1 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
global_id = "r9_bottle"