From c5c6378303f385c0e06f844943e84d59acaa260d Mon Sep 17 00:00:00 2001
From: 2ndbeam <2ndbeam@disroot.org>
Date: Thu, 26 Mar 2026 12:01:58 +0300
Subject: [PATCH] assets: Using new lockpick and stairs sprites

- Fixed stairs transparency
---
 assets/sprites/interactive/stairs.png | Bin 634 -> 744 bytes
 src/item/lockpick.rs                  |   2 +-
 src/layout/stairs.rs                  |  16 ++++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assets/sprites/interactive/stairs.png b/assets/sprites/interactive/stairs.png
index d2b0c70259261b4fd1bb091eeb0e0c1d5df3c775..9c8e23a0c8d9c44af6abcf22b59dd672bca05b4d 100644
GIT binary patch
delta 707
zcmV;!0zCct1n32jF@K^-L_t(|ob8)2PQySDMJL#oNP~npK_XEkwK)M2B}IzlOf(df
zmN<b^Q*sD5ImXgt!^Uye#xs9s7xqa=5fYB)@88+6znB?gC{=drCI9A)G0FXGR|~UU
zEsXulxlSpv6ajEo`}Ol{CUxDY1wa+;5~TpPa8%JQ(FhP?wSW6i6+o+Kmm7^Q-L02q
zw_X}sv{vyH(g887b{|jyVlCPQB0$J4&P7as6jr;BQe>V^tZ0{#m^W{`c}li-5!(W`
z@YJ?~coTGsPQew>V=#m(_J@M*?;a-hu_DYMgm%T|<!SQY27ealbA={q4@0gHK37b)
z_c)?>9KL;gCV%p5501r$h(dt3_mAVJg6Lv<6wvRELIB?iS4~ZAQ=eQSO%ww7u!Xlx
zeepX9-~tRav1&f<I&RTc3<)8EIKXFdcV)-Y=ZdL_2!KASy0{MD^oO>oWduMTQx;ec
z;LXxRL<MccZs!uo{oY5(UA><(Tn^M~_Yu`Gh+geJM1KSra>0<xGzzz{1sE#snm8eC
z?j!gX=&rWJS<WGd0B(`{!|~zf=!~(GAPT4eZBtV<Keu@I$oz8-n6kIIO_YO}0Gv+l
zD-bbfxRg>BM0RqY2;3f067%Nm!wBjuA3H-#MQjV8UtFLNZ-S^77bu{|U<g<255;Mw
z_&tG=A%C<hl1heR8G$WokHfAIK3Bl!0O-|6(se~wh$JRK4&7v^I@=yO8Oq5JrJM{6
zHL;uw{e@%*eN=VH$&hq1G<}w)oDAh;NRXTi<zy&4IT;G^B{><&$&jC%4CQ1<53ytj
z2|OB$nPj3dEs_XE&~Q!(mH!@(iRc~hFM^RFkUWD>-U8Y;z<(vjLtOw0^iuU2>cNOM
p>cNOMxd}>KBzBwoNG2IV@eOJDIn1`E`Gf!f002ovPDHLkV1nD2LAd|`

delta 596
zcmV-a0;~P#1^NV#F@H2kL_t(|ob8)Ea)U4sg*SmqxbbQ52{Pj{g%6S{Gr2{Il+5G=
z_%t*=M$*7!!61nCSIK_81^e{0l6d2X*O#|1D3rcy$z#+kZ=%dt`0;dxzH8xlI%khl
zi~xAHa|>R=wE$8@V_XV=EiR240W@ZN2~z>AipD%zJhboHNq_gYDjqZ);9<6x5EZ~{
z(HIc{G`lzzHUUbQ?ImiC^E4DzG^PgP%a7f>B->-ymcUqeX-k2<3F4wlaE0hLsNst1
ztpfP?%=~qwa}bht#pU@a`?u<MfhAX1Vs;tALZn>ro^9`axVR3_T`?DeV(~3p2=Ft@
z6#xJ<ljTu~K7ZSV0I3;nW>;r!TnLatdMgzdV5^BWhkfHnZKWy>NLf5*JLKF-Sp<;Y
zs^+*0MkKeX5wRXXJ4*uqRB&N?oqMD&R5f+>B<!zwrFOLqT3nx1n&6hpEWaC&1=uQX
zO&l*@j?|aHe73Ex#VP{eBCogMax*w%?@3S!@nonuOn)st-!lK419H|jwTV(-Plj?D
zTB<<tFG3|GLn#rcJ;Z%7wD$~=OC&?w14c50h-7FWk|BhbBk)KhL!zVaB$A;>h9VhS
zC6b|mNQMxR3`H^&$q*Zn42h2ZOClMHWJsS#hBO`$$xtLiX(AblWXKM-WJnV6Xv{Ok
zL}OMI5lxIpL)j%v{ypvq_YU|M!N?Yp2ccL3)-OQ+BuB$s08sj<x`uf$VvTt)Vofwb
ijzPTJJVi0dkQCo}`D+`#6zFRJ0000<MNUMnLSTa4EC<2>

diff --git a/src/item/lockpick.rs b/src/item/lockpick.rs
index 3eb0087..22cab2c 100644
--- a/src/item/lockpick.rs
+++ b/src/item/lockpick.rs
@@ -3,7 +3,7 @@ use bevy::prelude::*;
 use super::*;
 
 // TODO: replace with proper sprite
-const LOCKPICK_SPRITE: &'static str = "sprites/items/choco_bar.png";
+const LOCKPICK_SPRITE: &'static str = "sprites/items/lockpick.png";
 
 #[derive(Component, Debug, PartialEq, Eq, Default, Clone, Copy, Reflect)]
 #[reflect(Component, Debug, PartialEq, Default, Clone)]
diff --git a/src/layout/stairs.rs b/src/layout/stairs.rs
index 104c7fd..a2c47c5 100644
--- a/src/layout/stairs.rs
+++ b/src/layout/stairs.rs
@@ -5,6 +5,8 @@ use crate::{meters, player::Player};
 
 use super::*;
 
+const STAIRS_SPRITE_PATH: &'static str = "sprites/interactive/stairs.png";
+
 #[derive(Component, Debug, PartialEq, Eq, Default, Clone, Copy, Reflect)]
 #[reflect(Component, Debug, PartialEq, Default, Clone)]
 #[require(InteractiveObject, Collider, Sensor)]
@@ -62,11 +64,12 @@ pub fn on_stairs_interact(
 }
 
 pub fn stairs_bundle(
-    _asset_server: &Res<AssetServer>,
+    asset_server: &Res<AssetServer>,
     position: Vec2,
     up_position: Option<Vec2>,
     down_position: Option<Vec2>,
 ) -> impl Bundle {
+    let image = asset_server.load(STAIRS_SPRITE_PATH);
     let (has_up, has_down) = (up_position.is_some(), down_position.is_some());
     (
         Stairs {
@@ -74,7 +77,8 @@ pub fn stairs_bundle(
             down: down_position,
         },
         Transform::from_xyz(position.x, position.y, -1.),
-        Children::spawn(
+        InheritedVisibility::VISIBLE,
+        Children::spawn((
             SpawnWith(move |parent: &mut RelatedSpawner<ChildOf>| {
                 if has_up {
                     parent.spawn((
@@ -82,6 +86,10 @@ pub fn stairs_bundle(
                         Collider::cuboid(meters(1.), meters(1.)),
                         Transform::from_xyz(meters(-1.), 0., 0.),
                     ));
+                    parent.spawn((
+                        Sprite::from_image(image),
+                        Transform::from_xyz(0., meters(1.5), 0.),
+                    ));
                 }
 
                 if has_down {
@@ -91,8 +99,8 @@ pub fn stairs_bundle(
                         Transform::from_xyz(meters(1.), 0., 0.),
                     ));
                 }
-            })
-        ),
+            }),
+        )),
         Name::new(format!("Stairs ({},{})", position.x, position.y))
     )
 }