feat: Rewrote inventory handling basing on ESCItems (#417)
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
GitHub
@@ -1,10 +0,0 @@
|
||||
:look
|
||||
say player "It's a bottle."
|
||||
stop
|
||||
|
||||
:pickup
|
||||
inventory_add r9_bottle
|
||||
set_active r9_bottle_left false
|
||||
set_active r9_bottle_middle false
|
||||
set_active r9_bottle_right false
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
:look
|
||||
say player "It's a sheet of blank paper."
|
||||
stop
|
||||
|
||||
:pickup
|
||||
set_global i/r5_empty_sheet true
|
||||
set_active r5_empty_sheet false
|
||||
|
||||
|
||||
# The following action is deactivated because r5_pen ESXC script holds a similar action that is configured as one-way
|
||||
# You can try to uncomment this action here and test that action will work in both ways but with slightly different execution
|
||||
#:use r5_pen
|
||||
#say player "Ok, let's write down something on this paper."
|
||||
#set_angle player 0
|
||||
#wait 2
|
||||
#set_angle player 180
|
||||
#say player "Alright! I wrote something on it."
|
||||
#set_global i/r5_empty_sheet false
|
||||
#set_global i/r5_filled_sheet true
|
||||
@@ -1,5 +0,0 @@
|
||||
:look
|
||||
say player "'Dear Escoria developer: I hope you're having fun right now!'"
|
||||
stop
|
||||
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
:look
|
||||
say player "It's a pen."
|
||||
stop
|
||||
|
||||
:pickup
|
||||
set_global i/r5_pen true
|
||||
set_active r5_pen false
|
||||
|
||||
:use r5_empty_sheet
|
||||
say player "So, let's see..."
|
||||
#set_global i/r5_pen false
|
||||
inventory_remove r5_pen
|
||||
#set_global i/r5_empty_sheet false
|
||||
inventory_remove r5_empty_sheet
|
||||
#set_global i/r5_filled_sheet true
|
||||
inventory_add r5_filled_sheet
|
||||
@@ -1,28 +0,0 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://game/items/inventory/empty_sheet.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
|
||||
[ext_resource path="res://game/rooms/room05/items/empty_sheet.png" type="Texture" id=3]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 86.9568, 115.211 )
|
||||
|
||||
[node name="empty_sheet" type="Area2D"]
|
||||
script = ExtResource( 2 )
|
||||
global_id = "r5_empty_sheet"
|
||||
esc_script = "res://game/items/escitems/empty_sheet.esc"
|
||||
tooltip_name = "Empty sheet"
|
||||
default_action = "look"
|
||||
default_action_inventory = "look"
|
||||
combine_if_action_used_among = PoolStringArray( "use", "give" )
|
||||
use_from_inventory_only = true
|
||||
inventory_item_scene_file = ExtResource( 1 )
|
||||
dialog_color = Color( 1, 1, 1, 1 )
|
||||
|
||||
[node name="sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 3 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
rotation = 0.0218604
|
||||
scale = Vector2( 0.683022, 0.519355 )
|
||||
shape = SubResource( 1 )
|
||||
@@ -1,22 +0,0 @@
|
||||
[gd_scene load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1]
|
||||
[ext_resource path="res://game/items/inventory/filled_sheet.tscn" type="PackedScene" id=2]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
|
||||
[node name="filled_sheet" type="Area2D"]
|
||||
script = ExtResource( 1 )
|
||||
global_id = "r5_filled_sheet"
|
||||
esc_script = "res://game/items/escitems/filled_sheet.esc"
|
||||
tooltip_name = "Filled sheet"
|
||||
combine_if_action_used_among = PoolStringArray( "use", "give" )
|
||||
combine_is_one_way = true
|
||||
use_from_inventory_only = true
|
||||
inventory_item_scene_file = ExtResource( 2 )
|
||||
dialog_color = Color( 1, 1, 1, 1 )
|
||||
|
||||
[node name="sprite" type="Sprite" parent="."]
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource( 1 )
|
||||
@@ -1,26 +0,0 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://game/rooms/room05/items/pen.png" type="Texture" id=1]
|
||||
[ext_resource path="res://game/items/inventory/pen.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 51.8881, 43.8187 )
|
||||
|
||||
[node name="pen" type="Area2D"]
|
||||
script = ExtResource( 3 )
|
||||
global_id = "r5_pen"
|
||||
esc_script = "res://game/items/escitems/pen.esc"
|
||||
tooltip_name = "Pen"
|
||||
default_action = "look"
|
||||
default_action_inventory = "look"
|
||||
combine_if_action_used_among = PoolStringArray( "use", "give" )
|
||||
use_from_inventory_only = true
|
||||
inventory_item_scene_file = ExtResource( 2 )
|
||||
dialog_color = Color( 1, 1, 1, 1 )
|
||||
|
||||
[node name="sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 1 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource( 1 )
|
||||
@@ -1,26 +0,0 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://game/items/inventory/wrench.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
|
||||
[ext_resource path="res://game/rooms/room05/items/wrench.png" type="Texture" id=3]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 44.696, 49.0953 )
|
||||
|
||||
[node name="wrench" type="Area2D"]
|
||||
script = ExtResource( 2 )
|
||||
global_id = "r5_wrench"
|
||||
esc_script = "res://game/items/escitems/wrench.esc"
|
||||
tooltip_name = "Wrench"
|
||||
default_action = "look"
|
||||
default_action_inventory = "look"
|
||||
combine_if_action_used_among = PoolStringArray( "use" )
|
||||
use_from_inventory_only = true
|
||||
inventory_item_scene_file = ExtResource( 1 )
|
||||
dialog_color = Color( 1, 1, 1, 1 )
|
||||
|
||||
[node name="sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 3 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource( 1 )
|
||||
@@ -1,29 +0,0 @@
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://game/items/textures/genericItem_color_127.png" type="Texture" id=1]
|
||||
[ext_resource path="res://game/items/inventory/bottle.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 28.3873, 74.7806 )
|
||||
|
||||
[node name="bottle" type="Area2D"]
|
||||
pause_mode = 1
|
||||
z_index = 1
|
||||
script = ExtResource( 3 )
|
||||
global_id = "r9_bottle"
|
||||
esc_script = "res://game/items/escitems/bottle.esc"
|
||||
tooltip_name = "Bottle"
|
||||
default_action = "pickup"
|
||||
default_action_inventory = "look"
|
||||
combine_if_action_used_among = PoolStringArray( "use" )
|
||||
use_from_inventory_only = true
|
||||
inventory_item_scene_file = ExtResource( 2 )
|
||||
dialog_color = Color( 1, 1, 1, 1 )
|
||||
animations = null
|
||||
|
||||
[node name="sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 1 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource( 1 )
|
||||
@@ -1,10 +0,0 @@
|
||||
:look
|
||||
say player "That's a wrench on the floor." [!i/r5_wrench]
|
||||
say player "It seems even more useful now that I picked it up." [i/r5_wrench]
|
||||
stop
|
||||
|
||||
:pickup
|
||||
set_global i/r5_wrench true
|
||||
set_active r5_wrench false
|
||||
|
||||
|
||||
Reference in New Issue
Block a user