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 )

game/rooms/room05/esc/pipe.esc

@@ -0,0 +1,22 @@
+:look
+> [eq r5_dialog_advance 0]
+	say player "It's a leaking pipe."
+	set_global r5_dialog_advance 1
+	stop
+> [eq r5_dialog_advance 1]
+	say player "I don't think I can turn off the water with my hands."
+	stop
+> [eq r5_dialog_advance 2]
+	say player "I already turned the water off."
+	stop
+	
+:use r5_wrench
+> [eq r5_dialog_advance 2]
+	say player "I already fixed the water leak."
+	stop
+accept_input SKIP
+set_state r5_pipe stop_water
+set_global r5_pipe_broken false
+say player "The leak's now fixed."
+set_global r5_dialog_advance 2
+accept_input ALL

game/rooms/room05/esc/room05.esc

@@ -1,9 +1,25 @@
-:setup
+# Setup will run every time you enter the room, before the player
+# can see the room.
 
+:setup
+> [!room5_visited]
+	# This runs only the first time the room is ever opened.
+	# That way, if you fix the pipe then leave the room, this will not
+	# break the pipe when you come back
+	set_global room5_visited true
+	set_global r5_pipe_broken true
+	set_global r5_dialog_advance 0
 
 # Disable wrench item if present in the inventory
 > [i/r5_wrench]
 	set_active r5_wrench false
+	
+> [r5_pipe_broken]
+	set_state r5_pipe start_water
+
+> [!r5_pipe_broken]
+	set_state r5_pipe stop_water
+	
 
 # Disable pen item if present in the inventory
 > [i/r5_pen]
@@ -13,6 +29,12 @@
 > [i/r5_empty_sheet]
 	set_active r5_empty_sheet false
 
+# Disable both the pen and sheet if the completed form is present in the inventory
+> [i/r5_filled_sheet]
+	set_active r5_pen false
+	set_active r5_empty_sheet false
+
+	
 # Manage player position depending on where he comes from
 > [eq ESC_LAST_SCENE room4]
 	teleport player r5_l_exit
@@ -25,11 +47,3 @@
 	set_angle player 270
 	stop
 
-
-#walk player r5_wrench
-#set_global i/r5_wrench true
-#set_active r5_wrench false
-#set_global i/r5_pen true
-#set_active r5_pen false
-#set_global i/r5_empty_sheet true
-#set_active r5_empty_sheet false

game/rooms/room05/esc/wall_item.esc

@@ -1,23 +0,0 @@
-:look
-> [! dialog_advance]
-	say player "I don't know what that stuff is."
-	set_global dialog_advance 1
-	stop
-> [eq dialog_advance 1]
-	say player "I REALLY don't know what that stuff is."
-	set_global dialog_advance 2
-	stop
-> [eq dialog_advance 2]
-	say player "No, SERIOUSLY, I have no idea what that is!"
-	set_angle player 180
-	say player "Please stop asking me that!"
-	stop
-
-
-:use r5_wrench
-> [r5_wall_item_state_round]
-	set_state r5_wall_item state_square	
-	set_global r5_wall_item_state_round false
-	stop
-set_state r5_wall_item state_round
-set_global r5_wall_item_state_round true

game/rooms/room05/room05.tscn

