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

feat: Updated room 2 and 3 graphics (#492)

Browse Source 
Co-authored-by: Balloonpopper <balloonpopper@git.com>
This commit is contained in:
balloonpopper
2022-02-16 04:21:42 +11:00
committed by GitHub
parent 2384127ca4
commit 09ab75a913
22 changed files with 608 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

358
game/rooms/room02/room02.tscn
View File

@@ -1,34 +1,199 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=21 format=2]
[ext_resource path="res://game/rooms/room02/walkable_area.tscn" type="PackedScene" id=1]
[ext_resource path="res://game/rooms/room02/background.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/room02/button/button.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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=8]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=9]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=10]
[ext_resource path="res://game/rooms/room02/room2background.png" type="Texture" id=11]
[ext_resource path="res://game/rooms/room02/floor3.png" type="Texture" id=12]
[ext_resource path="res://game/rooms/room02/floor1.png" type="Texture" id=13]
[ext_resource path="res://game/rooms/room02/floor4.png" type="Texture" id=14]
[ext_resource path="res://game/rooms/room02/floor2.png" type="Texture" id=15]
[sub_resource type="NavigationPolygon" id=4]
vertices = PoolVector2Array( 10, 378, 86, 337, 88, 374, 8, 545, 121, 355, 488, 354, 409, 546, 1184, 373, 1185, 343, 1272, 393, 1272, 548, 875, 546, 802, 357, 1161, 358 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 3, 2 ), PoolIntArray( 7, 8, 9, 10 ), PoolIntArray( 10, 11, 12, 13, 7 ) ]
outlines = [ PoolVector2Array( 121, 355, 488, 354, 409, 546, 8, 545, 10, 378, 86, 337, 88, 374 ), PoolVector2Array( 802, 357, 875, 546, 1272, 548, 1272, 393, 1185, 343, 1184, 373, 1161, 358 ) ]
[sub_resource type="NavigationPolygon" id=5]
vertices = PoolVector2Array( 10, 378, 88, 335, 86, 373, 8, 542, 1185, 374, 1185, 343, 1270, 395, 1272, 545, 114, 355, 1161, 357 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6 ), PoolIntArray( 6, 7, 3, 4 ), PoolIntArray( 8, 9, 4, 3, 2 ) ]
outlines = [ PoolVector2Array( 88, 335, 86, 373, 114, 355, 1161, 357, 1185, 374, 1185, 343, 1270, 395, 1272, 545, 8, 542, 10, 378 ) ]
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 39, 39.5 )
[sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 39, 39.5 )
[sub_resource type="Animation" id=1]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("ESCBackground/Floor1:position")
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": 0,
"values": [ Vector2( 495, 650 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("ESCBackground/Floor2:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 585, 650 ) ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("ESCBackground/Floor3:position")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ Vector2( 696, 650 ) ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("ESCBackground/Floor4:position")
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": 0,
"values": [ Vector2( 786, 650 ) ]
}
[sub_resource type="Animation" id=3]
resource_name = "bridge_close"
length = 1.6
tracks/0/type = "value"
tracks/0/path = NodePath("ESCBackground/Floor1:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 1 ),
"transitions": PoolRealArray( 0.5, 1 ),
"update": 0,
"values": [ Vector2( 495, 650 ), Vector2( 495, 450 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("ESCBackground/Floor2:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.2, 1.2 ),
"transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0,
"values": [ Vector2( 585, 650 ), Vector2( 585, 650 ), Vector2( 585, 450 ) ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("ESCBackground/Floor4:position")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0, 0.6, 1.6 ),
"transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0,
"values": [ Vector2( 786, 650 ), Vector2( 786, 650 ), Vector2( 786, 450 ) ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("ESCBackground/Floor3:position")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0, 0.4, 1.4 ),
"transitions": PoolRealArray( 1, 0.5, 1 ),
"update": 0,
"values": [ Vector2( 696, 650 ), Vector2( 696, 650 ), Vector2( 696, 450 ) ]
}
[sub_resource type="Animation" id=2]
resource_name = "bridge_open"
length = 1.6
tracks/0/type = "value"
tracks/0/path = NodePath("ESCBackground/Floor1:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.6, 1.6 ),
"transitions": PoolRealArray( 1.94482e-05, 2.05675, 2 ),
"update": 0,
"values": [ Vector2( 495, 450 ), Vector2( 495, 450 ), Vector2( 495, 650 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("ESCBackground/Floor2:position")
tracks/1/interp = 2
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.4, 1.4 ),
"transitions": PoolRealArray( 1e-05, 2, 2 ),
"update": 0,
"values": [ Vector2( 585, 450 ), Vector2( 585, 450 ), Vector2( 585, 650 ) ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("ESCBackground/Floor3:position")
tracks/2/interp = 2
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0, 0.2, 1.2 ),
"transitions": PoolRealArray( 1e-05, 2, 2 ),
"update": 0,
"values": [ Vector2( 696, 450 ), Vector2( 696, 450 ), Vector2( 696, 650 ) ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("ESCBackground/Floor4:position")
tracks/3/interp = 2
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0, 1 ),
"transitions": PoolRealArray( 2.05675, 2 ),
"update": 0,
"values": [ Vector2( 786, 450 ), Vector2( 786, 650 ) ]
}
[sub_resource type="CapsuleShape2D" id=8]
[node name="room2" type="Node2D"]
position = Vector2( -2, 0 )
script = ExtResource( 6 )
global_id = "room2"
esc_script = "res://game/rooms/room02/esc/room02_bridge.esc"
player_scene = ExtResource( 4 )
camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
[node name="walkable_area" parent="." instance=ExtResource( 1 )]
debug_mode = 1
[node name="background" parent="." instance=ExtResource( 2 )]
[node name="room_label" type="Label" parent="background"]
margin_right = 40.0
margin_bottom = 14.0
custom_fonts/font = ExtResource( 3 )
text = "ROOM 2"
__meta__ = {
"_edit_use_anchors_": false
}
editor_debug_mode = 1
[node name="r_platform" type="Area2D" parent="."]
pause_mode = 1
@@ -45,7 +210,7 @@ animations = null
polygon = PoolVector2Array( 870.974, 538.342, 827.536, 353.995, 1181.4, 357.174, 1287.34, 413.325, 1289.46, 545.758 )
[node name="action_pos" type="Position2D" parent="r_platform"]
position = Vector2( 430.893, 451.052 )
position = Vector2( 394, 460 )
script = ExtResource( 8 )
[node name="r_door" type="Area2D" parent="."]
@@ -63,7 +228,7 @@ animations = null
polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 )
[node name="Position2D" type="Position2D" parent="r_door"]
position = Vector2( 1225.47, 353.99 )
position = Vector2( 1227, 387 )
script = ExtResource( 8 )
[node name="l_door" type="Area2D" parent="."]
@@ -84,38 +249,131 @@ polygon = PoolVector2Array( -1.37926, 443.158, 7.96461, 122.796, 84.0504, 77.411
position = Vector2( 52.1462, 384.691 )
script = ExtResource( 8 )
[node name="button_right" parent="." instance=ExtResource( 5 )]
pause_mode = 1
position = Vector2( 958.107, 176.401 )
global_id = "r2_button_right"
esc_script = "res://game/rooms/room02/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_right"]
position = Vector2( 29.4302, 195.411 )
script = ExtResource( 8 )
__meta__ = {
"_editor_description_": ""
}
[node name="button_left" parent="." instance=ExtResource( 5 )]
pause_mode = 1
position = Vector2( 288.82, 171.439 )
global_id = "r2_button"
esc_script = "res://game/rooms/room02/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_left"]
position = Vector2( 24.6681, 196.998 )
script = ExtResource( 8 )
__meta__ = {
"_editor_description_": ""
}
[node name="player_start" type="Position2D" parent="."]
position = Vector2( 76.7617, 437.649 )
script = ExtResource( 8 )
global_id = "r2_player_start"
is_start_location = true
[node name="ESCBackground" type="TextureRect" parent="."]
margin_right = 1280.0
margin_bottom = 550.0
mouse_filter = 2
texture = ExtResource( 11 )
script = ExtResource( 9 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="room_label" type="Label" parent="ESCBackground"]
margin_left = 18.0
margin_top = 12.0
margin_right = 100.0
margin_bottom = 33.0
custom_fonts/font = ExtResource( 3 )
text = "ROOM 2"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Floor1" type="Sprite" parent="ESCBackground"]
position = Vector2( 495, 650 )
texture = ExtResource( 13 )
[node name="Floor2" type="Sprite" parent="ESCBackground"]
position = Vector2( 585, 650 )
texture = ExtResource( 15 )
[node name="Floor4" type="Sprite" parent="ESCBackground"]
position = Vector2( 786, 650 )
texture = ExtResource( 14 )
[node name="Floor3" type="Sprite" parent="ESCBackground"]
position = Vector2( 696, 650 )
scale = Vector2( 1.01351, 1 )
texture = ExtResource( 12 )
[node name="Polygon2D" type="Polygon2D" parent="ESCBackground"]
color = Color( 0, 0, 0, 1 )
polygon = PoolVector2Array( 0, 550, 1280, 550, 1280, 800, 0, 800 )
[node name="room_label2" type="Label" parent="ESCBackground"]
margin_left = 17.0
margin_top = 558.0
margin_right = 99.0
margin_bottom = 579.0
custom_fonts/font = ExtResource( 3 )
text = "Room 2 demonstrates modifying the walkable area of a room. Performing \"use\" on the button will cause the original navmesh (which has a gap
in the middle) with one that covers the whole room (platforms + bridge) - allowing the player to walk from one side to the other.
Setting the state of the r2_bridge variable to \"bridge_open\" or \"bridge_closed\" (see button.esc) automatically runs the animation with the same name."
__meta__ = {
"_edit_use_anchors_": false
}
[node name="walkable_area" type="Navigation2D" parent="."]
script = ExtResource( 10 )
debug_mode = 1
[node name="bridge_open" type="NavigationPolygonInstance" parent="walkable_area"]
navpoly = SubResource( 4 )
[node name="bridge_closed" type="NavigationPolygonInstance" parent="walkable_area"]
visible = false
navpoly = SubResource( 5 )
enabled = false
[node name="button_left" type="Area2D" parent="."]
pause_mode = 1
script = ExtResource( 7 )
global_id = "r2_button"
esc_script = "res://game/rooms/room02/esc/button.esc"
tooltip_name = "button"
default_action = "use"
dialog_color = Color( 0.196078, 1, 0, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_left"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="button_left"]
position = Vector2( 370, 190.5 )
shape = SubResource( 6 )
[node name="ESCLocation" type="Position2D" parent="button_left"]
position = Vector2( 369, 375 )
script = ExtResource( 8 )
[node name="button_right2" type="Area2D" parent="."]
pause_mode = 1
script = ExtResource( 7 )
global_id = "r2_button_right"
esc_script = "res://game/rooms/room02/esc/button.esc"
tooltip_name = "button"
default_action = "use"
dialog_color = Color( 0.196078, 1, 0, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_right2"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="button_right2"]
position = Vector2( 911, 190.5 )
shape = SubResource( 7 )
[node name="ESCLocation" type="Position2D" parent="button_right2"]
position = Vector2( 914, 378 )
script = ExtResource( 8 )
[node name="bridge" type="Area2D" parent="."]
pause_mode = 1
script = ExtResource( 7 )
global_id = "r2_bridge"
dialog_color = Color( 1, 1, 1, 1 )
animations = null
[node name="AnimationPlayer" type="AnimationPlayer" parent="bridge"]
root_node = NodePath("../..")
anims/RESET = SubResource( 1 )
anims/bridge_close = SubResource( 3 )
anims/bridge_open = SubResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="bridge"]
shape = SubResource( 8 )