chore: replace placeholder assets with custom ones (#48)

ssouthcity · web-flow · commit 97d55e0a5265 · 2025-10-04T15:54:09.000+02:00
diff --git a/assets/manifests/deposits/fauna_a.deposit.toml b/assets/manifests/deposits/fauna_a.deposit.toml
@@ -0,0 +1,4 @@
+id = "fauna_a"
+name = "Fauna A Deposit"
+recipe_id = "fauna_a"
+quantity = 3
diff --git a/assets/manifests/deposits/flora_a.deposit.toml b/assets/manifests/deposits/flora_a.deposit.toml
@@ -1,4 +1,4 @@
 id = "flora_a"
 name = "Flora A Deposit"
 recipe_id = "flora_a"
-quantity = 14
+quantity = 3
diff --git a/assets/manifests/items/doll.item.toml b/assets/manifests/items/doll.item.toml
@@ -1,3 +1,4 @@
 id = "doll"
 name = "Doll"
+sprite = "sprites/items/doll.png"
 stack_size = 25
diff --git a/assets/manifests/items/ectoplasm.item.toml b/assets/manifests/items/ectoplasm.item.toml
@@ -1,3 +1,4 @@
 id = "ectoplasm"
 name = "Ectoplasm"
+sprite = "sprites/items/ectoplasm.png"
 stack_size = 50
diff --git a/assets/manifests/items/sack.item.toml b/assets/manifests/items/sack.item.toml
@@ -1,3 +1,4 @@
 id = "sack"
 name = "Sack"
+sprite = "sprites/items/sack.png"
 stack_size = 75
diff --git a/assets/manifests/structures/constructor.structure.toml b/assets/manifests/structures/constructor.structure.toml
diff --git a/assets/manifests/structures/crafter.structure.toml b/assets/manifests/structures/crafter.structure.toml
@@ -0,0 +1,3 @@
+id = "crafter"
+name = "Crafter"
+default_recipe = "sack"
diff --git a/assets/manifests/structures/harvester.structure.toml b/assets/manifests/structures/harvester.structure.toml
@@ -0,0 +1,3 @@
+id = "harvester"
+name = "Harvester"
+default_recipe = "flora_a"
diff --git a/assets/manifests/structures/miner.structure.toml b/assets/manifests/structures/miner.structure.toml
diff --git a/assets/manifests/structures/smelter.structure.toml b/assets/manifests/structures/smelter.structure.toml
diff --git a/assets/sprites/deposits/fauna_a.png b/assets/sprites/deposits/fauna_a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eed76475097a3da40e3503ccd29e84682d9e6c87261bf69c37e25173ed14ef24
+size 4998
diff --git a/assets/sprites/deposits/flora_a.png b/assets/sprites/deposits/flora_a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73c734db63596f61687c2b8c2771d0923d937d137fc62b27b5269c826ff4e835
+size 5893
diff --git a/assets/sprites/deposits/iron_deposit.png b/assets/sprites/deposits/iron_deposit.png
diff --git a/assets/sprites/items/doll.png b/assets/sprites/items/doll.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84cbe54e4ca8c16d98b48d3622332f6f70c3a0e2984c2c1876286c62ac1db54c
+size 52084
diff --git a/assets/sprites/items/ectoplasm.png b/assets/sprites/items/ectoplasm.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f31120470277cf6a97276ced1eb3a7b4f87399cf4a030a62b18677a0e07c1328
+size 86662
diff --git a/assets/sprites/items/ritual_doll.png b/assets/sprites/items/ritual_doll.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84cbe54e4ca8c16d98b48d3622332f6f70c3a0e2984c2c1876286c62ac1db54c
-size 52084
+oid sha256:9da3bd0e01dca5f4b84f023d58860c73ab0c2e5c0afe4ab0ef7037f730f64157
+size 68614
diff --git a/assets/sprites/items/sack.png b/assets/sprites/items/sack.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4646c368cd4686b9f42f04acca225ed1c8c67e33e80884e44710eea007aed813
+size 68360
diff --git a/assets/sprites/logistics/path.png b/assets/sprites/logistics/path.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab7ecaf15bfdb0236624c4b4a76b5db889dfb54ee0e1382123617e8c098408ad
-size 4124
+oid sha256:53dee2e0a6bdfb4dba5647bb0143f6fd0cf1f40c6637f95428cabd3a4c5b7099
+size 760
diff --git a/assets/sprites/logistics/porter.aseprite b/assets/sprites/logistics/porter.aseprite
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69f1ae80311201fca7db5d54406b3de4756045112bdeae5ece363b8358b1b160
-size 6437
+oid sha256:cf813c21d758de7bb0572d50c2023150e92d00a021e3c0e957f13cb640590d42
+size 3341
diff --git a/assets/sprites/structures/constructor.aseprite b/assets/sprites/structures/constructor.aseprite
diff --git a/assets/sprites/structures/crafter.aseprite b/assets/sprites/structures/crafter.aseprite
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4fae7fb619856f27ace107c42370eb9d634d0b8b4a91439be3ef46419bb5f09
+size 6162
diff --git a/assets/sprites/structures/harvester.aseprite b/assets/sprites/structures/harvester.aseprite
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f4da7f2f2b1df1ea15b1a878f5f87266a533c5eeb4e434b53e80188cb9aaf5f
+size 6170
diff --git a/assets/sprites/structures/harvester_default.png b/assets/sprites/structures/harvester_default.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a0027c3bd6cecb217a866cb5a4bd6f813deb883980885deb3461d6b332d8bdf
+size 103545
diff --git a/assets/sprites/structures/harvester_fauna.png b/assets/sprites/structures/harvester_fauna.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f60ddc69a50f9dfabb4ed7a99c811c3d275389f39344ad5deaab0a2bd38a887
+size 134602
diff --git a/assets/sprites/structures/harvester_flora.png b/assets/sprites/structures/harvester_flora.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72d167be91dd47216ea53cd7cfce9fe525c9edd9bf45167642660c54fd69529a
+size 123164
diff --git a/assets/sprites/structures/harvester_minerale.png b/assets/sprites/structures/harvester_minerale.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e316647d19b083548466fd837137934e6d4ee6f531d844aed509b680378196f3
+size 113818
diff --git a/assets/sprites/structures/miner.aseprite b/assets/sprites/structures/miner.aseprite
diff --git a/assets/sprites/structures/smelter.aseprite b/assets/sprites/structures/smelter.aseprite
diff --git a/assets/tiles/grass.png b/assets/tiles/grass.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86efe3e55d99978d7f1ccf3c54852767cc1d6e0d50db51ce0b0fb629d6059755
-size 6124
+oid sha256:9527ff756898e0f33c2ffc18a687925b8e2a5bc1096b0e401d8a4e8cb4308f4a
+size 16946
diff --git a/src/gameplay/world/construction.rs b/src/gameplay/world/construction.rs
@@ -183,7 +183,7 @@ fn construct(
             .spawn((
                 Name::new(structure.name.clone()),
                 Coord::new(event.0.x, event.0.y),
-                Sprite::sized(TILE_SIZE),
+                Sprite::default(),
                 AseAnimation {
                     aseprite: asset_server
                         .load(format!("sprites/structures/{}.aseprite", structure.id)),
diff --git a/src/gameplay/world/deposit.rs b/src/gameplay/world/deposit.rs
@@ -10,7 +10,7 @@ use crate::{
         world::{
             WorldSpawnSystems,
             construction::Constructions,
-            tilemap::{CHUNK_SIZE, coord::Coord},
+            tilemap::{CHUNK_SIZE, TILE_SIZE, coord::Coord},
         },
     },
     screens::Screen,
@@ -79,7 +79,11 @@ fn spawn_deposits(
                     Coord::new(tile_pos.x, tile_pos.y),
                     YSortSprite,
                     ZIndexSprite(10),
-                    Sprite::from_image(asset_server.load("sprites/deposits/iron_deposit.png")),
+                    Sprite {
+                        image: asset_server.load(format!("sprites/deposits/{}.png", deposit.id)),
+                        custom_size: Vec2::new(TILE_SIZE.x, TILE_SIZE.y).into(),
+                        ..default()
+                    },
                     DepositRecipe(deposit.recipe_id.clone()),
                 ))
                 .id();
diff --git a/src/gameplay/world/tilemap/chunk.rs b/src/gameplay/world/tilemap/chunk.rs
@@ -61,7 +61,7 @@ fn spawn_chunk(mut commands: Commands, asset_server: Res<AssetServer>) {
             ChildOf(chunk_id),
             ZIndexSprite(i),
             TilemapBundle {
-                transform: Transform::from_xyz(0.0, grid_size.y * i as f32, 0.0),
+                transform: Transform::from_xyz(0.0, grid_size.y / 2.0 * i as f32, 0.0),
                 grid_size,
                 size: map_size,
                 storage,
diff --git a/src/gameplay/world/tilemap/mod.rs b/src/gameplay/world/tilemap/mod.rs
@@ -5,8 +5,8 @@ pub mod coord;
 pub mod map;
 
 pub const CHUNK_SIZE: UVec2 = UVec2 { x: 16, y: 16 };
-pub const TILE_SIZE: Vec2 = Vec2 { x: 256.0, y: 352.0 };
-pub const TILE_OFFSET: Vec2 = Vec2 { x: 232.0, y: 110.0 };
+pub const TILE_SIZE: Vec2 = Vec2 { x: 256.0, y: 128.0 };
+pub const TILE_OFFSET: Vec2 = Vec2 { x: 128.0, y: 64.0 };
 
 pub fn plugin(app: &mut App) {
     app.add_plugins((chunk::plugin, coord::plugin, map::plugin));

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+id = "crafter"`
	`2`	`+name = "Crafter"`
	`3`	`+default_recipe = "sack"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+id = "harvester"`
	`2`	`+name = "Harvester"`
	`3`	`+default_recipe = "flora_a"`