From 04ee5646ef7d7fe819a44398ab42663a3c73adb9 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Mon, 28 Aug 2023 09:32:48 +0100 Subject: [PATCH] Add some new sprites for Corwin --- .../gfx/concept.aseprite | Bin 44613 -> 45011 bytes .../gfx/sprites16x16.aseprite | Bin 12132 -> 14325 bytes .../the-dungeon-puzzlers-lament/src/level.rs | 10 +++++----- .../src/resources.rs | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/the-dungeon-puzzlers-lament/gfx/concept.aseprite b/examples/the-dungeon-puzzlers-lament/gfx/concept.aseprite index 69259a09730f25a81aac5d0ca2079c1187c0fcce..dc8da1a4183c70dc3686ae016b11fb7b978cbde6 100644 GIT binary patch delta 2549 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 Y&%CK8r6D=rqCq((W-*4Oe%BoSZ^djeM*si- delta 2145 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 C3u00L delta 449 zcmeyG|0GT^MW2D;!BS%e0U%UhU}RumNC9F55S*wO&%2FT+H}@$;AMw9!fDYcsjcp zG8m$YvNAaN_&a+WF&LqXyZiWuxo+OWmaZw70F?XnkrC`5kedT0U(lC!wf^$u>VM~E zmgTzkULwm}^!1D1-|Y$fyXB&P=AVnoynH2g&c_(|cCxEsGfAd? zOYz@)3y%Vi8m+(?LVI_dahNuHR}OQSPfuM;)y1T(rAir1Zr*=kWG7={XWA{0w1AvoirMy?uEA diff --git a/examples/the-dungeon-puzzlers-lament/src/level.rs b/examples/the-dungeon-puzzlers-lament/src/level.rs index 2825d7ba..d827f9b4 100644 --- a/examples/the-dungeon-puzzlers-lament/src/level.rs +++ b/examples/the-dungeon-puzzlers-lament/src/level.rs @@ -41,8 +41,8 @@ impl Item { Item::SquidUp => resources::SQUID_UP_SHADOW, Item::SquidDown => resources::SQUID_DOWN_SHADOW, Item::Ice => resources::ICE, - Item::MovableBlock => resources::BLOCK, - Item::Glove => resources::GLOVE, + Item::MovableBlock => resources::ROCK_SHADOW, + Item::Glove => resources::POW_GLOVE_SHADOW, } } @@ -63,8 +63,8 @@ impl Item { Item::SquidUp => resources::SQUID_UP, Item::SquidDown => resources::SQUID_DOWN, Item::Ice => resources::ICE, - Item::MovableBlock => resources::BLOCK, - Item::Glove => resources::GLOVE, + Item::MovableBlock => resources::ROCK, + Item::Glove => resources::POW_GLOVE, } } @@ -88,7 +88,7 @@ impl Item { Item::SquidUp => STANDARD, Item::SquidDown => STANDARD, Item::Ice => ZERO, - Item::MovableBlock => ZERO, + Item::MovableBlock => STANDARD, Item::Glove => STANDARD, } } diff --git a/examples/the-dungeon-puzzlers-lament/src/resources.rs b/examples/the-dungeon-puzzlers-lament/src/resources.rs index afcc1646..ae22aff9 100644 --- a/examples/the-dungeon-puzzlers-lament/src/resources.rs +++ b/examples/the-dungeon-puzzlers-lament/src/resources.rs @@ -50,8 +50,10 @@ named_tag!( SQUID_UP_SHADOW, SQUID_DOWN_SHADOW, ICE, - BLOCK, - GLOVE, + ROCK, + ROCK_SHADOW, + POW_GLOVE, + POW_GLOVE_SHADOW, ] );