@@ -1,21 +1,64 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
-[ext_resource path="res://game/rooms/room05/background.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/items/inventory/r5_empty_sheet.tscn" type="PackedScene" id=2]
 [ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
 [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
-[ext_resource path="res://game/rooms/room05/item_wall/item_wall.tscn" type="PackedScene" id=5]
+[ext_resource path="res://game/items/inventory/r5_pen.tscn" type="PackedScene" id=5]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
 [ext_resource path="res://game/items/inventory/r5_wrench.tscn" type="PackedScene" id=8]
-[ext_resource path="res://game/items/inventory/r5_empty_sheet.tscn" type="PackedScene" id=9]
-[ext_resource path="res://game/items/inventory/r5_pen.tscn" type="PackedScene" id=10]
+[ext_resource path="res://game/rooms/room05/water_droplet.png" type="Texture" id=9]
 [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=11]
+[ext_resource path="res://game/rooms/room05/room5background.png" type="Texture" id=13]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=15]
 
 [sub_resource type="NavigationPolygon" id=1]
-vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, 129.634, 615.792, 1143.08, 613.35, -9.16094, 803.802, 84.5821, 654.06, -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698 )
-polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 0, 3, 6, 7 ), PoolIntArray( 7, 6, 8, 9, 10 ) ]
-outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 1143.08, 613.35, 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, -9.16094, 803.802 ) ]
+vertices = PoolVector2Array( 1187, 641, 1182.53, 588.863, 1269.59, 622.872, 1267, 801, 12, 706, 15, 646, 93, 610, 96, 642, 15, 802, 129.634, 615.792, 1155, 615 )
+polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7, 8 ), PoolIntArray( 9, 10, 0, 3, 8, 7 ) ]
+outlines = [ PoolVector2Array( 12, 706, 15, 646, 93, 610, 96, 642, 129.634, 615.792, 1155, 615, 1187, 641, 1182.53, 588.863, 1269.59, 622.872, 1267, 801, 15, 802 ) ]
+
+[sub_resource type="RectangleShape2D" id=5]
+extents = Vector2( 36, 33.5 )
+
+[sub_resource type="Animation" id=7]
+resource_name = "start_water"
+tracks/0/type = "value"
+tracks/0/path = NodePath("Particles2D:emitting")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
+
+[sub_resource type="Animation" id=8]
+resource_name = "stop_water"
+tracks/0/type = "value"
+tracks/0/path = NodePath("Particles2D:emitting")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
+[sub_resource type="ParticlesMaterial" id=6]
+flag_disable_z = true
+gravity = Vector3( 0, 98, 0 )
+initial_velocity = -30.0
+angular_velocity = 61.72
+orbit_velocity = 0.0
+orbit_velocity_random = 0.0
+angle = -90.0
 
 [node name="room5" type="Node2D"]
 script = ExtResource( 6 )
@@ -27,60 +70,78 @@ esc_script = "res://game/rooms/room05/esc/room05.esc"
 player_scene = ExtResource( 4 )
 camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
 
-[node name="background" parent="." instance=ExtResource( 2 )]
-
-[node name="pickup_use_on_bg" type="Line2D" parent="background"]
-points = PoolVector2Array( 99.3224, 482.72, 172.739, 399.96, 402.331, 399.96, 387.648, 484.055, 100.657, 482.72 )
-
-[node name="Label" type="Label" parent="background/pickup_use_on_bg"]
-margin_left = 142.828
-margin_top = 492.556
-margin_right = 366.828
-margin_bottom = 506.556
-custom_fonts/font = ExtResource( 3 )
-text = "Pickup & use on background object"
+[node name="ESCBackground" type="TextureRect" parent="."]
+margin_right = 1280.0
+margin_bottom = 550.0
+mouse_filter = 2
+texture = ExtResource( 13 )
+script = ExtResource( 15 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="pickup_combine" type="Line2D" parent="background"]
-position = Vector2( 722.148, 0 )
-points = PoolVector2Array( 124.684, 481.385, 105.997, 402.63, 402.331, 399.96, 455.724, 484.055, 122.015, 482.72 )
-
-[node name="Label" type="Label" parent="background/pickup_combine"]
-margin_left = 142.828
-margin_top = 492.556
-margin_right = 366.828
-margin_bottom = 506.556
+[node name="Label" type="Label" parent="ESCBackground"]
+margin_left = 141.0
+margin_top = 7.0
+margin_right = 427.0
+margin_bottom = 124.0
 custom_fonts/font = ExtResource( 3 )
-text = "Pickup & combine together in enventory
-Note: you can combine in both directions"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+text = "This room demonstrates inventory
+objects. Use the wrench to fix the pipe.
+Combine the pen and paper in your
+inventory to create a new object which
+will be used in the next room."
 
-[node name="Label" type="Label" parent="background"]
-margin_left = 297.669
-margin_top = 137.488
-margin_right = 514.669
-margin_bottom = 151.488
+[node name="Label4" type="Label" parent="ESCBackground"]
+margin_left = 138.0
+margin_top = 136.0
+margin_right = 580.0
+margin_bottom = 301.0
 custom_fonts/font = ExtResource( 3 )
-text = "Look at this object multiple times"
-__meta__ = {
-"_edit_use_anchors_": false
-}
+text = "One of the settings inside Godot's settings is 
+\"Escoria/UI/Items autoregister path\".
+Inventory items need to be ESCItems saved as 
+scenes, and these scenes need to be located in this path.
+If you use the command \"inventory_add xyz\", this will
+automatically instantiate the xyz object from this folder 
+into your inventory."
 
