diff --git a/assets/main/world/creature/0/ear-z2-sheet.png b/assets/main/world/creature/0/ear-z2-sheet.png deleted file mode 100644 index 0b7204ca0..000000000 Binary files a/assets/main/world/creature/0/ear-z2-sheet.png and /dev/null differ diff --git a/assets/main/world/creature/0/eyes-sheet.png b/assets/main/world/creature/0/eyes-sheet.png deleted file mode 100644 index a3f52f9f4..000000000 Binary files a/assets/main/world/creature/0/eyes-sheet.png and /dev/null differ diff --git a/assets/main/world/creature/0/food-sheet.png b/assets/main/world/creature/0/food-sheet.png deleted file mode 100644 index 1cdca03d5..000000000 Binary files a/assets/main/world/creature/0/food-sheet.png and /dev/null differ diff --git a/assets/main/world/creature/0/mouth-sheet.png b/assets/main/world/creature/0/mouth-sheet.png deleted file mode 100644 index 274aa03ef..000000000 Binary files a/assets/main/world/creature/0/mouth-sheet.png and /dev/null differ diff --git a/assets/main/world/creature/0/arm-z0-sheet.png b/assets/main/world/creature/1/arm-z0-sheet.png similarity index 100% rename from assets/main/world/creature/0/arm-z0-sheet.png rename to assets/main/world/creature/1/arm-z0-sheet.png diff --git a/assets/main/world/creature/0/arm-z0-sheet.png.import b/assets/main/world/creature/1/arm-z0-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/arm-z0-sheet.png.import rename to assets/main/world/creature/1/arm-z0-sheet.png.import index 932383faf..128f4aeec 100644 --- a/assets/main/world/creature/0/arm-z0-sheet.png.import +++ b/assets/main/world/creature/1/arm-z0-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arm-z0-sheet.png-45ed2bc92b92cc11611074e88e35ac35.stex" +path="res://.import/arm-z0-sheet.png-cae5db116e516b04e0fbb4644dc50f3e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/arm-z0-sheet.png" -dest_files=[ "res://.import/arm-z0-sheet.png-45ed2bc92b92cc11611074e88e35ac35.stex" ] +source_file="res://assets/main/world/creature/1/arm-z0-sheet.png" +dest_files=[ "res://.import/arm-z0-sheet.png-cae5db116e516b04e0fbb4644dc50f3e.stex" ] [params] diff --git a/assets/main/world/creature/0/arm-z1-sheet.png b/assets/main/world/creature/1/arm-z1-sheet.png similarity index 100% rename from assets/main/world/creature/0/arm-z1-sheet.png rename to assets/main/world/creature/1/arm-z1-sheet.png diff --git a/assets/main/world/creature/0/arm-z1-sheet.png.import b/assets/main/world/creature/1/arm-z1-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/arm-z1-sheet.png.import rename to assets/main/world/creature/1/arm-z1-sheet.png.import index f329d8491..c09e8d1db 100644 --- a/assets/main/world/creature/0/arm-z1-sheet.png.import +++ b/assets/main/world/creature/1/arm-z1-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arm-z1-sheet.png-a0098496f1032bf7f9e0b58776bec21a.stex" +path="res://.import/arm-z1-sheet.png-0ccc48e240d767f5c8036e932d869a95.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/arm-z1-sheet.png" -dest_files=[ "res://.import/arm-z1-sheet.png-a0098496f1032bf7f9e0b58776bec21a.stex" ] +source_file="res://assets/main/world/creature/1/arm-z1-sheet.png" +dest_files=[ "res://.import/arm-z1-sheet.png-0ccc48e240d767f5c8036e932d869a95.stex" ] [params] diff --git a/assets/main/world/creature/1/ear-z0-sheet.png b/assets/main/world/creature/1/ear-z0-sheet.png index 2a7675d96..4a6c9cfb1 100644 Binary files a/assets/main/world/creature/1/ear-z0-sheet.png and b/assets/main/world/creature/1/ear-z0-sheet.png differ diff --git a/assets/main/world/creature/1/ear-z1-sheet.png b/assets/main/world/creature/1/ear-z1-sheet.png index d510b4e37..f91c8b573 100644 Binary files a/assets/main/world/creature/1/ear-z1-sheet.png and b/assets/main/world/creature/1/ear-z1-sheet.png differ diff --git a/assets/main/world/creature/1/ear-z2-sheet.png b/assets/main/world/creature/1/ear-z2-sheet.png index 32f33ed21..0b7204ca0 100644 Binary files a/assets/main/world/creature/1/ear-z2-sheet.png and b/assets/main/world/creature/1/ear-z2-sheet.png differ diff --git a/assets/main/world/creature/0/emote-arms-sheet.png b/assets/main/world/creature/1/emote-arms-sheet.png similarity index 100% rename from assets/main/world/creature/0/emote-arms-sheet.png rename to assets/main/world/creature/1/emote-arms-sheet.png diff --git a/assets/main/world/creature/0/emote-arms-sheet.png.import b/assets/main/world/creature/1/emote-arms-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/emote-arms-sheet.png.import rename to assets/main/world/creature/1/emote-arms-sheet.png.import index 300e0b63d..8fdb2ffe5 100644 --- a/assets/main/world/creature/0/emote-arms-sheet.png.import +++ b/assets/main/world/creature/1/emote-arms-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/emote-arms-sheet.png-ae35d2e624a6f75e94adb3a8e4787f80.stex" +path="res://.import/emote-arms-sheet.png-aaf7ebac46df6723913780ec2af9953f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/emote-arms-sheet.png" -dest_files=[ "res://.import/emote-arms-sheet.png-ae35d2e624a6f75e94adb3a8e4787f80.stex" ] +source_file="res://assets/main/world/creature/1/emote-arms-sheet.png" +dest_files=[ "res://.import/emote-arms-sheet.png-aaf7ebac46df6723913780ec2af9953f.stex" ] [params] diff --git a/assets/main/world/creature/0/emote-body-sheet.png b/assets/main/world/creature/1/emote-body-sheet.png similarity index 100% rename from assets/main/world/creature/0/emote-body-sheet.png rename to assets/main/world/creature/1/emote-body-sheet.png diff --git a/assets/main/world/creature/0/emote-body-sheet.png.import b/assets/main/world/creature/1/emote-body-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/emote-body-sheet.png.import rename to assets/main/world/creature/1/emote-body-sheet.png.import index 11f108c40..406eb2a7c 100644 --- a/assets/main/world/creature/0/emote-body-sheet.png.import +++ b/assets/main/world/creature/1/emote-body-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/emote-body-sheet.png-38bf78a7f05bfc49c27c6a6231467945.stex" +path="res://.import/emote-body-sheet.png-ca4b4aeacd41a5d075a296984a69c40a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/emote-body-sheet.png" -dest_files=[ "res://.import/emote-body-sheet.png-38bf78a7f05bfc49c27c6a6231467945.stex" ] +source_file="res://assets/main/world/creature/1/emote-body-sheet.png" +dest_files=[ "res://.import/emote-body-sheet.png-ca4b4aeacd41a5d075a296984a69c40a.stex" ] [params] diff --git a/assets/main/world/creature/0/emote-brain-sheet.png b/assets/main/world/creature/1/emote-brain-sheet.png similarity index 100% rename from assets/main/world/creature/0/emote-brain-sheet.png rename to assets/main/world/creature/1/emote-brain-sheet.png diff --git a/assets/main/world/creature/0/emote-brain-sheet.png.import b/assets/main/world/creature/1/emote-brain-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/emote-brain-sheet.png.import rename to assets/main/world/creature/1/emote-brain-sheet.png.import index 9d3dfb832..a48595cfc 100644 --- a/assets/main/world/creature/0/emote-brain-sheet.png.import +++ b/assets/main/world/creature/1/emote-brain-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/emote-brain-sheet.png-2ad755d08e63ba8afe420c4651ddf1f7.stex" +path="res://.import/emote-brain-sheet.png-f3abe36f121f1f60a064990c0fb8b479.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/emote-brain-sheet.png" -dest_files=[ "res://.import/emote-brain-sheet.png-2ad755d08e63ba8afe420c4651ddf1f7.stex" ] +source_file="res://assets/main/world/creature/1/emote-brain-sheet.png" +dest_files=[ "res://.import/emote-brain-sheet.png-f3abe36f121f1f60a064990c0fb8b479.stex" ] [params] diff --git a/assets/main/world/creature/0/emote-eyes-sheet.png b/assets/main/world/creature/1/emote-eyes-sheet.png similarity index 100% rename from assets/main/world/creature/0/emote-eyes-sheet.png rename to assets/main/world/creature/1/emote-eyes-sheet.png diff --git a/assets/main/world/creature/0/emote-eyes-sheet.png.import b/assets/main/world/creature/1/emote-eyes-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/emote-eyes-sheet.png.import rename to assets/main/world/creature/1/emote-eyes-sheet.png.import index 8d644c2eb..1125eab4b 100644 --- a/assets/main/world/creature/0/emote-eyes-sheet.png.import +++ b/assets/main/world/creature/1/emote-eyes-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/emote-eyes-sheet.png-e1d1f9b12d93276661604e13fa621c86.stex" +path="res://.import/emote-eyes-sheet.png-3eeeffce060aec620af76e6037f0ccdc.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/emote-eyes-sheet.png" -dest_files=[ "res://.import/emote-eyes-sheet.png-e1d1f9b12d93276661604e13fa621c86.stex" ] +source_file="res://assets/main/world/creature/1/emote-eyes-sheet.png" +dest_files=[ "res://.import/emote-eyes-sheet.png-3eeeffce060aec620af76e6037f0ccdc.stex" ] [params] diff --git a/assets/main/world/creature/0/emote-head-sheet.png b/assets/main/world/creature/1/emote-head-sheet.png similarity index 100% rename from assets/main/world/creature/0/emote-head-sheet.png rename to assets/main/world/creature/1/emote-head-sheet.png diff --git a/assets/main/world/creature/0/emote-head-sheet.png.import b/assets/main/world/creature/1/emote-head-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/emote-head-sheet.png.import rename to assets/main/world/creature/1/emote-head-sheet.png.import index ff93cc6b2..cf9a00210 100644 --- a/assets/main/world/creature/0/emote-head-sheet.png.import +++ b/assets/main/world/creature/1/emote-head-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/emote-head-sheet.png-1ef1907478c24a7b5caea3978103f598.stex" +path="res://.import/emote-head-sheet.png-be2161a80e053c171de6f4fa798207d3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/emote-head-sheet.png" -dest_files=[ "res://.import/emote-head-sheet.png-1ef1907478c24a7b5caea3978103f598.stex" ] +source_file="res://assets/main/world/creature/1/emote-head-sheet.png" +dest_files=[ "res://.import/emote-head-sheet.png-be2161a80e053c171de6f4fa798207d3.stex" ] [params] diff --git a/assets/main/world/creature/1/eyes-sheet.png b/assets/main/world/creature/1/eyes-sheet.png index bc2b63e24..a3f52f9f4 100644 Binary files a/assets/main/world/creature/1/eyes-sheet.png and b/assets/main/world/creature/1/eyes-sheet.png differ diff --git a/assets/main/world/creature/1/food-laser-sheet.png b/assets/main/world/creature/1/food-laser-sheet.png index 75e76aec8..a0e821d73 100644 Binary files a/assets/main/world/creature/1/food-laser-sheet.png and b/assets/main/world/creature/1/food-laser-sheet.png differ diff --git a/assets/main/world/creature/1/food-sheet.png b/assets/main/world/creature/1/food-sheet.png index eaa8b4ce8..1cdca03d5 100644 Binary files a/assets/main/world/creature/1/food-sheet.png and b/assets/main/world/creature/1/food-sheet.png differ diff --git a/assets/main/world/creature/0/head-sheet.png b/assets/main/world/creature/1/head-sheet.png similarity index 100% rename from assets/main/world/creature/0/head-sheet.png rename to assets/main/world/creature/1/head-sheet.png diff --git a/assets/main/world/creature/0/head-sheet.png.import b/assets/main/world/creature/1/head-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/head-sheet.png.import rename to assets/main/world/creature/1/head-sheet.png.import index ec452e862..557cf4f95 100644 --- a/assets/main/world/creature/0/head-sheet.png.import +++ b/assets/main/world/creature/1/head-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/head-sheet.png-6bf852a536950abea14b55095a7855f9.stex" +path="res://.import/head-sheet.png-b62fb5150ba83f16f40fa31b11530d2a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/head-sheet.png" -dest_files=[ "res://.import/head-sheet.png-6bf852a536950abea14b55095a7855f9.stex" ] +source_file="res://assets/main/world/creature/1/head-sheet.png" +dest_files=[ "res://.import/head-sheet.png-b62fb5150ba83f16f40fa31b11530d2a.stex" ] [params] diff --git a/assets/main/world/creature/0/leg-z0-sheet.png b/assets/main/world/creature/1/leg-z0-sheet.png similarity index 100% rename from assets/main/world/creature/0/leg-z0-sheet.png rename to assets/main/world/creature/1/leg-z0-sheet.png diff --git a/assets/main/world/creature/0/leg-z0-sheet.png.import b/assets/main/world/creature/1/leg-z0-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/leg-z0-sheet.png.import rename to assets/main/world/creature/1/leg-z0-sheet.png.import index 0f41c8491..cbc04678e 100644 --- a/assets/main/world/creature/0/leg-z0-sheet.png.import +++ b/assets/main/world/creature/1/leg-z0-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/leg-z0-sheet.png-cd44655b602a444f71d0e9f9e0bb8768.stex" +path="res://.import/leg-z0-sheet.png-ca9f7ff03e35d519dd7369d1263d56a8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/leg-z0-sheet.png" -dest_files=[ "res://.import/leg-z0-sheet.png-cd44655b602a444f71d0e9f9e0bb8768.stex" ] +source_file="res://assets/main/world/creature/1/leg-z0-sheet.png" +dest_files=[ "res://.import/leg-z0-sheet.png-ca9f7ff03e35d519dd7369d1263d56a8.stex" ] [params] diff --git a/assets/main/world/creature/0/leg-z1-sheet.png b/assets/main/world/creature/1/leg-z1-sheet.png similarity index 100% rename from assets/main/world/creature/0/leg-z1-sheet.png rename to assets/main/world/creature/1/leg-z1-sheet.png diff --git a/assets/main/world/creature/0/leg-z1-sheet.png.import b/assets/main/world/creature/1/leg-z1-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/leg-z1-sheet.png.import rename to assets/main/world/creature/1/leg-z1-sheet.png.import index 8d89d7e34..6eeab0a53 100644 --- a/assets/main/world/creature/0/leg-z1-sheet.png.import +++ b/assets/main/world/creature/1/leg-z1-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/leg-z1-sheet.png-878721da787ae111967ce7908b5ce647.stex" +path="res://.import/leg-z1-sheet.png-86885cf6b94da3e9058e1c21b1b7b808.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/leg-z1-sheet.png" -dest_files=[ "res://.import/leg-z1-sheet.png-878721da787ae111967ce7908b5ce647.stex" ] +source_file="res://assets/main/world/creature/1/leg-z1-sheet.png" +dest_files=[ "res://.import/leg-z1-sheet.png-86885cf6b94da3e9058e1c21b1b7b808.stex" ] [params] diff --git a/assets/main/world/creature/1/mouth-sheet.png b/assets/main/world/creature/1/mouth-sheet.png index afd9e1a16..274aa03ef 100644 Binary files a/assets/main/world/creature/1/mouth-sheet.png and b/assets/main/world/creature/1/mouth-sheet.png differ diff --git a/assets/main/world/creature/0/movement-z0-sheet.png b/assets/main/world/creature/1/movement-z0-sheet.png similarity index 100% rename from assets/main/world/creature/0/movement-z0-sheet.png rename to assets/main/world/creature/1/movement-z0-sheet.png diff --git a/assets/main/world/creature/0/movement-z0-sheet.png.import b/assets/main/world/creature/1/movement-z0-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/movement-z0-sheet.png.import rename to assets/main/world/creature/1/movement-z0-sheet.png.import index 8ed19f402..07e94f28d 100644 --- a/assets/main/world/creature/0/movement-z0-sheet.png.import +++ b/assets/main/world/creature/1/movement-z0-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/movement-z0-sheet.png-a52b47fa465b814968d38fd142511043.stex" +path="res://.import/movement-z0-sheet.png-2fa515911974cb5856c64e64f47bc5ee.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/movement-z0-sheet.png" -dest_files=[ "res://.import/movement-z0-sheet.png-a52b47fa465b814968d38fd142511043.stex" ] +source_file="res://assets/main/world/creature/1/movement-z0-sheet.png" +dest_files=[ "res://.import/movement-z0-sheet.png-2fa515911974cb5856c64e64f47bc5ee.stex" ] [params] diff --git a/assets/main/world/creature/0/neck-sheet.png b/assets/main/world/creature/1/neck-sheet.png similarity index 100% rename from assets/main/world/creature/0/neck-sheet.png rename to assets/main/world/creature/1/neck-sheet.png diff --git a/assets/main/world/creature/0/neck-sheet.png.import b/assets/main/world/creature/1/neck-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/neck-sheet.png.import rename to assets/main/world/creature/1/neck-sheet.png.import index a0d769a6f..5a6a6eaec 100644 --- a/assets/main/world/creature/0/neck-sheet.png.import +++ b/assets/main/world/creature/1/neck-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/neck-sheet.png-516ac0a5cb9d0fcba052cd31fe0634bb.stex" +path="res://.import/neck-sheet.png-1793f13a32d245e0e6ca6e496ae60304.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/neck-sheet.png" -dest_files=[ "res://.import/neck-sheet.png-516ac0a5cb9d0fcba052cd31fe0634bb.stex" ] +source_file="res://assets/main/world/creature/1/neck-sheet.png" +dest_files=[ "res://.import/neck-sheet.png-1793f13a32d245e0e6ca6e496ae60304.stex" ] [params] diff --git a/assets/main/world/creature/2/ear-z0-sheet.png b/assets/main/world/creature/2/ear-z0-sheet.png index 62b281110..2a7675d96 100644 Binary files a/assets/main/world/creature/2/ear-z0-sheet.png and b/assets/main/world/creature/2/ear-z0-sheet.png differ diff --git a/assets/main/world/creature/2/ear-z1-sheet.png b/assets/main/world/creature/2/ear-z1-sheet.png index a6ca647d2..d510b4e37 100644 Binary files a/assets/main/world/creature/2/ear-z1-sheet.png and b/assets/main/world/creature/2/ear-z1-sheet.png differ diff --git a/assets/main/world/creature/2/ear-z2-sheet.png b/assets/main/world/creature/2/ear-z2-sheet.png index 86d6d2f1d..32f33ed21 100644 Binary files a/assets/main/world/creature/2/ear-z2-sheet.png and b/assets/main/world/creature/2/ear-z2-sheet.png differ diff --git a/assets/main/world/creature/2/eyes-sheet.png b/assets/main/world/creature/2/eyes-sheet.png index b5d0bf32a..bc2b63e24 100644 Binary files a/assets/main/world/creature/2/eyes-sheet.png and b/assets/main/world/creature/2/eyes-sheet.png differ diff --git a/assets/main/world/creature/2/food-laser-sheet.png b/assets/main/world/creature/2/food-laser-sheet.png new file mode 100644 index 000000000..75e76aec8 Binary files /dev/null and b/assets/main/world/creature/2/food-laser-sheet.png differ diff --git a/assets/main/world/creature/0/food-laser-sheet.png.import b/assets/main/world/creature/2/food-laser-sheet.png.import similarity index 66% rename from assets/main/world/creature/0/food-laser-sheet.png.import rename to assets/main/world/creature/2/food-laser-sheet.png.import index 4e769cfcc..fc3bdf264 100644 --- a/assets/main/world/creature/0/food-laser-sheet.png.import +++ b/assets/main/world/creature/2/food-laser-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/food-laser-sheet.png-84d920cca3ac70f5132de154fccb0a6c.stex" +path="res://.import/food-laser-sheet.png-ca71e48704c464ca44a2047bdf2377ce.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/food-laser-sheet.png" -dest_files=[ "res://.import/food-laser-sheet.png-84d920cca3ac70f5132de154fccb0a6c.stex" ] +source_file="res://assets/main/world/creature/2/food-laser-sheet.png" +dest_files=[ "res://.import/food-laser-sheet.png-ca71e48704c464ca44a2047bdf2377ce.stex" ] [params] diff --git a/assets/main/world/creature/0/food-laser-sheet.png b/assets/main/world/creature/2/food-sheet.png similarity index 73% rename from assets/main/world/creature/0/food-laser-sheet.png rename to assets/main/world/creature/2/food-sheet.png index a0e821d73..eaa8b4ce8 100644 Binary files a/assets/main/world/creature/0/food-laser-sheet.png and b/assets/main/world/creature/2/food-sheet.png differ diff --git a/assets/main/world/creature/0/food-sheet.png.import b/assets/main/world/creature/2/food-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/food-sheet.png.import rename to assets/main/world/creature/2/food-sheet.png.import index bd940ce18..0910469eb 100644 --- a/assets/main/world/creature/0/food-sheet.png.import +++ b/assets/main/world/creature/2/food-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/food-sheet.png-40976191c4072a3f40c418fa17785503.stex" +path="res://.import/food-sheet.png-bb9eb29f4e93d9e2b60d4f05c1dad79e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/food-sheet.png" -dest_files=[ "res://.import/food-sheet.png-40976191c4072a3f40c418fa17785503.stex" ] +source_file="res://assets/main/world/creature/2/food-sheet.png" +dest_files=[ "res://.import/food-sheet.png-bb9eb29f4e93d9e2b60d4f05c1dad79e.stex" ] [params] diff --git a/assets/main/world/creature/2/mouth-sheet.png b/assets/main/world/creature/2/mouth-sheet.png new file mode 100644 index 000000000..afd9e1a16 Binary files /dev/null and b/assets/main/world/creature/2/mouth-sheet.png differ diff --git a/assets/main/world/creature/0/mouth-sheet.png.import b/assets/main/world/creature/2/mouth-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/mouth-sheet.png.import rename to assets/main/world/creature/2/mouth-sheet.png.import index 172b43705..174ed6516 100644 --- a/assets/main/world/creature/0/mouth-sheet.png.import +++ b/assets/main/world/creature/2/mouth-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/mouth-sheet.png-df715d0da8c042620c4169b0dd8833f3.stex" +path="res://.import/mouth-sheet.png-88d44ad913e25e0adc8baccfd57de552.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/mouth-sheet.png" -dest_files=[ "res://.import/mouth-sheet.png-df715d0da8c042620c4169b0dd8833f3.stex" ] +source_file="res://assets/main/world/creature/2/mouth-sheet.png" +dest_files=[ "res://.import/mouth-sheet.png-88d44ad913e25e0adc8baccfd57de552.stex" ] [params] diff --git a/assets/main/world/creature/0/ear-z1-sheet.png b/assets/main/world/creature/3/ear-z0-sheet.png similarity index 55% rename from assets/main/world/creature/0/ear-z1-sheet.png rename to assets/main/world/creature/3/ear-z0-sheet.png index f91c8b573..62b281110 100644 Binary files a/assets/main/world/creature/0/ear-z1-sheet.png and b/assets/main/world/creature/3/ear-z0-sheet.png differ diff --git a/assets/main/world/creature/0/ear-z0-sheet.png.import b/assets/main/world/creature/3/ear-z0-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/ear-z0-sheet.png.import rename to assets/main/world/creature/3/ear-z0-sheet.png.import index 34ee3cf4f..6a20cd892 100644 --- a/assets/main/world/creature/0/ear-z0-sheet.png.import +++ b/assets/main/world/creature/3/ear-z0-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ear-z0-sheet.png-e2949b6c0fbfb0d1e4ead530aabaa8bf.stex" +path="res://.import/ear-z0-sheet.png-370ae33b9b3a2da20603d4662d0b3a59.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/ear-z0-sheet.png" -dest_files=[ "res://.import/ear-z0-sheet.png-e2949b6c0fbfb0d1e4ead530aabaa8bf.stex" ] +source_file="res://assets/main/world/creature/3/ear-z0-sheet.png" +dest_files=[ "res://.import/ear-z0-sheet.png-370ae33b9b3a2da20603d4662d0b3a59.stex" ] [params] diff --git a/assets/main/world/creature/0/ear-z0-sheet.png b/assets/main/world/creature/3/ear-z1-sheet.png similarity index 64% rename from assets/main/world/creature/0/ear-z0-sheet.png rename to assets/main/world/creature/3/ear-z1-sheet.png index 4a6c9cfb1..a6ca647d2 100644 Binary files a/assets/main/world/creature/0/ear-z0-sheet.png and b/assets/main/world/creature/3/ear-z1-sheet.png differ diff --git a/assets/main/world/creature/0/ear-z1-sheet.png.import b/assets/main/world/creature/3/ear-z1-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/ear-z1-sheet.png.import rename to assets/main/world/creature/3/ear-z1-sheet.png.import index 265d184ab..b5397493c 100644 --- a/assets/main/world/creature/0/ear-z1-sheet.png.import +++ b/assets/main/world/creature/3/ear-z1-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ear-z1-sheet.png-b7f26f083188e0cffcd69f8c9cc1c215.stex" +path="res://.import/ear-z1-sheet.png-0d7cab4d6644d018ee84b57e6bfbfb2b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/ear-z1-sheet.png" -dest_files=[ "res://.import/ear-z1-sheet.png-b7f26f083188e0cffcd69f8c9cc1c215.stex" ] +source_file="res://assets/main/world/creature/3/ear-z1-sheet.png" +dest_files=[ "res://.import/ear-z1-sheet.png-0d7cab4d6644d018ee84b57e6bfbfb2b.stex" ] [params] diff --git a/assets/main/world/creature/3/ear-z2-sheet.png b/assets/main/world/creature/3/ear-z2-sheet.png new file mode 100644 index 000000000..86d6d2f1d Binary files /dev/null and b/assets/main/world/creature/3/ear-z2-sheet.png differ diff --git a/assets/main/world/creature/0/ear-z2-sheet.png.import b/assets/main/world/creature/3/ear-z2-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/ear-z2-sheet.png.import rename to assets/main/world/creature/3/ear-z2-sheet.png.import index 4d794a518..5ba8a4474 100644 --- a/assets/main/world/creature/0/ear-z2-sheet.png.import +++ b/assets/main/world/creature/3/ear-z2-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/ear-z2-sheet.png-e85cfdec5132e045f51fbed1476f03df.stex" +path="res://.import/ear-z2-sheet.png-09d9227c2b2085fe66d4ab75b7465bd6.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/ear-z2-sheet.png" -dest_files=[ "res://.import/ear-z2-sheet.png-e85cfdec5132e045f51fbed1476f03df.stex" ] +source_file="res://assets/main/world/creature/3/ear-z2-sheet.png" +dest_files=[ "res://.import/ear-z2-sheet.png-09d9227c2b2085fe66d4ab75b7465bd6.stex" ] [params] diff --git a/assets/main/world/creature/3/eyes-sheet.png b/assets/main/world/creature/3/eyes-sheet.png new file mode 100644 index 000000000..b5d0bf32a Binary files /dev/null and b/assets/main/world/creature/3/eyes-sheet.png differ diff --git a/assets/main/world/creature/0/eyes-sheet.png.import b/assets/main/world/creature/3/eyes-sheet.png.import similarity index 67% rename from assets/main/world/creature/0/eyes-sheet.png.import rename to assets/main/world/creature/3/eyes-sheet.png.import index fa3724c97..af4ec8ccf 100644 --- a/assets/main/world/creature/0/eyes-sheet.png.import +++ b/assets/main/world/creature/3/eyes-sheet.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/eyes-sheet.png-111a4ba6a5b7729512d03bdde59d53a7.stex" +path="res://.import/eyes-sheet.png-0bad0bbddadd99cc9c473dce75868dd4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/main/world/creature/0/eyes-sheet.png" -dest_files=[ "res://.import/eyes-sheet.png-111a4ba6a5b7729512d03bdde59d53a7.stex" ] +source_file="res://assets/main/world/creature/3/eyes-sheet.png" +dest_files=[ "res://.import/eyes-sheet.png-0bad0bbddadd99cc9c473dce75868dd4.stex" ] [params] diff --git a/src/main/puzzle/puzzle.gd b/src/main/puzzle/puzzle.gd index 0d8e33870..e8431bb85 100644 --- a/src/main/puzzle/puzzle.gd +++ b/src/main/puzzle/puzzle.gd @@ -18,7 +18,7 @@ func _ready() -> void: if Scenario.settings.other.tutorial: Global.creature_queue.push_front({ "line_rgb": "6c4331", "body_rgb": "a854cb", "eye_rgb": "4fa94e dbe28e", "horn_rgb": "f1e398", - "ear": "2", "horn": "0", "mouth": "1", "eye": "1" + "ear": "3", "horn": "0", "mouth": "2", "eye": "2" }) $CreatureView.summon_creature() diff --git a/src/main/world/Creature3D.tscn b/src/main/world/Creature3D.tscn index 7985a310e..dc0ad1914 100644 --- a/src/main/world/Creature3D.tscn +++ b/src/main/world/Creature3D.tscn @@ -121,5 +121,5 @@ bus = "Sound Bus" [connection signal="creature_arrived" from="Viewport/Creature" to="." method="_on_Creature_creature_arrived"] [connection signal="jumped" from="Viewport/Creature" to="." method="_on_Creature_jumped"] [connection signal="landed" from="Viewport/Creature" to="." method="_on_Creature_landed"] -[connection signal="movement_animation_started" from="Viewport/Creature" to="." method="_on_Creature_movement_animation_started"] [connection signal="movement_animation_started" from="Viewport/Creature" to="Viewport" method="_on_Creature_movement_animation_started"] +[connection signal="movement_animation_started" from="Viewport/Creature" to="." method="_on_Creature_movement_animation_started"] diff --git a/src/main/world/boatricia.gd b/src/main/world/boatricia.gd index 85030cc87..50a9f4cd5 100644 --- a/src/main/world/boatricia.gd +++ b/src/main/world/boatricia.gd @@ -13,5 +13,5 @@ Boatricia is dark blue with short stubby horns. """ func get_creature_def() -> Dictionary: return {"line_rgb": "41281e", "body_rgb": "0b45a6", "eye_rgb": "fad541 ffffff", "horn_rgb": "282828", - "ear": "1", "horn": "0", "mouth": "0", "eye": "2" + "ear": "2", "horn": "0", "mouth": "1", "eye": "3" } diff --git a/src/main/world/bort.gd b/src/main/world/bort.gd index 5f4251695..f5f4b66d8 100644 --- a/src/main/world/bort.gd +++ b/src/main/world/bort.gd @@ -15,5 +15,5 @@ Bort is light blue with a tentacle mouth. func get_creature_def() -> Dictionary: return { "line_rgb": "6c4331", "body_rgb": "6f83db", "eye_rgb": "374265 eaf2f4", "horn_rgb": "f1e398", - "ear": "2", "horn": "1", "mouth": "1", "eye": "0" + "ear": "3", "horn": "1", "mouth": "2", "eye": "1" } diff --git a/src/main/world/ebe.gd b/src/main/world/ebe.gd index 7ac64a6ea..802852bf5 100644 --- a/src/main/world/ebe.gd +++ b/src/main/world/ebe.gd @@ -14,5 +14,5 @@ Ebe is brown with a beak mouth. func get_creature_def() -> Dictionary: return { "line_rgb": "6c4331", "body_rgb": "b47922", "eye_rgb": "7d4c21 e5cd7d", "horn_rgb": "f1e398", - "ear": "0", "horn": "2", "mouth": "0", "eye": "1" + "ear": "1", "horn": "2", "mouth": "1", "eye": "2" } diff --git a/src/main/world/restaurant/Creature.tscn b/src/main/world/restaurant/Creature.tscn index 519cbf290..abdd6507a 100644 --- a/src/main/world/restaurant/Creature.tscn +++ b/src/main/world/restaurant/Creature.tscn @@ -46,16 +46,16 @@ [ext_resource path="res://assets/main/world/creature/munch3.wav" type="AudioStream" id=44] [ext_resource path="res://src/main/world/multi-outline.shader" type="Shader" id=45] [ext_resource path="res://src/main/world/rgb-palette.shader" type="Shader" id=46] -[ext_resource path="res://assets/main/world/creature/0/emote-brain-sheet.png" type="Texture" id=53] +[ext_resource path="res://assets/main/world/creature/1/emote-brain-sheet.png" type="Texture" id=53] [ext_resource path="res://assets/main/ui/chat/emote-think0.wav" type="AudioStream" id=54] [ext_resource path="res://src/main/world/restaurant/emote-anims.gd" type="Script" id=58] -[ext_resource path="res://assets/main/world/creature/0/movement-z0-sheet.png" type="Texture" id=60] -[ext_resource path="res://assets/main/world/creature/0/emote-arms-sheet.png" type="Texture" id=62] -[ext_resource path="res://assets/main/world/creature/0/emote-body-sheet.png" type="Texture" id=65] -[ext_resource path="res://assets/main/world/creature/0/emote-head-sheet.png" type="Texture" id=66] +[ext_resource path="res://assets/main/world/creature/1/movement-z0-sheet.png" type="Texture" id=60] +[ext_resource path="res://assets/main/world/creature/1/emote-arms-sheet.png" type="Texture" id=62] +[ext_resource path="res://assets/main/world/creature/1/emote-body-sheet.png" type="Texture" id=65] +[ext_resource path="res://assets/main/world/creature/1/emote-head-sheet.png" type="Texture" id=66] [ext_resource path="res://assets/main/fuzzy-circle-256.png" type="Texture" id=67] [ext_resource path="res://assets/main/ui/chat/emote-rage1.wav" type="AudioStream" id=68] -[ext_resource path="res://assets/main/world/creature/0/emote-eyes-sheet.png" type="Texture" id=69] +[ext_resource path="res://assets/main/world/creature/1/emote-eyes-sheet.png" type="Texture" id=69] [ext_resource path="res://assets/main/ui/chat/emote-rage0.wav" type="AudioStream" id=70] [ext_resource path="res://assets/main/ui/chat/emote-smile1.wav" type="AudioStream" id=71] [ext_resource path="res://assets/main/ui/chat/emote-think1.wav" type="AudioStream" id=72] @@ -2420,14 +2420,8 @@ light_mask = 2 rotation = 0.00355033 curve = SubResource( 7 ) script = ExtResource( 3 ) -spline_length = 25.0 -_smooth = false -_straighten = false -closed = true -line_color = Color( 0, 0, 0, 1 ) fill_color = Color( 0, 0, 0, 1 ) line_width = 2.0 -_fatness = 1.0 editing = false [node name="Outline" type="Path2D" parent="Sprites/Body"] diff --git a/src/main/world/restaurant/creature.gd b/src/main/world/restaurant/creature.gd index bedee76e8..07a3f01ef 100644 --- a/src/main/world/restaurant/creature.gd +++ b/src/main/world/restaurant/creature.gd @@ -370,14 +370,15 @@ func summon(creature_def: Dictionary, use_defaults: bool = true) -> void: # avoid loading unnecessary resources for things like the level editor pass else: - put_if_absent(_creature_def, "eye", ["0", "0", "0", "1", "2"][randi() % 5]) - put_if_absent(_creature_def, "ear", ["0", "0", "0", "1", "2"][randi() % 5]) + put_if_absent(_creature_def, "eye", ["1", "1", "1", "2", "3"][randi() % 5]) + put_if_absent(_creature_def, "ear", ["1", "1", "1", "2", "3"][randi() % 5]) put_if_absent(_creature_def, "horn", ["0", "0", "0", "1", "2"][randi() % 5]) - put_if_absent(_creature_def, "mouth", ["0", "0", "1"][randi() % 3]) - put_if_absent(_creature_def, "body", "0") + put_if_absent(_creature_def, "mouth", ["1", "1", "2"][randi() % 3]) + put_if_absent(_creature_def, "body", "1") _creature_loader.load_details(_creature_def) _update_creature_properties() + set_fatness(1) """ @@ -600,9 +601,9 @@ func _update_creature_properties() -> void: if _creature_def.has("mouth"): # set the sprite's color/texture properties - if _creature_def.mouth == "0": + if _creature_def.mouth == "1": _mouth_animation_player = $Mouth0Anims - elif _creature_def.mouth == "1": + elif _creature_def.mouth == "2": _mouth_animation_player = $Mouth1Anims else: print("Invalid mouth: %s", _creature_def.mouth) diff --git a/src/main/world/spira.gd b/src/main/world/spira.gd index e6596aa82..f91177634 100644 --- a/src/main/world/spira.gd +++ b/src/main/world/spira.gd @@ -125,7 +125,7 @@ Spira is dark red with black eyes. func get_creature_def() -> Dictionary: return { "line_rgb": "6c4331", "body_rgb": "b23823", "eye_rgb": "282828 dedede", "horn_rgb": "f1e398", - "ear": "0", "horn": "1", "mouth": "1", "eye": "0" + "ear": "1", "horn": "1", "mouth": "2", "eye": "1" }