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

Deleted ESCHotspot (use ESCItem instead)

Browse Source 
Moved duplicated movement code from ESCPlayer and ESCItem/ESCHotspot to its own script.
Added talking animations management.
Fixed bug: character was turning to last_direction after talking, if coming from another direction than speaking direction.
Continued removing unfree stuff.
This commit is contained in:
Julian Murgia
2021-01-12 23:05:23 +01:00
parent 933122f085
commit ff56816205
73 changed files with 1211 additions and 1652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
game/rooms/room6/room6.tscn
View File

@@ -1,97 +1,19 @@
[gd_scene load_steps=11 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/escterrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room6/background.tscn" type="PackedScene" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/eschotspot.gd" type="Script" id=3]
[ext_resource path="res://game/rooms/room6/l_exit.tscn" type="PackedScene" id=3]
[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/escitem.gd" type="Script" id=5]
[ext_resource path="res://game/rooms/room6/r_door.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-core/game/core-scripts/escroom.gd" type="Script" id=6]
[ext_resource path="res://game/characters/worker/worker.tscn" type="PackedScene" id=7]
[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=8]
[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 ) ]
[sub_resource type="Animation" id=2]
resource_name = "r_door_close"
tracks/0/type = "value"
tracks/0/path = NodePath("r_door_closed:visible")
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 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("r_door_opened:visible")
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": 1,
"values": [ false ]
}
tracks/2/type = "value"
tracks/2/path = NodePath(".:is_exit")
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": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=3]
resource_name = "r_door_open"
length = 0.3
tracks/0/type = "value"
tracks/0/path = NodePath("r_door_closed:visible")
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 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("r_door_opened:visible")
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": 1,
"values": [ true ]
}
tracks/2/type = "value"
tracks/2/path = NodePath(".:is_exit")
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": 1,
"values": [ true ]
}
[node name="room6" type="Node2D"]
script = ExtResource( 6 )
__meta__ = {
@@ -104,6 +26,24 @@ camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
[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( 8 )
text = "ROOM 6"
[node name="Label" type="Label" parent="background"]
margin_left = 539.39
margin_top = 173.804
margin_right = 600.39
margin_bottom = 189.804
custom_fonts/font = ExtResource( 8 )
text = "Talk to me"
[node name="Line2D" type="Line2D" parent="background"]
points = PoolVector2Array( 570.36, 195.207, 570.832, 227.298, 541.1, 226.826, 547.579, 219.691, 547.933, 233.834, 541.569, 228.177 )
width = 4.0
[node name="walkable_area" type="Navigation2D" parent="."]
script = ExtResource( 1 )
@@ -116,69 +56,37 @@ __meta__ = {
[node name="Hotspots" type="Node2D" parent="."]
[node name="l_exit" type="Area2D" parent="Hotspots"]
script = ExtResource( 3 )
global_id = "r6_l_exit"
is_exit = true
esc_script = "res://game/rooms/room6/esc/left_exit.esc"
tooltip_name = "Exit"
dialog_color = Color( 1, 1, 1, 1 )
[node name="l_exit" parent="Hotspots" instance=ExtResource( 3 )]
interact_positions = {
"default": Vector2( 37.4521, 392.045 )
}
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_exit"]
polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 )
[node name="Position2D" type="Position2D" parent="Hotspots/l_exit"]
position = Vector2( 37.4521, 392.045 )
__meta__ = {
"_editor_description_": ""
}
[node name="r_door" type="Sprite" parent="Hotspots"]
script = ExtResource( 5 )
global_id = "r6_door"
esc_script = "res://game/rooms/room6/esc/r6_door.esc"
interaction_direction = 1
tooltip_name = "Door"
default_action = "open"
dialog_color = Color( 1, 1, 1, 1 )
[node name="r_door_closed" type="Polygon2D" parent="Hotspots/r_door"]
color = Color( 0.482353, 0.568627, 1, 1 )
polygon = PoolVector2Array( 1172.3, 44.8186, 1172.3, 348.012, 1273.9, 401.983, 1277.07, 89.2657 )
[node name="Line2D" type="Line2D" parent="Hotspots/r_door/r_door_closed"]
points = PoolVector2Array( 1265.23, 266.8, 1253.65, 276.6, 1252.76, 230.273, 1264.34, 233.837 )
default_color = Color( 1, 1, 1, 1 )
[node name="r_door_opened" type="Polygon2D" parent="Hotspots/r_door"]
visible = false
color = Color( 0.482353, 0.568627, 1, 1 )
polygon = PoolVector2Array( 1172.3, 44.8186, 1172.3, 348.012, 1029.82, 349.887, 1025.19, 42.1269 )
[node name="Line2D" type="Line2D" parent="Hotspots/r_door/r_door_opened"]
points = PoolVector2Array( 1048.98, 230.477, 1048.98, 189.89 )
default_color = Color( 1, 1, 1, 1 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r_door"]
anims/r_door_close = SubResource( 2 )
anims/r_door_open = SubResource( 3 )
[node name="r_door" parent="Hotspots" instance=ExtResource( 5 )]
interact_positions = {
"default": Vector2( 1180.52, 395.193 )
}
[node name="Position2D" type="Position2D" parent="Hotspots/r_door"]
position = Vector2( 1180.52, 395.193 )
[node name="Area2D" type="Area2D" parent="Hotspots/r_door"]
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door/Area2D"]
polygon = PoolVector2Array( 1169.35, 41.7644, 1168.09, 347.925, 1275.18, 407.141, 1278.96, 88.3814 )
__meta__ = {
"_editor_description_": ""
}
[node name="worker" parent="Hotspots" instance=ExtResource( 7 )]
position = Vector2( 477.701, 421.582 )
position = Vector2( 480, 430 )
interaction_direction = 2
interact_positions = {
"default": Vector2( 349.904, 430.659 )
"default": Vector2( 322.472, 428.374 )
}
[node name="Position2D2" type="Position2D" parent="Hotspots/worker"]
position = Vector2( -138.501, 28.1043 )
position = Vector2( -157.528, -1.62589 )
[node name="player_start" type="Position2D" parent="."]
position = Vector2( 76.7617, 437.649 )