diff --git a/assets/config/actor.ron b/assets/config/actor.ron index 703f90b..f5b9109 100644 --- a/assets/config/actor.ron +++ b/assets/config/actor.ron @@ -24,6 +24,28 @@ }, enemies: { + // TODO: If character select screen is implemented, uncomment this and include logic to + // avoid spawning enemies that look like the player (aka same key). + /*"pink": Actor( + name: "Linus", + + texture: "image/actor/pink.png", + texture_atlas_grid: TextureAtlasGrid( + tile_size: UVec2(9, 8), + columns: 2, + rows: 1, + ), + sprite_animation: SpriteAnimation( + frames: [ + SpriteAnimationFrame(index: 0, beats: 8), + SpriteAnimationFrame(index: 1, beats: 8), + ], + ), + + attack: Attack(color: Srgba(Srgba(red: 0.855, green: 0.576, blue: 0.800, alpha: 1.000))), + deck: Deck(cards: ["step", "pair", "pair"]), + ),*/ + "red": Actor( name: "Lucy", @@ -44,14 +66,12 @@ deck: Deck(cards: ["step", "step", "pair"]), ), - // TODO: If character select screen is implemented, uncomment this and include logic to - // avoid spawning enemies that look like the player (aka same key). - /*"pink": Actor( - name: "Linus", + "yellow": Actor( + name: "Lemon", - texture: "image/actor/pink.png", + texture: "image/actor/yellow.png", texture_atlas_grid: TextureAtlasGrid( - tile_size: UVec2(9, 8), + tile_size: UVec2(8, 8), columns: 2, rows: 1, ), @@ -62,9 +82,9 @@ ], ), - attack: Attack(color: Srgba(Srgba(red: 0.855, green: 0.576, blue: 0.800, alpha: 1.000))), - deck: Deck(cards: ["step", "pair", "pair"]), - ),*/ + attack: Attack(color: Srgba(Srgba(red: 0.839, green: 0.816, blue: 0.510, alpha: 1.000))), + deck: Deck(cards: ["step", "whole_note", "quarter_rest"]), + ), "green": Actor( name: "Jade", diff --git a/assets/config/wave.ron b/assets/config/wave.ron index e30c5c8..8856466 100644 --- a/assets/config/wave.ron +++ b/assets/config/wave.ron @@ -14,6 +14,11 @@ condition: [GreaterThan(3)] ) ], + "yellow": [ + SpawnInfo( + condition: [GreaterThan(5)] + ) + ], "green": [ SpawnInfo( condition: [GreaterThan(3)] diff --git a/assets/image/actor/yellow.aseprite b/assets/image/actor/yellow.aseprite new file mode 100644 index 0000000..2187c93 Binary files /dev/null and b/assets/image/actor/yellow.aseprite differ diff --git a/assets/image/actor/yellow.png b/assets/image/actor/yellow.png new file mode 100644 index 0000000..1d9c650 Binary files /dev/null and b/assets/image/actor/yellow.png differ diff --git a/assets/mockup/pyrious.aseprite b/assets/mockup/pyrious.aseprite index 1e187fd..92282c2 100644 Binary files a/assets/mockup/pyrious.aseprite and b/assets/mockup/pyrious.aseprite differ