From ccdacbfa459bc8d4d36cae3f035d750043a9141d Mon Sep 17 00:00:00 2001
From: crumblingstatue <radiantstatue@gmail.com>
Date: Mon, 3 Apr 2023 21:44:08 +0200
Subject: [PATCH] Add background and foreground tile layers

---
 res/tiles.png | Bin 4700 -> 4942 bytes
 src/app.rs    |  12 +++++++-----
 src/game.rs   |  17 ++++++++++++-----
 src/world.rs  |  23 ++++++++++++++++++-----
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/res/tiles.png b/res/tiles.png
index c3223e8fe7224ec368d643b8a822d667bf4a506d..8a2ac71c512e2694f9bdd69af454594af530dc86 100644
GIT binary patch
delta 992
zcmcbka!zf6a=oyqr;B4q#hf>HZG)t}Mc6J(JKd=1G(8|mqu|WxtzFxBr#U<j&5*v=
znylW!C(?ZS{7K=BUgruDPEQk%I_rOa%d+Qlv{IY$R(b5Z{k^O|FE4MNlT*B1t=G<)
z8MQwql>FWPzs_&hKl{o3p4a&mdxG@pzP^jS^#6bR`}>ps{bgXNKTxp8Z!hB|>)OwD
zCwHBe|L%E>m4QKGQTR%81_lO(E&hxkifus<<Aa)_o2SZ8o=&pk?fz-<)r^6G;YPqN
zh61~tJpcdx-}*&=-KV>DJ7%3dbTwyMmGsFF&M)cL%MGX1R6S&7U~uqV%FVEo^_P`g
zUVd=CVyD&epXt}jOLsHWcO9x*?%MD)>*~`Y1_p+;w=@|t?xtT(vg1v^UcS}uYqkhu
z->WJAzdTX-D#pOTu;`{HgT>4Gn-~24UoZaSd;6z!2~$h=M~j%A<Gt6|85kajuV>hh
zEPF%w>?d<ACI$uu0r%&u49aYO1+@R<|J%pm+7Q_Jeosl|gTP*paZ5hb?|RMJD<QMr
z=;409=?+&H9ol~UxYvFDqmKVIr)VoMFfgQOda*YI|9u$Q{`17zzpjk273>TQ83$w;
zu839pJlKA5-g(97<^S~rSQr>?h%IGUu(p0j-_NG~Qpzk03=B6x-g(~tJj={`Z>yh-
zr(nWr?*!#P;V+dK7#L1m^J9Eae<5=p(?R{z!?ovJ8=f!x@6p8&>dwx<z`(Zf6Nkgq
zvj20q+1d~NJ^VJ;-TLJ<aM+i;=4+Uy$6B*)y8kcT@YPqM85kHc{!1Q+dCwlv{<~B#
zA^yhswHyIo{=|1LW;pL$zkc2qYg<dty{rrj4Hm2opHHT4bNoNy4%0t7*Ms%-!QT4J
z3=9kxCWJF+=mze%fBn<_-GK}Y3=LDF<QWzCSNea`KlWJQ(81+@ySkY6N=kw(bDqN2
zaOY{w<a)OfkS|377&H<!ivPL4I)AeE;LH6V_!$@q92PS<ob&&4b!l|M{;!`KO?&3G
z{twJpx%B?zS_TG(b!A)(p-y{G|F7TnROnx_{nPD|f28lI8gPAWu75fIV~RWj!-Umy
zy%}16{VI|awb;F{TkytqF3#9kr5*cp3|gAS*_ap@c)Ye)GxRV&NtM0vx{NtTOkh`y
z<Ad9eAJ6A!U|^_s)n*VW<<sE%5<FSS;rPM*D~{g(T+hJ3@UT^|q4u2m^sUF4dqlrz
zgil}oowro(%k<S#t(h4Z8t!S_WmGtF*zBP^1H+5Smt+~9WdD3@_f>53LnaG;frj~S
r4=RGPM8ksr>+dG8PkzXxBi5jLft~;KouAU{KzYT})z4*}Q$iB}6B4|A

delta 762
zcmX@7c1LA`a=nnUr;B4q#hf>H4fAe02(SiN6$mP%GOQF*SQ=I}SLyl%!H^#;d))FK
zTJ@e1S@o7-<)V8HyO$VnTv(VoQRJxN^!HbrcD((+dvo>XyLtc98td-ecdxTM{r;WP
z{{KI3_g{ElKewL$Z{4(1^NZXJ3=A`xZogm^cz^l0zT*AbsydFJ^?D2p2SjQ+;ushh
z7z%2+K-7!|H`W75`}Um5_dNY^!^ysO-!DcC3=A48V;OXwoqqFue*D(|J5J^wPni1r
zrq=nz(*>7#E||aedw2{d0|P_u6+MO^?k~AE@5(NEb6iX_uitjhnw5cp!9Zau(}9b%
zr~2A`&7$8&zkQ|6$iTo*-?li2;l|7Q+gHl|cU%7R?*9xHZab*W5F*mJcXec)Dgy(9
z!=8KG49aYeFMM^a^I~9NXo%P=&fvz=w%+eY{^u+6uY*i_R1(B+<Ldl*N@s3gWoKZJ
zU@vF5FiW<UfuZ5!izN&NYwCBM`Nqt^(Br(6p<vE_>(w^>aZdVE>Omep9InZ5?(H*e
zj<_ql-!-Q*{BH-_dZ55mjxnR^j{Va^4`O!I-+5aV<+;C0oZ(bC!wwMv28M(idF%f+
zhP-FjI8+<RG>7Z=%Bc*l2kKulIV=X7dexJ0!wmh&yuY3=5&Pg@ssCeor6dCbL&A(b
zOb)q+Y#A61RFu{SF-)*~D9^x<a7To}bV<!*dj<xE%L^D*Bx)7^V_;xd@_G@I!c+Bs
zw~C@3Y<cw4fq{YHSGXp_td^?j|MyPw`tjas$@J#^yIB|*7?MKfF^asp?VTEuu<c&C
z(2disO%M1P7z9>twr1#IUb2+qO|C!l6mAxfZ3=PetOu&q*{7H=KQ8g)RQSQnz`*03
z%JN{!(VCl8HU}aOR&ah~U|`5xQOo4e!43+<RkchFCAPNqF8Yj{FEVTMPkz9xW%_R`
odppQ(hNge}%bI0D-bTg|O!WyT7HLW3TY*G9UHx3vIVCg!0CQV79smFU

diff --git a/src/app.rs b/src/app.rs
index e828e61..1780100 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -98,8 +98,8 @@ impl App {
                 .move_y(self.game.player.vspeed, |player_en, off| {
                     let mut col = false;
                     for_each_tile_on_screen(self.game.camera_offset, |tp, _sp| {
-                        let tid = self.game.world.tile_at_mut(tp).id;
-                        if tid == Tile::AIR {
+                        let tid = self.game.world.tile_at_mut(tp).mid;
+                        if tid == Tile::EMPTY {
                             return;
                         }
                         let tsize = TILE_SIZE as i32;
@@ -119,8 +119,8 @@ impl App {
                 .move_x(self.game.player.hspeed, |player_en, off| {
                     let mut col = false;
                     for_each_tile_on_screen(self.game.camera_offset, |tp, _sp| {
-                        let tid = self.game.world.tile_at_mut(tp).id;
-                        if tid == Tile::AIR {
+                        let tid = self.game.world.tile_at_mut(tp).mid;
+                        if tid == Tile::EMPTY {
                             return;
                         }
                         let tsize = TILE_SIZE as i32;
@@ -147,7 +147,9 @@ impl App {
             imm!("Mouse down at {}, {}", wpos.x, wpos.y);
             let tpos = wpos.tile_pos();
             imm_dbg!(tpos);
-            self.game.world.tile_at_mut(tpos).id = 0;
+            let t = self.game.world.tile_at_mut(tpos);
+            t.mid = 0;
+            t.fg = 0;
         }
     }
 
diff --git a/src/game.rs b/src/game.rs
index 4fd8d6a..e80c6b2 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -22,12 +22,19 @@ impl GameState {
         let mut s = Sprite::with_texture(&res.tile_atlas);
         for_each_tile_on_screen(self.camera_offset, |tp, sp| {
             let tile = self.world.tile_at_mut(tp);
-            if tile.id == Tile::AIR {
-                return;
-            }
-            s.set_texture_rect(Rect::new((tile.id - 1) as i32 * 32, 0, 32, 32));
             s.set_position(sp.to_sf_vec());
-            rw.draw(&s);
+            if tile.bg != Tile::EMPTY {
+                s.set_texture_rect(Rect::new((tile.bg - 1) as i32 * 32, 0, 32, 32));
+                rw.draw(&s);
+            }
+            if tile.mid != Tile::EMPTY {
+                s.set_texture_rect(Rect::new((tile.mid - 1) as i32 * 32, 0, 32, 32));
+                rw.draw(&s);
+            }
+            if tile.fg != Tile::EMPTY {
+                s.set_texture_rect(Rect::new((tile.fg - 1) as i32 * 32, 0, 32, 32));
+                rw.draw(&s);
+            }
         });
     }
     pub fn draw_entities(&mut self, rw: &mut RenderWindow) {
diff --git a/src/world.rs b/src/world.rs
index 203f0d4..3fd6aeb 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -109,16 +109,24 @@ pub struct Chunk {
 impl Chunk {
     pub fn gen(pos: ChunkPos) -> Self {
         let mut rng = thread_rng();
-        let mut tiles = [Tile { id: 0 }; CHUNK_N_TILES];
+        let mut tiles = [Tile {
+            bg: 0,
+            mid: 0,
+            fg: 0,
+        }; CHUNK_N_TILES];
         if pos.y > 38 {
             for b in &mut tiles {
-                b.id = rng.gen_range(1..5);
+                b.bg = 7;
+                b.mid = rng.gen_range(1..5);
+                if rng.gen_bool(0.1) {
+                    b.fg = 6;
+                }
             }
         }
         // Unbreakable layer at bottom
         if pos.y > 510 {
             for b in &mut tiles {
-                b.id = Tile::UNBREAKANIUM;
+                b.mid = Tile::UNBREAKANIUM;
             }
         }
         Self { tiles }
@@ -133,10 +141,15 @@ type TileId = u16;
 
 #[derive(Clone, Copy)]
 pub struct Tile {
-    pub id: TileId,
+    /// Background wall behind entities
+    pub bg: TileId,
+    /// The solid wall on the same level as entities
+    pub mid: TileId,
+    /// A layer on top of the mid wall. Usually ores or decorative pieces.
+    pub fg: TileId,
 }
 
 impl Tile {
-    pub const AIR: TileId = 0;
+    pub const EMPTY: TileId = 0;
     pub const UNBREAKANIUM: TileId = 5;
 }