From 0a345aae5eaebef5334a841c81f5c53c76399c6f Mon Sep 17 00:00:00 2001 From: crumblingstatue Date: Tue, 4 Apr 2023 00:19:10 +0200 Subject: [PATCH] Make surface and cave generation make more sense --- res/tiles.png | Bin 4942 -> 13941 bytes src/world.rs | 13 +++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/res/tiles.png b/res/tiles.png index 8a2ac71c512e2694f9bdd69af454594af530dc86..d54a977886e5000127ea521084257b995c056733 100644 GIT binary patch literal 13941 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 delta 997 zcmeyGb53o7a=oyqr;B4q#hf>HZG)t}Mc6J(JKd=1G(8|mqu|WxtzFxBr#UFWPzs_&hKl{o3p4a&mdxG@pzP^jS^#6bR`}>ps{bgXNKTxp8Z!hB|>)OwD zCwHBe|L%E>m4QKGQTR%81_lO(E&hxkifus<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%Ahh zEPF%w>?dTQ83$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&>dwx53L$zrfn?I;6 xViRbX|Ms9FC|@)z_`m*c0{i5LYC2*Ksu$S#Pv7||y$+ONJYD@<);T3K0RVV+zwQ74 diff --git a/src/world.rs b/src/world.rs index 4aad911..bae3420 100644 --- a/src/world.rs +++ b/src/world.rs @@ -114,10 +114,19 @@ impl Chunk { mid: 0, fg: 0, }; CHUNK_N_TILES]; - if pos.y > 38 { + if pos.y == 39 { + for (i, b) in tiles.iter_mut().enumerate() { + if i / CHUNK_EXTENT as usize == 0 { + b.fg = 8; + } + b.mid = 2; + b.bg = 9; + } + } + if pos.y > 39 { for b in &mut tiles { b.bg = 7; - b.mid = rng.gen_range(1..5); + b.mid = 1; if rng.gen_bool(0.1) { b.fg = 6; }