feat: Graphics update for room 5 (#525)

Co-authored-by: Balloonpopper <balloonpopper@git.com>

game/items/inventory/empty_sheet.esc

@@ -1,13 +1,15 @@
+# You can only combine the pen and paperif you add "use" as a "Combine when Selected Action in" action
+# to both the pen and empty_sheet ESCitems.
 :look
-say player "It's a sheet of blank paper."
+say player "It's an application form for a job as an adventurer."
 stop
 
 :pickup
-set_global i/r5_empty_sheet true
+inventory_add r5_empty_sheet 
 set_active r5_empty_sheet false
+stop
 
-
-# The following action is deactivated because r5_pen ESXC script holds a similar action that is configured as one-way
+# The following action is deactivated because r5_pen ESC script holds a similar action that is configured as two-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."

game/items/inventory/filled_sheet.esc

@@ -1,5 +1,6 @@
 :look
-say player "'Dear Escoria developer: I hope you're having fun right now!'"
+say player "It's my application form for a job as an adventurer."
+say player "I hope I filled everything out right."
 stop
 
 

game/items/inventory/pen.esc

@@ -3,14 +3,23 @@ say player "It's a pen."
 stop
 
 :pickup
-set_global i/r5_pen true
+# Add the pen to the inventory
+inventory_add r5_pen
+# Hide the pen graphic in the room
 set_active r5_pen false
+stop
 
+# This only works if you add "use" as a "Combine when Selected Action in" action
+# to both the pen and empty_sheet ESCitems.
 :use r5_empty_sheet
-say player "So, let's see..."
-#set_global i/r5_pen false
+# Dont let the player interrupt the sequence
+accept_input SKIP
 inventory_remove r5_pen
-#set_global i/r5_empty_sheet false
 inventory_remove r5_empty_sheet
-#set_global i/r5_filled_sheet true
+say player "Hmmm..."
+say player "Name..."
+say player "Address..."
 inventory_add r5_filled_sheet
+# Allow player interaction again
+accept_input ALL
+stop

game/items/inventory/r5_empty_sheet.tscn

@@ -1,29 +1,30 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
-[ext_resource path="res://game/items/inventory/empty_sheet.png" type="Texture" id=3]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1]
+[ext_resource path="res://game/rooms/room05/clipboard.png" type="Texture" id=2]
 
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 86.9568, 115.211 )
+[sub_resource type="RectangleShape2D" id=4]
+extents = Vector2( 34.5, 45 )
 
-[node name="empty_sheet" type="Area2D"]
+[node name="paper" type="Area2D"]
 pause_mode = 1
-script = ExtResource( 2 )
+script = ExtResource( 1 )
 global_id = "r5_empty_sheet"
 esc_script = "res://game/items/inventory/empty_sheet.esc"
-tooltip_name = "Empty sheet"
+player_orients_on_arrival = false
+tooltip_name = "application form"
 default_action = "look"
 default_action_inventory = "look"
-combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
+combine_when_selected_action_is_in = PoolStringArray( "use" )
 use_from_inventory_only = true
-inventory_texture = ExtResource( 3 )
+inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
-[node name="sprite" type="Sprite" parent="."]
-texture = ExtResource( 3 )
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( 1038.5, 424 )
+texture = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-rotation = 0.0218604
-scale = Vector2( 0.683022, 0.519355 )
-shape = SubResource( 1 )
+position = Vector2( 1039, 424 )
+shape = SubResource( 4 )

game/items/inventory/r5_filled_sheet.tscn

@@ -10,7 +10,7 @@ pause_mode = 1
 script = ExtResource( 1 )
 global_id = "r5_filled_sheet"
 esc_script = "res://game/items/inventory/filled_sheet.esc"
-tooltip_name = "Filled sheet"
+tooltip_name = "completed application form"
 combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
 combine_is_one_way = true
 use_from_inventory_only = true

game/items/inventory/r5_pen.tscn

@@ -3,25 +3,29 @@
 [ext_resource path="res://game/items/inventory/pen.png" type="Texture" id=1]
 [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 )
+[sub_resource type="RectangleShape2D" id=4]
+extents = Vector2( 34.5, 45 )
 
 [node name="pen" type="Area2D"]
 pause_mode = 1
+position = Vector2( -103, 0 )
 script = ExtResource( 3 )
 global_id = "r5_pen"
 esc_script = "res://game/items/inventory/pen.esc"
-tooltip_name = "Pen"
+player_orients_on_arrival = false
+tooltip_name = "pen"
 default_action = "look"
 default_action_inventory = "look"
-combine_when_selected_action_is_in = PoolStringArray( "use", "give" )
+combine_when_selected_action_is_in = PoolStringArray( "use" )
 use_from_inventory_only = true
 inventory_texture = ExtResource( 1 )
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
-[node name="sprite" type="Sprite" parent="."]
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( 1038.5, 424 )
 texture = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
+position = Vector2( 1039, 424 )
+shape = SubResource( 4 )

game/items/inventory/r5_wrench.tscn

@@ -1,14 +1,15 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=2]
-[ext_resource path="res://game/items/inventory/wrench.png" type="Texture" id=3]
+[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=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( 44.696, 49.0953 )
+[sub_resource type="RectangleShape2D" id=2]
+extents = Vector2( 37, 33.5 )
 
 [node name="wrench" type="Area2D"]
 pause_mode = 1
-script = ExtResource( 2 )
+script = ExtResource( 3 )
 global_id = "r5_wrench"
 esc_script = "res://game/items/inventory/wrench.esc"
 tooltip_name = "Wrench"
@@ -16,12 +17,18 @@ default_action = "look"
 default_action_inventory = "look"
 combine_when_selected_action_is_in = PoolStringArray( "use" )
 use_from_inventory_only = true
-inventory_texture = ExtResource( 3 )
+inventory_texture = ExtResource( 1 )
 dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
-[node name="sprite" type="Sprite" parent="."]
-texture = ExtResource( 3 )
+[node name="Sprite" type="Sprite" parent="."]
+position = Vector2( 262, 436 )
+texture = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
+position = Vector2( 261, 435.5 )
+shape = SubResource( 2 )
+
+[node name="ESCLocation" type="Position2D" parent="."]
+position = Vector2( 258, 486 )
+script = ExtResource( 2 )