Skip to content

Commit

Permalink
Emptied customer resource folder '0'.
Browse files Browse the repository at this point in the history
Horn resource '0' was being used to mark creatures without horns. With
mouths, arms, eyes and ears moved out of folder '0', this convention can
be used for those other features as well. We'll someday have creatures
without eyes. We might have creatures without arms or heads as well, who
knows.

Fixed refactoring regression where creatures started out fat sometimes.
  • Loading branch information
Poobslag committed Jun 3, 2020
1 parent 9460537 commit 3fb0884
Show file tree
Hide file tree
Showing 61 changed files with 76 additions and 81 deletions.
Binary file removed assets/main/world/creature/0/ear-z2-sheet.png
Binary file not shown.
Binary file removed assets/main/world/creature/0/eyes-sheet.png
Binary file not shown.
Binary file removed assets/main/world/creature/0/food-sheet.png
Binary file not shown.
Binary file removed assets/main/world/creature/0/mouth-sheet.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file modified assets/main/world/creature/1/ear-z0-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/1/ear-z1-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/1/ear-z2-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file modified assets/main/world/creature/1/eyes-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/1/food-laser-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/1/food-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file modified assets/main/world/creature/1/mouth-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file modified assets/main/world/creature/2/ear-z0-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/2/ear-z1-sheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/main/world/creature/2/ear-z2-sheet.png
Binary file modified assets/main/world/creature/2/eyes-sheet.png
Binary file added assets/main/world/creature/2/food-laser-sheet.png
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file added assets/main/world/creature/2/mouth-sheet.png
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file added assets/main/world/creature/3/ear-z2-sheet.png
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Binary file added assets/main/world/creature/3/eyes-sheet.png
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion src/main/puzzle/puzzle.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/main/world/Creature3D.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion src/main/world/boatricia.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion src/main/world/bort.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion src/main/world/ebe.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Loading

0 comments on commit 3fb0884

Please sign in to comment.