diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 0f51d4af..af425b7b 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -1,80 +1,127 @@ -[gd_scene load_steps=23 format=3 uid="uid://wx76bqug4qy8"] +[gd_scene load_steps=25 format=3 uid="uid://wx76bqug4qy8"] [ext_resource type="Resource" uid="uid://c4lhcwvjqx5ty" path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" id="1"] [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://d3llwr16eq05e" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" id="4"] -[ext_resource type="Texture2D" uid="uid://bfsccuoj7pmbf" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" id="5"] -[ext_resource type="Texture2D" uid="uid://dttlqbxpeqwi2" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" id="6"] -[ext_resource type="Texture2D" uid="uid://cms1wfpspj3lm" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" id="7"] -[ext_resource type="Texture2D" uid="uid://dvn6aneqx6ki4" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" id="8"] -[ext_resource type="Texture2D" uid="uid://c3oauyuv2m63f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" id="9"] -[ext_resource type="Texture2D" uid="uid://dj3afybpcing3" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" id="10"] -[ext_resource type="Texture2D" uid="uid://b2fp3wx3yc4ac" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" id="11"] -[ext_resource type="Texture2D" uid="uid://dc18o6ownjk4f" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" id="12"] -[ext_resource type="Texture2D" uid="uid://cwaa6byg1k8jp" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" id="13"] -[ext_resource type="Texture2D" uid="uid://b8dkc8xtqe4sh" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" id="14"] -[ext_resource type="Texture2D" uid="uid://bhj0jj26o1v24" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" id="15"] -[ext_resource type="Texture2D" uid="uid://cms3agh4k5nrs" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" id="16"] -[ext_resource type="Texture2D" uid="uid://deqj1jv3tlrnw" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" id="17"] -[ext_resource type="Texture2D" uid="uid://nrkwgky7ip6w" path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" id="18"] +[ext_resource type="Texture2D" uid="uid://d3ovigeeolnsg" path="res://gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png" id="7"] [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="19_maw5o"] -[ext_resource type="Texture2D" uid="uid://ct7kmfstboj82" path="res://gymkhana/characters/eneko/they_live/they_live.png" id="19_vpwve"] -[ext_resource type="Texture2D" uid="uid://dh4jyr03r21c8" path="res://gymkhana/characters/eneko/assets/speak-2.png" id="20"] +[ext_resource type="Texture2D" uid="uid://2ngkn4mc1jkn" path="res://gymkhana/characters/eneko/they_live/they_live.png" id="19_vpwve"] +[ext_resource type="Texture2D" uid="uid://d4lpmrlecmrj1" path="res://gymkhana/characters/eneko/assets/speak-2.png" id="20"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_hasbv"] +atlas = ExtResource("7") +region = Rect2(0, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jduj8"] +atlas = ExtResource("7") +region = Rect2(115, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0u7lf"] +atlas = ExtResource("7") +region = Rect2(230, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_d7eje"] +atlas = ExtResource("7") +region = Rect2(345, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xxyi5"] +atlas = ExtResource("7") +region = Rect2(460, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ia00j"] +atlas = ExtResource("7") +region = Rect2(575, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_lgx7x"] +atlas = ExtResource("7") +region = Rect2(690, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ogwpq"] +atlas = ExtResource("7") +region = Rect2(805, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_np2tw"] +atlas = ExtResource("7") +region = Rect2(920, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vlc08"] +atlas = ExtResource("7") +region = Rect2(1035, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_maodd"] +atlas = ExtResource("7") +region = Rect2(1150, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_maw5o"] +atlas = ExtResource("7") +region = Rect2(1265, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vpwve"] +atlas = ExtResource("7") +region = Rect2(1380, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mipfo"] +atlas = ExtResource("7") +region = Rect2(1495, 0, 115, 239) + +[sub_resource type="AtlasTexture" id="AtlasTexture_8qf6b"] +atlas = ExtResource("7") +region = Rect2(1610, 0, 115, 239) [sub_resource type="AtlasTexture" id="2"] atlas = ExtResource("20") region = Rect2(0, 0, 150, 256) +[sub_resource type="AtlasTexture" id="AtlasTexture_er4vd"] +atlas = ExtResource("7") +region = Rect2(0, 0, 115, 239) + [sub_resource type="SpriteFrames" id="1"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("7") +"texture": SubResource("AtlasTexture_hasbv") }, { "duration": 1.0, -"texture": ExtResource("5") +"texture": SubResource("AtlasTexture_jduj8") }, { "duration": 1.0, -"texture": ExtResource("6") +"texture": SubResource("AtlasTexture_0u7lf") }, { "duration": 1.0, -"texture": ExtResource("14") +"texture": SubResource("AtlasTexture_d7eje") }, { "duration": 1.0, -"texture": ExtResource("4") +"texture": SubResource("AtlasTexture_xxyi5") }, { "duration": 1.0, -"texture": ExtResource("15") +"texture": SubResource("AtlasTexture_ia00j") }, { "duration": 1.0, -"texture": ExtResource("16") +"texture": SubResource("AtlasTexture_lgx7x") }, { "duration": 1.0, -"texture": ExtResource("11") +"texture": SubResource("AtlasTexture_ogwpq") }, { "duration": 1.0, -"texture": ExtResource("10") +"texture": SubResource("AtlasTexture_np2tw") }, { "duration": 1.0, -"texture": ExtResource("8") +"texture": SubResource("AtlasTexture_vlc08") }, { "duration": 1.0, -"texture": ExtResource("7") +"texture": SubResource("AtlasTexture_maodd") }, { "duration": 1.0, -"texture": ExtResource("12") +"texture": SubResource("AtlasTexture_maw5o") }, { "duration": 1.0, -"texture": ExtResource("13") +"texture": SubResource("AtlasTexture_vpwve") }, { "duration": 1.0, -"texture": ExtResource("18") +"texture": SubResource("AtlasTexture_mipfo") }, { "duration": 1.0, -"texture": ExtResource("17") -}, { -"duration": 1.0, -"texture": ExtResource("9") +"texture": SubResource("AtlasTexture_8qf6b") }], "loop": true, "name": &"idle", @@ -82,10 +129,10 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("7") +"texture": SubResource("2") }, { "duration": 1.0, -"texture": SubResource("2") +"texture": SubResource("AtlasTexture_er4vd") }], "loop": true, "name": &"speak", @@ -129,7 +176,7 @@ animations = ExtResource("1") position = Vector2(32.625, -50.56) scale = Vector2(0.8, 0.8) sprite_frames = SubResource("1") -animation = &"they_live" +animation = &"speak" flip_h = true [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] diff --git a/gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png b/gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png new file mode 100644 index 00000000..fc5c71da Binary files /dev/null and b/gymkhana/characters/eneko/smoking_animation/smoking_animation-Sheet.png differ diff --git a/gymkhana/characters/eneko/smoking_animation/smoking_animation1.ase b/gymkhana/characters/eneko/smoking_animation/smoking_animation1.ase new file mode 100644 index 00000000..ea3e2663 Binary files /dev/null and b/gymkhana/characters/eneko/smoking_animation/smoking_animation1.ase differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png deleted file mode 100644 index 01d42239..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-001.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png deleted file mode 100644 index 59d7f171..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-002.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png deleted file mode 100644 index 3a9ae610..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-003.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png deleted file mode 100644 index dfe97129..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-004.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png deleted file mode 100644 index ed0188cc..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-005.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png deleted file mode 100644 index 6f99e5f0..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-006.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png deleted file mode 100644 index dbaa2e86..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-007.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png deleted file mode 100644 index 885b005b..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-008.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png deleted file mode 100644 index ba0f56b3..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-009.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png deleted file mode 100644 index e3413a8f..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-010.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png deleted file mode 100644 index 7e260bf7..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-011.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png deleted file mode 100644 index c662bc10..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-012.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png deleted file mode 100644 index 4f44c38a..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-013.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png deleted file mode 100644 index b7781e1d..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-014.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png deleted file mode 100644 index b0b5025c..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-015.png and /dev/null differ diff --git a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png deleted file mode 100644 index 6003f036..00000000 Binary files a/gymkhana/characters/eneko/smoking_animation/unscreen-016.png and /dev/null differ