-[node name="room_label" type="Label" parent="background"]
-margin_right = 62.0
-margin_bottom = 16.0
+[node name="room_label" type="Label" parent="ESCBackground"]
+margin_right = 82.0
+margin_bottom = 21.0
 custom_fonts/font = ExtResource( 3 )
 text = "ROOM 5"
 
+[node name="Label2" type="Label" parent="ESCBackground"]
+margin_left = 142.828
+margin_top = 492.556
+margin_right = 410.828
+margin_bottom = 513.556
+custom_fonts/font = ExtResource( 3 )
+text = "Pickup & use on pipe
+"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Label3" type="Label" parent="ESCBackground"]
+margin_left = 844.0
+margin_top = 470.0
+margin_right = 1212.0
+margin_bottom = 515.0
+custom_fonts/font = ExtResource( 3 )
+text = "Pickup & combine these together in the inventory
+Note: you can combine in both directions
+(i.e. pen with paper, or paper with pen)"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="walkable_area" type="Navigation2D" parent="."]
 script = ExtResource( 1 )
 
 [node name="platform" type="NavigationPolygonInstance" parent="walkable_area"]
-position = Vector2( 6.73163, -264.779 )
+position = Vector2( 1, -264 )
 navpoly = SubResource( 1 )
 __meta__ = {
 "_editor_description_": ""
@@ -99,10 +160,11 @@ dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"]
-polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 )
+position = Vector2( 53, -12 )
+polygon = PoolVector2Array( -52, 432, -53, 121, 53, 79, 55, 365 )
 
 [node name="Position2D" type="Position2D" parent="Hotspots/l_door"]
-position = Vector2( 37.4521, 392.045 )
+position = Vector2( 57, 381 )
 script = ExtResource( 11 )
 
 [node name="r_door" type="Area2D" parent="Hotspots"]
@@ -117,41 +179,47 @@ dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"]
-polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 )
+polygon = PoolVector2Array( 1174, 358, 1175, 62, 1280, 109, 1280, 419 )
 
 [node name="Position2D" type="Position2D" parent="Hotspots/r_door"]
-position = Vector2( 1225.47, 353.99 )
+position = Vector2( 1228, 382 )
 script = ExtResource( 11 )
 
-[node name="item_wall" parent="Hotspots" instance=ExtResource( 5 )]
+[node name="pipe" type="Area2D" parent="Hotspots"]
 pause_mode = 1
-position = Vector2( 2.37842, -254.49 )
-global_id = "r5_wall_item"
-esc_script = "res://game/rooms/room05/esc/wall_item.esc"
-tooltip_name = "Item on the wall"
+position = Vector2( -7, -1 )
+script = ExtResource( 7 )
+global_id = "r5_pipe"
+esc_script = "res://game/rooms/room05/esc/pipe.esc"
+tooltip_name = "pipe"
 default_action = "look"
+dialog_color = Color( 1, 1, 1, 1 )
 animations = null
 
-[node name="Position2D" type="Position2D" parent="Hotspots/item_wall"]
-position = Vector2( 620.135, 613.652 )
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/pipe"]
+position = Vector2( 618, 243.5 )
+shape = SubResource( 5 )
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/pipe"]
+anims/start_water = SubResource( 7 )
+anims/stop_water = SubResource( 8 )
+
+[node name="Particles2D" type="Particles2D" parent="Hotspots/pipe"]
+position = Vector2( 593, 244 )
+emitting = false
+lifetime = 1.5
+process_material = SubResource( 6 )
+texture = ExtResource( 9 )
+
+[node name="ESCLocation" type="Position2D" parent="Hotspots/pipe"]
+position = Vector2( 625, 393 )
 script = ExtResource( 11 )
-__meta__ = {
-"_editor_description_": ""
-}
 
 [node name="wrench" parent="Hotspots" instance=ExtResource( 8 )]
-position = Vector2( 257.269, 435.892 )
-interaction_direction = 2
 
-[node name="Position2D" type="Position2D" parent="Hotspots/wrench"]
-position = Vector2( -77.4207, 0 )
-script = ExtResource( 11 )
+[node name="paper" parent="Hotspots" instance=ExtResource( 2 )]
 
-[node name="pen" parent="Hotspots" instance=ExtResource( 10 )]
-position = Vector2( 909.908, 443.451 )
-
-[node name="empty_sheet" parent="Hotspots" instance=ExtResource( 9 )]
-position = Vector2( 1059.84, 440.932 )
+[node name="pen" parent="Hotspots" instance=ExtResource( 5 )]
 
 [node name="player_start" type="Position2D" parent="."]
 position = Vector2( 76.7617, 437.649 )