From 542b0f54760260fad3d27809f3ea81a39608b679 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 21 Jul 2024 22:17:49 +0200 Subject: pc: rename chef/customer textures --- pixel-client/assets/misc.ini | 4 ++-- pixel-client/assets/textures/chef.ta | 38 ++++++++++++++++++++++++++++++++ pixel-client/assets/textures/costumer.ta | 38 -------------------------------- pixel-client/assets/textures/customer.ta | 38 ++++++++++++++++++++++++++++++++ pixel-client/assets/textures/player.ta | 38 -------------------------------- pixel-client/src/game.rs | 9 +++++++- pixel-client/src/render/misc.rs | 6 +++-- 7 files changed, 90 insertions(+), 81 deletions(-) create mode 100644 pixel-client/assets/textures/chef.ta delete mode 100644 pixel-client/assets/textures/costumer.ta create mode 100644 pixel-client/assets/textures/customer.ta delete mode 100644 pixel-client/assets/textures/player.ta (limited to 'pixel-client') diff --git a/pixel-client/assets/misc.ini b/pixel-client/assets/misc.ini index f499bd51..59bd9132 100644 --- a/pixel-client/assets/misc.ini +++ b/pixel-client/assets/misc.ini @@ -1,6 +1,6 @@ -player=player -costumer=costumer +chef=chef +customer=customer interact-target-thick=interact_target_thick interact-target-thin=interact_target_thin solid=solid diff --git a/pixel-client/assets/textures/chef.ta b/pixel-client/assets/textures/chef.ta new file mode 100644 index 00000000..065a3255 --- /dev/null +++ b/pixel-client/assets/textures/chef.ta @@ -0,0 +1,38 @@ + eeeeeecccee + ececcccceaee + ecaeeeeccaae + eaaaaaaacaae + eacaaacaaace + eacacacaaace + eaceeeeeeeee + eeeevvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvv + Rvvvvvvvvvv + RvvvvvvvvvR + RvvvvvvvR + RRvvvRR + wwwwRRwww + wwwwwwwvvvv + wwwwvvvvvvvv + vvwvvvvvvvvvv + vvvvvvvvvvvvvv + vvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvvvv + wvvvvvvvvvvvvvvvvvvvvvvvvw + wwvvvvvvvvvvvvvvvvvvvvvvww + wwwvvvvvvvvvvvvvvvvvvvwww + wwwwwvvvvvvvvvvvvvvvwwww + wwwwwwwvvvvvvvvvvwwwww + wwwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwww + wwwwwwwwwwwwww + wwwwwwwwwwww diff --git a/pixel-client/assets/textures/costumer.ta b/pixel-client/assets/textures/costumer.ta deleted file mode 100644 index 602b0b21..00000000 --- a/pixel-client/assets/textures/costumer.ta +++ /dev/null @@ -1,38 +0,0 @@ - - - - - vvvvv - vvvvvvvvv - vvvvvvvvvv - vvvvvvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvv - Rvvvvvvvvvv - RvvvvvvvvvR - RvvvvvvvR - RRvvvRR - wwwwRRwww - wwwwwwwvvvv - wwwwvvvvvvvv - vvwvvvvvvvvvv - vvvvvvvvvvvvvv - vvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvvvv - wvvvvvvvvvvvvvvvvvvvvvvvvw - wwvvvvvvvvvvvvvvvvvvvvvvww - wwwvvvvvvvvvvvvvvvvvvvwww - wwwwwvvvvvvvvvvvvvvvwwww - wwwwwwwvvvvvvvvvvwwwww - wwwwwwwwwwwwwwwwwwww - wwwwwwwwwwwwwwww - wwwwwwwwwwwwww - wwwwwwwwwwww diff --git a/pixel-client/assets/textures/customer.ta b/pixel-client/assets/textures/customer.ta new file mode 100644 index 00000000..602b0b21 --- /dev/null +++ b/pixel-client/assets/textures/customer.ta @@ -0,0 +1,38 @@ + + + + + vvvvv + vvvvvvvvv + vvvvvvvvvv + vvvvvvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvvv + vvvvvvvvvvv + Rvvvvvvvvvv + RvvvvvvvvvR + RvvvvvvvR + RRvvvRR + wwwwRRwww + wwwwwwwvvvv + wwwwvvvvvvvv + vvwvvvvvvvvvv + vvvvvvvvvvvvvv + vvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvv + vvvvvvvvvvvvvvvvvvvvvvvvvv + wvvvvvvvvvvvvvvvvvvvvvvvvw + wwvvvvvvvvvvvvvvvvvvvvvvww + wwwvvvvvvvvvvvvvvvvvvvwww + wwwwwvvvvvvvvvvvvvvvwwww + wwwwwwwvvvvvvvvvvwwwww + wwwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwww + wwwwwwwwwwwwww + wwwwwwwwwwww diff --git a/pixel-client/assets/textures/player.ta b/pixel-client/assets/textures/player.ta deleted file mode 100644 index 065a3255..00000000 --- a/pixel-client/assets/textures/player.ta +++ /dev/null @@ -1,38 +0,0 @@ - eeeeeecccee - ececcccceaee - ecaeeeeccaae - eaaaaaaacaae - eacaaacaaace - eacacacaaace - eaceeeeeeeee - eeeevvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvvv - vvvvvvvvvvv - Rvvvvvvvvvv - RvvvvvvvvvR - RvvvvvvvR - RRvvvRR - wwwwRRwww - wwwwwwwvvvv - wwwwvvvvvvvv - vvwvvvvvvvvvv - vvvvvvvvvvvvvv - vvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvv - vvvvvvvvvvvvvvvvvvvvvvvvvv - wvvvvvvvvvvvvvvvvvvvvvvvvw - wwvvvvvvvvvvvvvvvvvvvvvvww - wwwvvvvvvvvvvvvvvvvvvvwww - wwwwwvvvvvvvvvvvvvvvwwww - wwwwwwwvvvvvvvvvvwwwww - wwwwwwwwwwwwwwwwwwww - wwwwwwwwwwwwwwww - wwwwwwwwwwwwww - wwwwwwwwwwww diff --git a/pixel-client/src/game.rs b/pixel-client/src/game.rs index c129f991..f8feb1c8 100644 --- a/pixel-client/src/game.rs +++ b/pixel-client/src/game.rs @@ -360,7 +360,14 @@ impl Game { } for p in self.players.values() { - ctx.draw_world(self.misc_textures.player.at(p.movement.position)); + ctx.draw_world( + if p._character >= 0 { + &self.misc_textures.chef + } else { + &self.misc_textures.customer + } + .at(p.movement.position), + ); if let Some(item) = &p.item { item.draw(ctx, &self.item_sprites, &self.misc_textures) } diff --git a/pixel-client/src/render/misc.rs b/pixel-client/src/render/misc.rs index c1f1295e..05cde8e4 100644 --- a/pixel-client/src/render/misc.rs +++ b/pixel-client/src/render/misc.rs @@ -20,7 +20,8 @@ use hurrycurry_protocol::glam::Vec2; use sdl2::rect::Rect; pub struct MiscTextures { - pub player: Sprite, + pub chef: Sprite, + pub customer: Sprite, pub interact_target: Sprite, pub solid: Rect, } @@ -28,7 +29,8 @@ pub struct MiscTextures { impl MiscTextures { pub fn init(layout: &AtlasLayout) -> Self { MiscTextures { - player: Sprite::new(*layout.get("player+a").unwrap(), Vec2::Y * 0.3, 0.5 + 0.3), + chef: Sprite::new(*layout.get("chef+a").unwrap(), Vec2::Y * 0.3, 0.5 + 0.3), + customer: Sprite::new(*layout.get("customer+a").unwrap(), Vec2::Y * 0.3, 0.5 + 0.3), interact_target: Sprite::new( *layout.get("interact-target-thick+a").unwrap(), Vec2::new(0.5, 1.0), -- cgit v1.2.3-70-g09d2