From b175a2f1fd8cac50244d0b19dc9e07fde6dcfc8b Mon Sep 17 00:00:00 2001
From: Amatsugu <khamraj@kaisei.app>
Date: Sun, 30 Jun 2024 16:09:56 -0400
Subject: [PATCH] Improved biomes

---
 Cargo.lock                              | 1 +
 game/buildings/Cargo.toml               | 1 +
 game/main/assets                        | 2 +-
 game/main/src/map_rendering/map_init.rs | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c87fdf..c4b7aba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1329,6 +1329,7 @@ dependencies = [
  "bevy",
  "bevy_rapier3d",
  "serde",
+ "serde_json",
  "shared",
  "world_generation",
 ]
diff --git a/game/buildings/Cargo.toml b/game/buildings/Cargo.toml
index ef9de48..d5724dd 100644
--- a/game/buildings/Cargo.toml
+++ b/game/buildings/Cargo.toml
@@ -12,6 +12,7 @@ shared = {path = "../shared"}
 bevy_rapier3d = "0.26.0"
 serde = {version="1.0.203", features=["derive"]}
 asset_loader = {path = "../../engine/asset_loader"}
+serde_json = "1.0.115"
 
 
 [features]
diff --git a/game/main/assets b/game/main/assets
index 3021a03..ad2a485 160000
--- a/game/main/assets
+++ b/game/main/assets
@@ -1 +1 @@
-Subproject commit 3021a03b38e372d795cbba1e687b13139af07710
+Subproject commit ad2a485fc589170c82839c43253e481fef005f74
diff --git a/game/main/src/map_rendering/map_init.rs b/game/main/src/map_rendering/map_init.rs
index 68f8b4c..c0a8699 100644
--- a/game/main/src/map_rendering/map_init.rs
+++ b/game/main/src/map_rendering/map_init.rs
@@ -95,11 +95,11 @@ fn load_textures(
 	asset_server: Res<AssetServer>,
 	mut water_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, WaterMaterial>>>,
 ) {
-	let main_tex = asset_server.load("textures/world/stack.png");
+	let main_tex = asset_server.load("textures/world/Terra.png");
 
 	let water_material = water_materials.add(ExtendedMaterial {
 		base: StandardMaterial {
-			base_color: Color::CYAN.with_a(1.),
+			base_color: Color::CYAN.with_a(0.8),
 			alpha_mode: AlphaMode::Blend,
 			..Default::default()
 		},
@@ -162,7 +162,7 @@ fn finalize_texture(
 ) {
 	let image = images.get_mut(&atlas.handle).unwrap();
 
-	let array_layers = 14;
+	let array_layers = image.height() / image.width();
 	image.reinterpret_stacked_2d_as_array(array_layers);
 
 	atlas.is_loaded = true;