diff --git a/game/characters/mark/mark.tscn b/game/characters/mark/mark.tscn index ac720a1a..08cd4d6c 100644 --- a/game/characters/mark/mark.tscn +++ b/game/characters/mark/mark.tscn @@ -1,13 +1,38 @@ -[gd_scene load_steps=45 format=2] +[gd_scene load_steps=85 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1] [ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2] -[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=3] +[ext_resource path="res://game/characters/mark/png/markjester.png" type="Texture" id=3] [ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4] [ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5] [ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6] [ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7] -[ext_resource path="res://game/characters/mark/png/mark_talk_up_right.png" type="Texture" id=8] +[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=8] +[ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9] + +[sub_resource type="AtlasTexture" id=71] +atlas = ExtResource( 3 ) +region = Rect2( 408, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=72] +atlas = ExtResource( 3 ) +region = Rect2( 432, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=73] +atlas = ExtResource( 3 ) +region = Rect2( 456, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=74] +atlas = ExtResource( 3 ) +region = Rect2( 480, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=75] +atlas = ExtResource( 3 ) +region = Rect2( 504, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=68] +atlas = ExtResource( 3 ) +region = Rect2( 72, 0, 24, 70 ) [sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 2 ) @@ -21,57 +46,29 @@ region = Rect2( 24, 0, 24, 70 ) atlas = ExtResource( 2 ) region = Rect2( 48, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=12] -atlas = ExtResource( 6 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=13] -atlas = ExtResource( 6 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=4] +[sub_resource type="AtlasTexture" id=17] atlas = ExtResource( 4 ) -region = Rect2( 120, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=6] -atlas = ExtResource( 7 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=7] -atlas = ExtResource( 7 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=8] -atlas = ExtResource( 7 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=9] -atlas = ExtResource( 7 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=10] -atlas = ExtResource( 7 ) region = Rect2( 96, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=5] -atlas = ExtResource( 4 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=18] -atlas = ExtResource( 4 ) +[sub_resource type="AtlasTexture" id=67] +atlas = ExtResource( 3 ) region = Rect2( 0, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=19] -atlas = ExtResource( 4 ) -region = Rect2( 144, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=56] +atlas = ExtResource( 9 ) +region = Rect2( 0, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=20] -atlas = ExtResource( 4 ) -region = Rect2( 168, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=57] +atlas = ExtResource( 9 ) +region = Rect2( 24, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=21] -atlas = ExtResource( 4 ) -region = Rect2( 192, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=58] +atlas = ExtResource( 9 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=70] +atlas = ExtResource( 3 ) +region = Rect2( 96, 0, 24, 70 ) [sub_resource type="AtlasTexture" id=17] atlas = ExtResource( 4 ) @@ -97,25 +94,165 @@ region = Rect2( 288, 0, 24, 70 ) atlas = ExtResource( 4 ) region = Rect2( 312, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=14] -atlas = ExtResource( 4 ) +[sub_resource type="AtlasTexture" id=53] +atlas = ExtResource( 3 ) +region = Rect2( 144, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=54] +atlas = ExtResource( 3 ) +region = Rect2( 168, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=55] +atlas = ExtResource( 3 ) +region = Rect2( 192, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=33] +atlas = ExtResource( 9 ) +region = Rect2( 264, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=34] +atlas = ExtResource( 9 ) +region = Rect2( 288, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=35] +atlas = ExtResource( 3 ) region = Rect2( 336, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=15] -atlas = ExtResource( 4 ) +[sub_resource type="AtlasTexture" id=36] +atlas = ExtResource( 3 ) region = Rect2( 360, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=16] -atlas = ExtResource( 4 ) +[sub_resource type="AtlasTexture" id=37] +atlas = ExtResource( 3 ) region = Rect2( 384, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=69] +atlas = ExtResource( 3 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=62] +atlas = ExtResource( 9 ) +region = Rect2( 72, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=63] +atlas = ExtResource( 9 ) +region = Rect2( 96, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=64] +atlas = ExtResource( 9 ) +region = Rect2( 120, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 7 ) +region = Rect2( 0, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 7 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 7 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 7 ) +region = Rect2( 72, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 7 ) +region = Rect2( 96, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=38] +atlas = ExtResource( 9 ) +region = Rect2( 144, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=39] +atlas = ExtResource( 9 ) +region = Rect2( 168, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=40] +atlas = ExtResource( 9 ) +region = Rect2( 192, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=41] +atlas = ExtResource( 9 ) +region = Rect2( 216, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=42] +atlas = ExtResource( 9 ) +region = Rect2( 240, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=59] +atlas = ExtResource( 9 ) +region = Rect2( 432, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=60] +atlas = ExtResource( 9 ) +region = Rect2( 456, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=61] +atlas = ExtResource( 9 ) +region = Rect2( 480, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=12] +atlas = ExtResource( 6 ) +region = Rect2( 0, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=13] +atlas = ExtResource( 6 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=66] +atlas = ExtResource( 3 ) +region = Rect2( 120, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 4 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=19] +atlas = ExtResource( 4 ) +region = Rect2( 144, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=20] +atlas = ExtResource( 4 ) +region = Rect2( 168, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=21] +atlas = ExtResource( 4 ) +region = Rect2( 192, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=43] +atlas = ExtResource( 3 ) +region = Rect2( 216, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=44] +atlas = ExtResource( 3 ) +region = Rect2( 240, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=45] +atlas = ExtResource( 3 ) +region = Rect2( 264, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=46] +atlas = ExtResource( 3 ) +region = Rect2( 288, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=47] +atlas = ExtResource( 3 ) +region = Rect2( 312, 0, 24, 70 ) + [sub_resource type="AtlasTexture" id=27] atlas = ExtResource( 4 ) region = Rect2( 48, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=11] +[sub_resource type="AtlasTexture" id=5] atlas = ExtResource( 4 ) -region = Rect2( 24, 0, 24, 70 ) +region = Rect2( 72, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=65] +atlas = ExtResource( 3 ) +region = Rect2( 48, 0, 24, 70 ) [sub_resource type="AtlasTexture" id=28] atlas = ExtResource( 5 ) @@ -129,69 +266,153 @@ region = Rect2( 24, 0, 24, 70 ) atlas = ExtResource( 5 ) region = Rect2( 48, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=33] -atlas = ExtResource( 8 ) -region = Rect2( 0, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 4 ) +region = Rect2( 120, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=34] -atlas = ExtResource( 8 ) -region = Rect2( 24, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 4 ) +region = Rect2( 336, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=35] -atlas = ExtResource( 8 ) -region = Rect2( 48, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 4 ) +region = Rect2( 360, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=36] -atlas = ExtResource( 8 ) +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 4 ) +region = Rect2( 384, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=48] +atlas = ExtResource( 9 ) +region = Rect2( 312, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=49] +atlas = ExtResource( 9 ) +region = Rect2( 336, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=50] +atlas = ExtResource( 9 ) +region = Rect2( 360, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=51] +atlas = ExtResource( 9 ) +region = Rect2( 384, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=52] +atlas = ExtResource( 9 ) +region = Rect2( 408, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 4 ) region = Rect2( 0, 0, 24, 70 ) [sub_resource type="SpriteFrames" id=31] animations = [ { +"frames": [ SubResource( 71 ), SubResource( 72 ), SubResource( 73 ), SubResource( 74 ), SubResource( 75 ) ], +"loop": true, +"name": "walk_left_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 68 ) ], +"loop": true, +"name": "idle_up_jester", +"speed": 5.0 +}, { "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ], "loop": true, "name": "speak_down", "speed": 6.0 }, { -"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ], -"loop": true, -"name": "speak_up", -"speed": 3.0 -}, { -"frames": [ SubResource( 4 ) ], -"loop": true, -"name": "idle_down_left", -"speed": 5.0 -}, { -"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], -"loop": true, -"name": "speak_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 5 ) ], -"loop": true, -"name": "idle_up", -"speed": 5.0 -}, { -"frames": [ SubResource( 18 ) ], -"loop": true, -"name": "idle_down", -"speed": 5.0 -}, { -"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ], -"loop": true, -"name": "walk_down", -"speed": 6.0 -}, { "frames": [ SubResource( 17 ) ], "loop": true, "name": "idle_left", "speed": 5.0 }, { +"frames": [ SubResource( 67 ) ], +"loop": true, +"name": "idle_down_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ], +"loop": true, +"name": "speak_down_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 70 ) ], +"loop": true, +"name": "idle_left_jester", +"speed": 5.0 +}, { "frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ], "loop": true, "name": "walk_right", "speed": 6.0 }, { +"frames": [ SubResource( 53 ), SubResource( 54 ), SubResource( 55 ), SubResource( 54 ) ], +"loop": true, +"name": "walk_down_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 33 ), SubResource( 34 ) ], +"loop": true, +"name": "speak_up_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 36 ) ], +"loop": true, +"name": "walk_up_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 69 ) ], +"loop": true, +"name": "idle_down_right_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 62 ), SubResource( 63 ), SubResource( 64 ) ], +"loop": true, +"name": "speak_down_right_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], +"loop": true, +"name": "speak_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ) ], +"loop": true, +"name": "speak_right_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 59 ), SubResource( 60 ), SubResource( 61 ) ], +"loop": true, +"name": "speak_down_left_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ], +"loop": true, +"name": "speak_up", +"speed": 3.0 +}, { +"frames": [ SubResource( 66 ) ], +"loop": true, +"name": "idle_down_left_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 11 ) ], +"loop": true, +"name": "idle_down_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ], +"loop": true, +"name": "walk_down", +"speed": 6.0 +}, { +"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ) ], +"loop": true, +"name": "walk_right_jester", +"speed": 5.0 +}, { "frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ], "loop": true, "name": "walk_up", @@ -202,9 +423,14 @@ animations = [ { "name": "idle_right", "speed": 5.0 }, { -"frames": [ SubResource( 11 ) ], +"frames": [ SubResource( 5 ) ], "loop": true, -"name": "idle_down_right", +"name": "idle_up", +"speed": 5.0 +}, { +"frames": [ SubResource( 65 ) ], +"loop": true, +"name": "idle_right_jester", "speed": 5.0 }, { "frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ], @@ -212,14 +438,24 @@ animations = [ { "name": "speak_down_right", "speed": 6.0 }, { -"frames": [ SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 34 ) ], +"frames": [ SubResource( 4 ) ], "loop": true, -"name": "speak_up_right", +"name": "idle_down_left", "speed": 5.0 }, { -"frames": [ SubResource( 36 ) ], +"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ], "loop": true, -"name": "idle_up_right", +"name": "walk_up", +"speed": 6.0 +}, { +"frames": [ SubResource( 48 ), SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ) ], +"loop": true, +"name": "speak_left_jester", +"speed": 5.0 +}, { +"frames": [ SubResource( 18 ) ], +"loop": true, +"name": "idle_down", "speed": 5.0 } ] @@ -236,10 +472,10 @@ is_movable = true tooltip_name = "Me" dialog_color = Color( 1, 1, 1, 1 ) selectable = true -animations = ExtResource( 3 ) +animations = ExtResource( 8 ) [node name="sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -138.938 ) +position = Vector2( 0, -137.938 ) scale = Vector2( 4, 4 ) frames = SubResource( 31 ) animation = "idle_down" diff --git a/game/characters/mark/mark_animations_weird.tres b/game/characters/mark/mark_animations_jester.tres similarity index 82% rename from game/characters/mark/mark_animations_weird.tres rename to game/characters/mark/mark_animations_jester.tres index d9fa2d01..d2fd3bcc 100644 --- a/game/characters/mark/mark_animations_weird.tres +++ b/game/characters/mark/mark_animations_jester.tres @@ -46,122 +46,122 @@ angle_size = 50 [sub_resource type="Resource" id=9] script = ExtResource( 3 ) -animation = "walk_down" +animation = "walk_up_jester" mirrored = false [sub_resource type="Resource" id=10] script = ExtResource( 3 ) -animation = "walk_up" +animation = "walk_up_jester" mirrored = false [sub_resource type="Resource" id=11] script = ExtResource( 3 ) -animation = "walk_left" +animation = "walk_right_jester" mirrored = false [sub_resource type="Resource" id=12] script = ExtResource( 3 ) -animation = "walk_up" +animation = "walk_down_jester" mirrored = false [sub_resource type="Resource" id=13] script = ExtResource( 3 ) -animation = "walk_right" +animation = "walk_down_jester" mirrored = false [sub_resource type="Resource" id=14] script = ExtResource( 3 ) -animation = "walk_left" +animation = "walk_down_jester" mirrored = false [sub_resource type="Resource" id=15] script = ExtResource( 3 ) -animation = "walk_up" -mirrored = true +animation = "walk_left_jester" +mirrored = false [sub_resource type="Resource" id=16] script = ExtResource( 3 ) -animation = "walk_down" +animation = "walk_up_jester" mirrored = false [sub_resource type="Resource" id=17] script = ExtResource( 3 ) -animation = "idle_up" +animation = "idle_up_jester" mirrored = false [sub_resource type="Resource" id=18] script = ExtResource( 3 ) -animation = "idle_up" +animation = "idle_up_jester" mirrored = false [sub_resource type="Resource" id=19] script = ExtResource( 3 ) -animation = "idle_right" +animation = "idle_right_jester" mirrored = false [sub_resource type="Resource" id=20] script = ExtResource( 3 ) -animation = "idle_down_right" +animation = "idle_down_jester" mirrored = false [sub_resource type="Resource" id=21] script = ExtResource( 3 ) -animation = "idle_down" +animation = "idle_down_jester" mirrored = false [sub_resource type="Resource" id=22] script = ExtResource( 3 ) -animation = "idle_down_left" +animation = "idle_down_jester" mirrored = false [sub_resource type="Resource" id=23] script = ExtResource( 3 ) -animation = "idle_left" +animation = "idle_left_jester" mirrored = false [sub_resource type="Resource" id=24] script = ExtResource( 3 ) -animation = "idle_up" +animation = "idle_up_jester" mirrored = false [sub_resource type="Resource" id=25] script = ExtResource( 3 ) -animation = "speak_up" +animation = "speak_up_jester" mirrored = false [sub_resource type="Resource" id=26] script = ExtResource( 3 ) -animation = "speak_up" +animation = "speak_up_jester" mirrored = false [sub_resource type="Resource" id=27] script = ExtResource( 3 ) -animation = "speak_right" +animation = "speak_right_jester" mirrored = false [sub_resource type="Resource" id=28] script = ExtResource( 3 ) -animation = "speak_down" +animation = "speak_down_right_jester" mirrored = false [sub_resource type="Resource" id=29] script = ExtResource( 3 ) -animation = "speak_down" +animation = "speak_down_jester" mirrored = false [sub_resource type="Resource" id=30] script = ExtResource( 3 ) -animation = "speak_down" +animation = "speak_down_left_jester" mirrored = false [sub_resource type="Resource" id=31] script = ExtResource( 3 ) -animation = "speak_right" -mirrored = true +animation = "speak_left_jester" +mirrored = false [sub_resource type="Resource" id=32] script = ExtResource( 3 ) -animation = "speak_up" +animation = "speak_up_jester" mirrored = false [resource] diff --git a/game/characters/mark/png/markjester.png b/game/characters/mark/png/markjester.png new file mode 100644 index 00000000..4aaa672d Binary files /dev/null and b/game/characters/mark/png/markjester.png differ diff --git a/game/characters/mark/png/markjester_talk.png b/game/characters/mark/png/markjester_talk.png new file mode 100644 index 00000000..2833bc84 Binary files /dev/null and b/game/characters/mark/png/markjester_talk.png differ diff --git a/game/characters/mark2dir/mark.esc b/game/characters/mark2dir/mark.esc deleted file mode 100644 index 5638a54a..00000000 --- a/game/characters/mark2dir/mark.esc +++ /dev/null @@ -1,3 +0,0 @@ -:look - -say player "That's a-me, Mark-io." diff --git a/game/characters/mark2dir/mark2dir.tscn b/game/characters/mark2dir/mark2dir.tscn deleted file mode 100644 index a5e11298..00000000 --- a/game/characters/mark2dir/mark2dir.tscn +++ /dev/null @@ -1,232 +0,0 @@ -[gd_scene load_steps=40 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1] -[ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2] -[ext_resource path="res://game/characters/mark2dir/mark_animations.tres" type="Resource" id=3] -[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4] -[ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5] -[ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6] -[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7] - -[sub_resource type="AtlasTexture" id=1] -atlas = ExtResource( 4 ) -region = Rect2( 120, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=2] -atlas = ExtResource( 4 ) -region = Rect2( 216, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=3] -atlas = ExtResource( 4 ) -region = Rect2( 240, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=4] -atlas = ExtResource( 4 ) -region = Rect2( 264, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=5] -atlas = ExtResource( 4 ) -region = Rect2( 288, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=6] -atlas = ExtResource( 4 ) -region = Rect2( 312, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=7] -atlas = ExtResource( 4 ) -region = Rect2( 336, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=8] -atlas = ExtResource( 4 ) -region = Rect2( 360, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=9] -atlas = ExtResource( 4 ) -region = Rect2( 384, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=10] -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=11] -atlas = ExtResource( 4 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=12] -atlas = ExtResource( 4 ) -region = Rect2( 144, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=13] -atlas = ExtResource( 4 ) -region = Rect2( 168, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=14] -atlas = ExtResource( 4 ) -region = Rect2( 192, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=15] -atlas = ExtResource( 4 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=16] -atlas = ExtResource( 4 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=17] -atlas = ExtResource( 2 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=18] -atlas = ExtResource( 2 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=19] -atlas = ExtResource( 2 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=20] -atlas = ExtResource( 5 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=21] -atlas = ExtResource( 5 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=22] -atlas = ExtResource( 5 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=23] -atlas = ExtResource( 6 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=24] -atlas = ExtResource( 6 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=25] -atlas = ExtResource( 4 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=26] -atlas = ExtResource( 7 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=27] -atlas = ExtResource( 7 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=28] -atlas = ExtResource( 7 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=29] -atlas = ExtResource( 7 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=30] -atlas = ExtResource( 7 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="SpriteFrames" id=31] -animations = [ { -"frames": [ SubResource( 1 ) ], -"loop": true, -"name": "idle_down_left", -"speed": 5.0 -}, { -"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ], -"loop": true, -"name": "walk_right", -"speed": 6.0 -}, { -"frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 8 ) ], -"loop": true, -"name": "walk_up", -"speed": 6.0 -}, { -"frames": [ SubResource( 10 ) ], -"loop": true, -"name": "idle_down", -"speed": 5.0 -}, { -"frames": [ SubResource( 11 ) ], -"loop": true, -"name": "idle_down_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 13 ) ], -"loop": true, -"name": "walk_down", -"speed": 6.0 -}, { -"frames": [ SubResource( 15 ) ], -"loop": true, -"name": "idle_left", -"speed": 5.0 -}, { -"frames": [ SubResource( 16 ) ], -"loop": true, -"name": "idle_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 18 ), SubResource( 19 ) ], -"loop": true, -"name": "speak_down", -"speed": 6.0 -}, { -"frames": [ SubResource( 20 ), SubResource( 21 ), SubResource( 22 ) ], -"loop": true, -"name": "speak_down_right", -"speed": 6.0 -}, { -"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 23 ), SubResource( 24 ), SubResource( 24 ) ], -"loop": true, -"name": "speak_up", -"speed": 3.0 -}, { -"frames": [ SubResource( 25 ) ], -"loop": true, -"name": "idle_up", -"speed": 5.0 -}, { -"frames": [ SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ], -"loop": true, -"name": "speak_right", -"speed": 5.0 -} ] - -[sub_resource type="CapsuleShape2D" id=32] -radius = 38.2347 -height = 217.78 - -[node name="mark" type="Area2D"] -pause_mode = 1 -script = ExtResource( 1 ) -global_id = "player" -esc_script = "res://game/characters/mark2dir/mark.esc" -is_movable = true -tooltip_name = "Me" -dialog_color = Color( 1, 1, 1, 1 ) -selectable = true -animations = ExtResource( 3 ) - -[node name="sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -140.938 ) -scale = Vector2( 4, 4 ) -frames = SubResource( 31 ) -animation = "idle_down" - -[node name="collision" type="CollisionShape2D" parent="."] -position = Vector2( 0.455139, -138.362 ) -shape = SubResource( 32 ) - -[node name="debug" type="Label" parent="."] -margin_right = 40.0 -margin_bottom = 14.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="dialog_position" type="Position2D" parent="."] -position = Vector2( 0, -320 ) diff --git a/game/characters/mark2dir/mark_animations.tres b/game/characters/mark2dir/mark_animations.tres deleted file mode 100644 index ee22043a..00000000 --- a/game/characters/mark2dir/mark_animations.tres +++ /dev/null @@ -1,52 +0,0 @@ -[gd_resource type="Resource" load_steps=12 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] - -[sub_resource type="Resource" id=1] -script = ExtResource( 2 ) -angle_start = 0 -angle_size = 180 - -[sub_resource type="Resource" id=2] -script = ExtResource( 2 ) -angle_start = 180 -angle_size = 180 - -[sub_resource type="Resource" id=3] -script = ExtResource( 3 ) -animation = "walk_right" -mirrored = false - -[sub_resource type="Resource" id=4] -script = ExtResource( 3 ) -animation = "walk_right" -mirrored = true - -[sub_resource type="Resource" id=5] -script = ExtResource( 3 ) -animation = "idle_right" -mirrored = false - -[sub_resource type="Resource" id=6] -script = ExtResource( 3 ) -animation = "idle_left" -mirrored = false - -[sub_resource type="Resource" id=7] -script = ExtResource( 3 ) -animation = "speak_right" -mirrored = false - -[sub_resource type="Resource" id=8] -script = ExtResource( 3 ) -animation = "speak_right" -mirrored = true - -[resource] -script = ExtResource( 1 ) -dir_angles = [ SubResource( 1 ), SubResource( 2 ) ] -directions = [ SubResource( 3 ), SubResource( 4 ) ] -idles = [ SubResource( 5 ), SubResource( 6 ) ] -speaks = [ SubResource( 7 ), SubResource( 8 ) ] diff --git a/game/characters/mark2dir/mark_talk.tscn b/game/characters/mark2dir/mark_talk.tscn deleted file mode 100644 index 6f37c920..00000000 --- a/game/characters/mark2dir/mark_talk.tscn +++ /dev/null @@ -1,34 +0,0 @@ -[gd_scene load_steps=8 format=2] - -[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1] - -[sub_resource type="AtlasTexture" id=1] -atlas = ExtResource( 1 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=2] -atlas = ExtResource( 1 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=3] -atlas = ExtResource( 1 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=4] -atlas = ExtResource( 1 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=5] -atlas = ExtResource( 1 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="SpriteFrames" id=6] -animations = [ { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], -"loop": true, -"name": "default", -"speed": 5.0 -} ] - -[node name="AnimatedSprite" type="AnimatedSprite"] -frames = SubResource( 6 ) diff --git a/game/characters/mark2dir/png/mark.png b/game/characters/mark2dir/png/mark.png deleted file mode 100644 index 91cacd24..00000000 Binary files a/game/characters/mark2dir/png/mark.png and /dev/null differ diff --git a/game/characters/mark2dir/png/mark_talk_down.png b/game/characters/mark2dir/png/mark_talk_down.png deleted file mode 100644 index 85a7ba2f..00000000 Binary files a/game/characters/mark2dir/png/mark_talk_down.png and /dev/null differ diff --git a/game/characters/mark2dir/png/mark_talk_down_right.png b/game/characters/mark2dir/png/mark_talk_down_right.png deleted file mode 100644 index 980d0abb..00000000 Binary files a/game/characters/mark2dir/png/mark_talk_down_right.png and /dev/null differ diff --git a/game/characters/mark2dir/png/mark_talk_right.png b/game/characters/mark2dir/png/mark_talk_right.png deleted file mode 100644 index 15937f21..00000000 Binary files a/game/characters/mark2dir/png/mark_talk_right.png and /dev/null differ diff --git a/game/characters/mark2dir/png/mark_talk_up.png b/game/characters/mark2dir/png/mark_talk_up.png deleted file mode 100644 index 1d85e560..00000000 Binary files a/game/characters/mark2dir/png/mark_talk_up.png and /dev/null differ diff --git a/game/characters/mark2dir/sfx/footstep_concrete_000.ogg b/game/characters/mark2dir/sfx/footstep_concrete_000.ogg deleted file mode 100644 index 163cc564..00000000 Binary files a/game/characters/mark2dir/sfx/footstep_concrete_000.ogg and /dev/null differ diff --git a/game/rooms/room15/background.tscn b/game/rooms/room15/background.tscn index fa42fc10..bc00e2fa 100644 --- a/game/rooms/room15/background.tscn +++ b/game/rooms/room15/background.tscn @@ -7,24 +7,3 @@ margin_right = 1289.0 margin_bottom = 555.0 mouse_filter = 2 script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="l_platform" type="Line2D" parent="."] -position = Vector2( 2, -266 ) -points = PoolVector2Array( -2.96298, 712.01, 129.973, 614.429, 1167.5, 612.894, 1274.59, 669.705, 1273.25, 812.694, 2.36697, 811.043, 2.36697, 713.389 ) - -[node name="l_door" type="Line2D" parent="."] -position = Vector2( 0, -266 ) -points = PoolVector2Array( 6.61201, 704.409, 6.61203, 389.558, 87.755, 339.775, 87.5463, 649.784 ) -__meta__ = { -"_editor_description_": "" -} - -[node name="r_door" type="Line2D" parent="."] -position = Vector2( 0, -267.828 ) -points = PoolVector2Array( 1175.07, 620.086, 1171.24, 311.267, 1274.8, 356.87, 1278.31, 672.412, 1188.64, 624.843 ) -__meta__ = { -"_editor_description_": "" -} diff --git a/game/rooms/room15/esc/room15.esc b/game/rooms/room15/esc/room15.esc new file mode 100644 index 00000000..f7b66ee5 --- /dev/null +++ b/game/rooms/room15/esc/room15.esc @@ -0,0 +1,2 @@ +:ready + diff --git a/game/rooms/room15/esc/switch_animation.esc b/game/rooms/room15/esc/switch_animation.esc index 6eb2a40b..e00b88dc 100644 --- a/game/rooms/room15/esc/switch_animation.esc +++ b/game/rooms/room15/esc/switch_animation.esc @@ -1,3 +1,9 @@ :use - -set_animations player res://game/characters/mark/mark_animations_weird.tres +> [!is_jester] + set_animations player res://game/characters/mark/mark_animations_jester.tres + set_global is_jester true + stop +> [is_jester] + set_animations player res://game/characters/mark/mark_animations.tres + set_global is_jester false + stop \ No newline at end of file diff --git a/game/rooms/room15/room15.png b/game/rooms/room15/room15.png new file mode 100644 index 00000000..0490e10c Binary files /dev/null and b/game/rooms/room15/room15.png differ diff --git a/game/rooms/room15/room15.tscn b/game/rooms/room15/room15.tscn index 7dcef8f8..2faa186b 100644 --- a/game/rooms/room15/room15.tscn +++ b/game/rooms/room15/room15.tscn @@ -1,18 +1,19 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 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/room15/background.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] [ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3] -[ext_resource path="res://game/characters/mark2dir/mark2dir.tscn" type="PackedScene" id=4] +[ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" 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/escitems/button.tscn" type="PackedScene" id=9] +[ext_resource path="res://game/rooms/room15/room15.png" type="Texture" id=8] +[ext_resource path="res://game/rooms/room15/room15scale.png" type="Texture" id=10] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, 864.626, 613.518, 1143.08, 613.35, -9.16094, 803.802, 386.666, 618.012, 129.634, 615.792, 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( 8, 7, 6, 9 ), PoolIntArray( 9, 6, 10, 11, 12 ) ] -outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 386.666, 618.012, 864.626, 613.518, 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( 849.268, 604.779, 878.268, 604.779, 877.809, 609.779, 848.967, 609.779, 448.544, 609.779, 448.268, 604.779, 476.268, 604.779, 476.638, 609.779, 1264.27, 831.779, 0.26837, 834.779, 1.26837, 741.779, 302.268, 656.779, 339.268, 609.779, 359.021, 609.779, 359.268, 605.779, 387.268, 605.779, 388.268, 609.779, 490.268, 633.779, 485.268, 609.779, 778.268, 634.779, 995.268, 662.779, 1265.27, 738.779, 794.268, 609.779, 903.268, 609.779 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 8, 9, 10, 11 ), PoolIntArray( 8, 11, 12, 13 ), PoolIntArray( 13, 14, 15, 16 ), PoolIntArray( 8, 13, 16, 17 ), PoolIntArray( 7, 18, 17 ), PoolIntArray( 19, 20, 21, 8, 17 ), PoolIntArray( 4, 7, 17 ), PoolIntArray( 19, 22, 3 ), PoolIntArray( 2, 23, 20, 19 ), PoolIntArray( 16, 4, 17 ), PoolIntArray( 2, 19, 3 ) ] +outlines = [ PoolVector2Array( 1.26837, 741.779, 302.268, 656.779, 339.268, 609.779, 359.021, 609.779, 359.268, 605.779, 387.268, 605.779, 388.268, 609.779, 448.544, 609.779, 448.268, 604.779, 476.268, 604.779, 476.638, 609.779, 485.268, 609.779, 490.268, 633.779, 778.268, 634.779, 794.268, 609.779, 848.967, 609.779, 849.268, 604.779, 878.268, 604.779, 877.809, 609.779, 903.268, 609.779, 995.268, 662.779, 1265.27, 738.779, 1264.27, 831.779, 0.26837, 834.779 ) ] [node name="room15" type="Node2D"] script = ExtResource( 6 ) @@ -20,36 +21,90 @@ __meta__ = { "_edit_vertical_guides_": [ ] } global_id = "room15" +esc_script = "res://game/rooms/room15/esc/room15.esc" player_scene = ExtResource( 4 ) camera_limits = [ Rect2( 0, 0, 1280, 555 ) ] -[node name="background" parent="." instance=ExtResource( 2 )] +[node name="ESCBackground" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +mouse_filter = 2 +texture = ExtResource( 8 ) +script = ExtResource( 2 ) -[node name="room_label" type="Label" parent="background"] +[node name="ColorRect" type="ColorRect" parent="ESCBackground"] +margin_right = 387.0 +margin_bottom = 207.0 +color = Color( 0, 0, 0, 0.501961 ) + +[node name="description" type="Label" parent="ESCBackground/ColorRect"] +margin_left = 9.0 +margin_top = 32.0 +margin_right = 615.0 +margin_bottom = 195.0 +custom_fonts/font = ExtResource( 3 ) +text = "This room has no ESC Script attached so the +player will spawn at starting location if there is one. + +If there is none, the player will spawn at origin + (0,0), top-left corner of the screen. " + +[node name="room_label" type="Label" parent="ESCBackground/ColorRect"] margin_right = 92.0 margin_bottom = 21.0 custom_fonts/font = ExtResource( 3 ) text = "ROOM 15" -__meta__ = { -"_edit_use_anchors_": false -} -[node name="description" type="Label" parent="background"] -margin_left = 198.0 -margin_top = 97.0 -margin_right = 681.0 -margin_bottom = 142.0 +[node name="ColorRect2" type="ColorRect" parent="ESCBackground"] +margin_left = 461.0 +margin_top = 393.0 +margin_right = 847.0 +margin_bottom = 433.0 +color = Color( 0, 0, 0, 0.501961 ) + +[node name="description" type="Label" parent="ESCBackground/ColorRect2"] +margin_left = 9.0 +margin_top = 9.0 +margin_right = 615.0 +margin_bottom = 195.0 custom_fonts/font = ExtResource( 3 ) -text = "This room has no ESC Script attached so the player will spawn at -starting location if there is one. +text = "Use the second door to change between costumes" -If there is none, the player will spawn at origin (0,0), top-left corner of the screen. " -__meta__ = { -"_edit_use_anchors_": false -} +[node name="ColorRect3" type="ColorRect" parent="ESCBackground"] +margin_left = 22.0 +margin_top = 505.0 +margin_right = 322.0 +margin_bottom = 545.0 +color = Color( 0, 0, 0, 0.501961 ) + +[node name="description" type="Label" parent="ESCBackground/ColorRect3"] +margin_left = 9.0 +margin_top = 9.0 +margin_right = 615.0 +margin_bottom = 195.0 +custom_fonts/font = ExtResource( 3 ) +text = "Use the left column for say long left" + +[node name="ColorRect4" type="ColorRect" parent="ESCBackground"] +margin_left = 952.0 +margin_top = 502.0 +margin_right = 1262.0 +margin_bottom = 542.0 +color = Color( 0, 0, 0, 0.501961 ) + +[node name="description" type="Label" parent="ESCBackground/ColorRect4"] +margin_left = 9.0 +margin_top = 9.0 +margin_right = 615.0 +margin_bottom = 195.0 +custom_fonts/font = ExtResource( 3 ) +text = "Use the left column for say long right" [node name="walkable_area" type="Navigation2D" parent="."] script = ExtResource( 1 ) +scales = ExtResource( 10 ) +scale_min = 0.1 +player_speed_multiplier = 4.0 [node name="platform" type="NavigationPolygonInstance" parent="walkable_area"] position = Vector2( 6.73163, -264.779 ) @@ -72,10 +127,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 ) +scale = Vector2( 4.57162, 0.938339 ) +polygon = PoolVector2Array( 79.1842, 366.605, 79.403, 287.743, 87.0589, 287.743, 87.1409, 366.605 ) [node name="Position2D" type="Position2D" parent="Hotspots/l_door"] -position = Vector2( 37.4521, 392.045 ) +position = Vector2( 379, 345 ) script = ExtResource( 5 ) global_id = "r12_l_exit" @@ -92,45 +148,68 @@ animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] position = Vector2( 0, -1 ) -polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) +polygon = PoolVector2Array( 853, 344, 854, 271, 888, 271, 888, 344 ) __meta__ = { "_editor_description_": "" } [node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"] -position = Vector2( 1231.78, 360.624 ) +position = Vector2( 870, 342 ) script = ExtResource( 5 ) [node name="start" type="Position2D" parent="Hotspots"] -position = Vector2( 243.677, 455.569 ) +position = Vector2( 379, 348 ) script = ExtResource( 5 ) global_id = "start" is_start_location = true interaction_direction = 180 -[node name="say_long" parent="Hotspots" instance=ExtResource( 9 )] -position = Vector2( 675.509, 0.950089 ) -global_id = "say_long" -esc_script = "res://game/rooms/room15/esc/say_long.esc" -tooltip_name = "Say long test right" - -[node name="Position2D" type="Position2D" parent="Hotspots/say_long"] -position = Vector2( 362.457, 358.656 ) - -[node name="switch_animation" parent="Hotspots" instance=ExtResource( 9 )] -position = Vector2( 510.195, 3.80031 ) -global_id = "switch_animation" -esc_script = "res://game/rooms/room15/esc/switch_animation.esc" -tooltip_name = "Switch animation" - -[node name="Position2D" type="Position2D" parent="Hotspots/switch_animation"] -position = Vector2( 362.457, 358.656 ) - -[node name="say_long_left" parent="Hotspots" instance=ExtResource( 9 )] -position = Vector2( -205.218, 2.85024 ) +[node name="say_long_left" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 7 ) global_id = "say_long_left" esc_script = "res://game/rooms/room15/esc/say_long.esc" tooltip_name = "Say long test left" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) +animations = null -[node name="Position2D" type="Position2D" parent="Hotspots/say_long_left"] -position = Vector2( 362.457, 358.656 ) +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/say_long_left"] +polygon = PoolVector2Array( 12, 0, 30, 0, 30, 460, 12, 460 ) + +[node name="ESCLocation" type="Position2D" parent="Hotspots/say_long_left"] +position = Vector2( 113, 479 ) +script = ExtResource( 5 ) + +[node name="say_long_right" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 7 ) +global_id = "say_long_right" +esc_script = "res://game/rooms/room15/esc/say_long.esc" +tooltip_name = "Say long test right" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/say_long_right"] +polygon = PoolVector2Array( 1252, -1, 1272, 0, 1272, 461, 1255, 461 ) + +[node name="ESCLocation" type="Position2D" parent="Hotspots/say_long_right"] +position = Vector2( 1142, 491 ) +script = ExtResource( 5 ) + +[node name="switch_animation" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 7 ) +global_id = "switch_animation" +esc_script = "res://game/rooms/room15/esc/switch_animation.esc" +tooltip_name = "Switch animation" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="Position2D" type="Position2D" parent="switch_animation"] +position = Vector2( 470, 342 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="switch_animation"] +polygon = PoolVector2Array( 451, 270, 485, 270, 487, 343, 452, 343 ) diff --git a/game/rooms/room15/room15scale.png b/game/rooms/room15/room15scale.png new file mode 100644 index 00000000..c0f269e4 Binary files /dev/null and b/game/rooms/room15/room15scale.png differ