diff --git a/game/characters/mark/mark.tscn b/game/characters/mark/mark.tscn index 9fb09654..ac720a1a 100644 --- a/game/characters/mark/mark.tscn +++ b/game/characters/mark/mark.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=40 format=2] +[gd_scene load_steps=45 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] @@ -7,6 +7,7 @@ [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] [sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 2 ) @@ -20,14 +21,18 @@ 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] atlas = ExtResource( 4 ) region = Rect2( 120, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=5] -atlas = ExtResource( 4 ) -region = Rect2( 72, 0, 24, 70 ) - [sub_resource type="AtlasTexture" id=6] atlas = ExtResource( 7 ) region = Rect2( 0, 0, 24, 70 ) @@ -48,33 +53,9 @@ region = Rect2( 72, 0, 24, 70 ) atlas = ExtResource( 7 ) region = Rect2( 96, 0, 24, 70 ) -[sub_resource type="AtlasTexture" id=11] +[sub_resource type="AtlasTexture" id=5] atlas = ExtResource( 4 ) -region = Rect2( 24, 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=14] -atlas = ExtResource( 4 ) -region = Rect2( 336, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=15] -atlas = ExtResource( 4 ) -region = Rect2( 360, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=16] -atlas = ExtResource( 4 ) -region = Rect2( 384, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=17] -atlas = ExtResource( 4 ) -region = Rect2( 96, 0, 24, 70 ) +region = Rect2( 72, 0, 24, 70 ) [sub_resource type="AtlasTexture" id=18] atlas = ExtResource( 4 ) @@ -92,6 +73,10 @@ region = Rect2( 168, 0, 24, 70 ) atlas = ExtResource( 4 ) region = Rect2( 192, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 4 ) +region = Rect2( 96, 0, 24, 70 ) + [sub_resource type="AtlasTexture" id=22] atlas = ExtResource( 4 ) region = Rect2( 216, 0, 24, 70 ) @@ -112,10 +97,26 @@ region = Rect2( 288, 0, 24, 70 ) atlas = ExtResource( 4 ) region = Rect2( 312, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 4 ) +region = Rect2( 336, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 4 ) +region = Rect2( 360, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 4 ) +region = Rect2( 384, 0, 24, 70 ) + [sub_resource type="AtlasTexture" id=27] atlas = ExtResource( 4 ) region = Rect2( 48, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 4 ) +region = Rect2( 24, 0, 24, 70 ) + [sub_resource type="AtlasTexture" id=28] atlas = ExtResource( 5 ) region = Rect2( 0, 0, 24, 70 ) @@ -128,6 +129,22 @@ 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=34] +atlas = ExtResource( 8 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=35] +atlas = ExtResource( 8 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=36] +atlas = ExtResource( 8 ) +region = Rect2( 0, 0, 24, 70 ) + [sub_resource type="SpriteFrames" id=31] animations = [ { "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ], @@ -135,39 +152,24 @@ animations = [ { "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( 5 ) ], -"loop": true, -"name": "idle_up", -"speed": 5.0 -}, { "frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], "loop": true, "name": "speak_right", "speed": 5.0 }, { -"frames": [ SubResource( 11 ) ], +"frames": [ SubResource( 5 ) ], "loop": true, -"name": "idle_down_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ], -"loop": true, -"name": "speak_up", -"speed": 3.0 -}, { -"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ], -"loop": true, -"name": "walk_up", -"speed": 6.0 -}, { -"frames": [ SubResource( 17 ) ], -"loop": true, -"name": "idle_left", +"name": "idle_up", "speed": 5.0 }, { "frames": [ SubResource( 18 ) ], @@ -180,20 +182,45 @@ animations = [ { "name": "walk_down", "speed": 6.0 }, { +"frames": [ SubResource( 17 ) ], +"loop": true, +"name": "idle_left", +"speed": 5.0 +}, { "frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ], "loop": true, "name": "walk_right", "speed": 6.0 }, { +"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ], +"loop": true, +"name": "walk_up", +"speed": 6.0 +}, { "frames": [ SubResource( 27 ) ], "loop": true, "name": "idle_right", "speed": 5.0 }, { +"frames": [ SubResource( 11 ) ], +"loop": true, +"name": "idle_down_right", +"speed": 5.0 +}, { "frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ], "loop": true, "name": "speak_down_right", "speed": 6.0 +}, { +"frames": [ SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 34 ) ], +"loop": true, +"name": "speak_up_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 36 ) ], +"loop": true, +"name": "idle_up_right", +"speed": 5.0 } ] [sub_resource type="CapsuleShape2D" id=32] @@ -212,7 +239,7 @@ selectable = true animations = ExtResource( 3 ) [node name="sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -140.938 ) +position = Vector2( 0, -138.938 ) scale = Vector2( 4, 4 ) frames = SubResource( 31 ) animation = "idle_down" diff --git a/game/characters/mark/png/mark_talk_down_right.png b/game/characters/mark/png/mark_talk_down_right.png index 980d0abb..820a4531 100644 Binary files a/game/characters/mark/png/mark_talk_down_right.png and b/game/characters/mark/png/mark_talk_down_right.png differ diff --git a/game/characters/mark/png/mark_talk_down_right.png.import b/game/characters/mark/png/mark_talk_down_right.png.import index 2b3a6933..e7d4b4b5 100644 --- a/game/characters/mark/png/mark_talk_down_right.png.import +++ b/game/characters/mark/png/mark_talk_down_right.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/mark/png/mark_talk_up_right.png b/game/characters/mark/png/mark_talk_up_right.png new file mode 100644 index 00000000..a21e4b5b Binary files /dev/null and b/game/characters/mark/png/mark_talk_up_right.png differ diff --git a/game/characters/worker/png/worker.png b/game/characters/worker/png/worker.png index bb83fd86..d66b1b82 100644 Binary files a/game/characters/worker/png/worker.png and b/game/characters/worker/png/worker.png differ diff --git a/game/characters/worker/png/worker.png.import b/game/characters/worker/png/worker.png.import index fba2a7b4..c6896d8e 100644 --- a/game/characters/worker/png/worker.png.import +++ b/game/characters/worker/png/worker.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/worker/png/worker_talk_down.png b/game/characters/worker/png/worker_talk_down.png index 85a7ba2f..eb464230 100644 Binary files a/game/characters/worker/png/worker_talk_down.png and b/game/characters/worker/png/worker_talk_down.png differ diff --git a/game/characters/worker/png/worker_talk_down.png.import b/game/characters/worker/png/worker_talk_down.png.import index 33eeb4cc..672857e0 100644 --- a/game/characters/worker/png/worker_talk_down.png.import +++ b/game/characters/worker/png/worker_talk_down.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/worker/png/worker_talk_down_right.png b/game/characters/worker/png/worker_talk_down_right.png index 980d0abb..1ad712a8 100644 Binary files a/game/characters/worker/png/worker_talk_down_right.png and b/game/characters/worker/png/worker_talk_down_right.png differ diff --git a/game/characters/worker/png/worker_talk_down_right.png.import b/game/characters/worker/png/worker_talk_down_right.png.import index 38e67140..448e343f 100644 --- a/game/characters/worker/png/worker_talk_down_right.png.import +++ b/game/characters/worker/png/worker_talk_down_right.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/worker/png/worker_talk_right.png b/game/characters/worker/png/worker_talk_right.png index 15937f21..b5c0a8fa 100644 Binary files a/game/characters/worker/png/worker_talk_right.png and b/game/characters/worker/png/worker_talk_right.png differ diff --git a/game/characters/worker/png/worker_talk_right.png.import b/game/characters/worker/png/worker_talk_right.png.import index bdba926a..6a75d08f 100644 --- a/game/characters/worker/png/worker_talk_right.png.import +++ b/game/characters/worker/png/worker_talk_right.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/worker/png/worker_talk_up.png b/game/characters/worker/png/worker_talk_up.png index 1d85e560..65ae4bee 100644 Binary files a/game/characters/worker/png/worker_talk_up.png and b/game/characters/worker/png/worker_talk_up.png differ diff --git a/game/characters/worker/png/worker_talk_up.png.import b/game/characters/worker/png/worker_talk_up.png.import index e42607da..83c94ebe 100644 --- a/game/characters/worker/png/worker_talk_up.png.import +++ b/game/characters/worker/png/worker_talk_up.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/characters/worker/png/worker_talk_up_right.png b/game/characters/worker/png/worker_talk_up_right.png new file mode 100644 index 00000000..813ef8a8 Binary files /dev/null and b/game/characters/worker/png/worker_talk_up_right.png differ diff --git a/game/characters/worker/worker.tscn b/game/characters/worker/worker.tscn index 81040716..a81b20b6 100644 --- a/game/characters/worker/worker.tscn +++ b/game/characters/worker/worker.tscn @@ -1,18 +1,171 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1] [ext_resource path="res://game/characters/worker/worker_animations.tres" type="Resource" id=2] +[ext_resource path="res://game/characters/worker/png/worker_talk_down_right.png" type="Texture" id=3] [ext_resource path="res://game/characters/worker/png/worker.png" type="Texture" id=4] +[ext_resource path="res://game/characters/worker/png/worker_talk_up.png" type="Texture" id=5] +[ext_resource path="res://game/characters/worker/png/worker_talk_down.png" type="Texture" id=6] +[ext_resource path="res://game/characters/worker/png/worker_talk_right.png" type="Texture" id=7] + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 6 ) +region = Rect2( 0, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 6 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 6 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 5 ) +region = Rect2( 0, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 5 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 7 ) +region = Rect2( 0, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 7 ) +region = Rect2( 24, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 7 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=12] +atlas = ExtResource( 7 ) +region = Rect2( 72, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=13] +atlas = ExtResource( 7 ) +region = Rect2( 96, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 4 ) +region = Rect2( 384, 0, 24, 70 ) [sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 4 ) region = Rect2( 0, 0, 24, 70 ) +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 4 ) +region = Rect2( 144, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 4 ) +region = Rect2( 168, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 4 ) +region = Rect2( 192, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 4 ) +region = Rect2( 216, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=19] +atlas = ExtResource( 4 ) +region = Rect2( 240, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=20] +atlas = ExtResource( 4 ) +region = Rect2( 264, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=21] +atlas = ExtResource( 4 ) +region = Rect2( 288, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=22] +atlas = ExtResource( 4 ) +region = Rect2( 312, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=23] +atlas = ExtResource( 4 ) +region = Rect2( 336, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=24] +atlas = ExtResource( 4 ) +region = Rect2( 360, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=25] +atlas = ExtResource( 4 ) +region = Rect2( 384, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=26] +atlas = ExtResource( 4 ) +region = Rect2( 408, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=27] +atlas = ExtResource( 4 ) +region = Rect2( 432, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=28] +atlas = ExtResource( 4 ) +region = Rect2( 48, 0, 24, 70 ) + +[sub_resource type="AtlasTexture" id=29] +atlas = ExtResource( 3 ) +region = Rect2( 0, 0, 24, 70 ) + [sub_resource type="SpriteFrames" id=2] animations = [ { +"frames": [ SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 5 ) ], +"loop": true, +"name": "speak_down", +"speed": 5.0 +}, { +"frames": [ SubResource( 7 ), SubResource( 8 ) ], +"loop": true, +"name": "speak_up", +"speed": 5.0 +}, { +"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ) ], +"loop": true, +"name": "speak_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 14 ) ], +"loop": true, +"name": "idle_up", +"speed": 5.0 +}, { "frames": [ SubResource( 1 ) ], "loop": true, -"name": "idle_front", +"name": "idle_down", +"speed": 5.0 +}, { +"frames": [ SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ) ], +"loop": true, +"name": "walk_down", +"speed": 5.0 +}, { +"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ) ], +"loop": true, +"name": "walk_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ) ], +"loop": true, +"name": "walk_up", +"speed": 5.0 +}, { +"frames": [ SubResource( 28 ) ], +"loop": true, +"name": "idle_right", +"speed": 5.0 +}, { +"frames": [ SubResource( 29 ) ], +"loop": true, +"name": "idle_down_right", "speed": 5.0 } ] @@ -34,7 +187,7 @@ animations = ExtResource( 2 ) position = Vector2( 0.0280151, -16.7213 ) scale = Vector2( 4, 4 ) frames = SubResource( 2 ) -animation = "idle_front" +animation = "idle_down" offset = Vector2( -0.0280151, -30.9602 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/game/characters/worker/worker_animations.tres b/game/characters/worker/worker_animations.tres index d466d0d5..3619f0ab 100644 --- a/game/characters/worker/worker_animations.tres +++ b/game/characters/worker/worker_animations.tres @@ -111,13 +111,13 @@ mirrored = false [sub_resource type="Resource" id=22] script = ExtResource( 3 ) -animation = "idle_down_left" -mirrored = false +animation = "idle_down_right" +mirrored = true [sub_resource type="Resource" id=23] script = ExtResource( 3 ) -animation = "idle_left" -mirrored = false +animation = "idle_right" +mirrored = true [sub_resource type="Resource" id=24] script = ExtResource( 3 )