Added hover stack to manage overlapping Area2Ds

Added room selector in demo scenes
Modified dialogues in room 1, fixed bug in room 8 and 9
This commit is contained in:
Julian Murgia
2021-02-03 17:26:12 +01:00
parent b789490f63
commit bd3ef71c80
33 changed files with 253 additions and 202 deletions

View File

@@ -20,3 +20,6 @@ points = PoolVector2Array( 2.86993, 4.8189, 2.86993, 53.646, 50.8979, 53.9476, 5
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 26.9811, 29.4218 )
shape = SubResource( 1 )
[node name="dialog_position" type="Position2D" parent="."]
position = Vector2( 22.0044, -141.187 )

View File

@@ -1,5 +1,27 @@
:look
say player "That button must activate the bridge."
> [! r2_look_dialog_advance]
say player "That button must activate the bridge."
set_global r2_look_dialog_advance 1
stop
> [eq r2_look_dialog_advance 1]
say player "I already said that this button must activate the bridge."
set_global r2_look_dialog_advance 2
stop
> [eq r2_look_dialog_advance 2]
set_angle player 180
say player "Listen closely."
say player "This"
say player "button"
say player "must"
say player "activate"
say player "the bridge."
set_global r2_look_dialog_advance 3
stop
> [eq r2_look_dialog_advance 3]
say player "I give up."
say player "<sob>"
stop
:push
say player "I must USE this."

View File

@@ -53,6 +53,7 @@ script = ExtResource( 7 )
global_id = "r2_r_exit"
esc_script = "res://game/rooms/room2/esc/right_exit.esc"
is_exit = true
tooltip_name = "Right exit"
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 1225.47, 353.99 )
@@ -69,6 +70,7 @@ script = ExtResource( 7 )
global_id = "r2_l_exit"
esc_script = "res://game/rooms/room2/esc/left_exit.esc"
is_exit = true
tooltip_name = "Left exit"
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 52.1462, 384.691 )
@@ -84,6 +86,7 @@ position = Vector2( 52.1462, 384.691 )
position = Vector2( 958.107, 176.401 )
global_id = "r2_button_right"
esc_script = "res://game/rooms/room2/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
interact_positions = {
"default": Vector2( 987.537, 371.812 )
}
@@ -98,6 +101,7 @@ __meta__ = {
position = Vector2( 288.82, 171.439 )
global_id = "r2_button"
esc_script = "res://game/rooms/room2/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
interact_positions = {
"default": Vector2( 313.488, 368.437 )
}

View File

@@ -75,7 +75,7 @@ __meta__ = {
"_edit_vertical_guides_": [ ]
}
global_id = "room8"
esc_script = "res://game/rooms/room1/esc/room1.esc"
esc_script = "res://game/rooms/room8/esc/room8.esc"
player_scene = ExtResource( 4 )
camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]

View File

@@ -46,6 +46,18 @@ tracks/2/keys = {
"update": 1,
"values": [ false ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("statue:visible")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=4]
length = 0.5
@@ -85,6 +97,18 @@ tracks/2/keys = {
"update": 1,
"values": [ false ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("statue:visible")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=5]
length = 0.5
@@ -124,6 +148,18 @@ tracks/2/keys = {
"update": 1,
"values": [ true ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("statue:visible")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
[node name="closet" type="Area2D"]
script = ExtResource( 1 )
@@ -185,20 +221,24 @@ default_color = Color( 0.4, 0.501961, 1, 1 )
color = Color( 0.4, 0.501961, 1, 1 )
polygon = PoolVector2Array( 1.07718, 7.2891, -37.6216, 23.335, -37.6216, 328.206, 2.02106, 302.722 )
[node name="statue" type="Area2D" parent="base/open_object"]
[node name="statue" type="Area2D" parent="."]
visible = false
position = Vector2( 1.12247, 0 )
z_index = 1
script = ExtResource( 1 )
global_id = "statue"
tooltip_name = "Statue"
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 59.3937, 58.8658 )
}
[node name="object" type="Polygon2D" parent="base/open_object/statue"]
[node name="object" type="Polygon2D" parent="statue"]
position = Vector2( 1.18921, 7.13524 )
color = Color( 0.662745, 0.529412, 0, 1 )
polygon = PoolVector2Array( 52.338, 36.2829, 57.6774, 26.2716, 62.3493, 36.9503, 70.3583, 35.6154, 70.692, 27.2727, 76.3651, 26.6053, 76.3651, 29.9424, 72.9964, 30.7421, 72.9964, 39.2744, 61.4878, 45.624, 69.2264, 73.602, 43.4311, 73.4035, 53.7492, 45.4256, 41.4468, 39.8697, 41.6453, 31.139, 37.8752, 30.3453, 37.6768, 26.5752, 44.4232, 27.7657, 44.4232, 34.1154 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="base/open_object/statue"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="statue"]
position = Vector2( 58.2712, 58.8658 )
shape = SubResource( 1 )

View File

@@ -2,6 +2,10 @@
:open
> [left_closet_open]
stop
set_global left_closet_open true
inc_global open_closets 1
> [lt open_closets 3]

View File

@@ -2,6 +2,10 @@
:open
> [middle_closet_open]
stop
set_global middle_closet_open true
inc_global open_closets 1
> [lt open_closets 3]

View File

@@ -2,6 +2,10 @@
:open
> [right_closet_open]
stop
set_global right_closet_open true
inc_global open_closets 1
> [lt open_closets 3]

View File

@@ -1,2 +1,2 @@
:exit_scene
change_scene "res://game/rooms/room7/room7.tscn"
change_scene "res://game/rooms/room8/room8.tscn"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/empty_sheet.png-76792812151af35ec4a677d2674810fc.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://game/rooms/room9/items/empty_sheet.png"
dest_files=[ "res://.import/empty_sheet.png-76792812151af35ec4a677d2674810fc.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/filled_sheet.png-b2986fedd542821915ec877a570a0934.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://game/rooms/room9/items/filled_sheet.png"
dest_files=[ "res://.import/filled_sheet.png-b2986fedd542821915ec877a570a0934.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 918 B

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/pen.png-185eba49da7d77d331c5119550be859c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://game/rooms/room9/items/pen.png"
dest_files=[ "res://.import/pen.png-185eba49da7d77d331c5119550be859c.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 857 B

View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/wrench.png-cd78241d27aa0dc800a83edce9459724.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://game/rooms/room9/items/wrench.png"
dest_files=[ "res://.import/wrench.png-cd78241d27aa0dc800a83edce9459724.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0