diff --git a/assets/sprites/structures/crafter.aseprite b/assets/sprites/structures/crafter.aseprite index d00ff1f..03ca4af 100644 --- a/assets/sprites/structures/crafter.aseprite +++ b/assets/sprites/structures/crafter.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4fae7fb619856f27ace107c42370eb9d634d0b8b4a91439be3ef46419bb5f09 -size 6162 +oid sha256:3f01580d82ea23dc52b8b719141bf37b602fd413d82113a7280a82c476efec3d +size 12936 diff --git a/assets/sprites/structures/harvester.aseprite b/assets/sprites/structures/harvester.aseprite index 1026baa..8d7b23f 100644 --- a/assets/sprites/structures/harvester.aseprite +++ b/assets/sprites/structures/harvester.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f4da7f2f2b1df1ea15b1a878f5f87266a533c5eeb4e434b53e80188cb9aaf5f -size 6170 +oid sha256:b2dfe7ac8bdd21fc869a7969ea9e8cadd19d20a770baf73ca1668f5e42ea31cb +size 8892 diff --git a/assets/sprites/structures/harvester_default.png b/assets/sprites/structures/harvester_default.png deleted file mode 100644 index 0fcd79c..0000000 --- a/assets/sprites/structures/harvester_default.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a0027c3bd6cecb217a866cb5a4bd6f813deb883980885deb3461d6b332d8bdf -size 103545 diff --git a/assets/sprites/structures/harvester_fauna.aseprite b/assets/sprites/structures/harvester_fauna.aseprite new file mode 100644 index 0000000..8ad1f6a --- /dev/null +++ b/assets/sprites/structures/harvester_fauna.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c74487da65179a74fe0a75b2d0fdd7414798594b7f44f1936820695cf22ddabe +size 9671 diff --git a/assets/sprites/structures/harvester_fauna.png b/assets/sprites/structures/harvester_fauna.png deleted file mode 100644 index ef74740..0000000 --- a/assets/sprites/structures/harvester_fauna.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f60ddc69a50f9dfabb4ed7a99c811c3d275389f39344ad5deaab0a2bd38a887 -size 134602 diff --git a/assets/sprites/structures/harvester_flora.aseprite b/assets/sprites/structures/harvester_flora.aseprite new file mode 100644 index 0000000..756fb03 --- /dev/null +++ b/assets/sprites/structures/harvester_flora.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f651b6c7b373b36589949d7e1f0b97894a4c0b7b1f3d2bcc13890816a06d6eb7 +size 24898 diff --git a/assets/sprites/structures/harvester_flora.png b/assets/sprites/structures/harvester_flora.png deleted file mode 100644 index da26573..0000000 --- a/assets/sprites/structures/harvester_flora.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72d167be91dd47216ea53cd7cfce9fe525c9edd9bf45167642660c54fd69529a -size 123164 diff --git a/assets/sprites/structures/harvester_minerale.aseprite b/assets/sprites/structures/harvester_minerale.aseprite new file mode 100644 index 0000000..4db2578 --- /dev/null +++ b/assets/sprites/structures/harvester_minerale.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13c263c62892dd53fd9aa758d8051a57bb4072a1e727db8a1657a5834b66bec +size 27936 diff --git a/assets/sprites/structures/harvester_minerale.png b/assets/sprites/structures/harvester_minerale.png deleted file mode 100644 index 76b56ec..0000000 --- a/assets/sprites/structures/harvester_minerale.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e316647d19b083548466fd837137934e6d4ee6f531d844aed509b680378196f3 -size 113818 diff --git a/assets/tiles/grass.png b/assets/tiles/grass.png index b93efea..b2d752a 100644 --- a/assets/tiles/grass.png +++ b/assets/tiles/grass.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9527ff756898e0f33c2ffc18a687925b8e2a5bc1096b0e401d8a4e8cb4308f4a -size 16946 +oid sha256:1c4c3dae155d7c754caaf3bd41b03c5e0b5a256a2279343bc4947d89f4d8c7e4 +size 22243 diff --git a/src/gameplay/world/construction.rs b/src/gameplay/world/construction.rs index ec177ea..4a57555 100644 --- a/src/gameplay/world/construction.rs +++ b/src/gameplay/world/construction.rs @@ -12,7 +12,7 @@ use crate::{ world::{ demolition::Demolished, tilemap::{ - TILE_SIZE, TileClicked, + TileClicked, coord::{Coord, translation_to_coord}, }, }, @@ -81,7 +81,10 @@ fn spawn_preview( Name::new("Construction Preview"), ConstructionPreview, Coord(IVec2::ZERO), - Sprite::from_color(Color::WHITE.with_alpha(0.5), TILE_SIZE), + Sprite { + color: Color::WHITE.with_alpha(0.5), + ..default() + }, YSortSprite, ZIndexSprite(10), )) @@ -95,7 +98,7 @@ fn spawn_preview( ); commands.entity(id).insert(( - Anchor(Vec2::new(0.0, -0.25)), + Anchor(Vec2::new(0.0, -0.33)), AseAnimation { aseprite: asset_server.load(sprite_path), animation: Animation::tag("work"), @@ -170,7 +173,7 @@ fn construct( .spawn(( Name::new(structure.name.clone()), Coord(IVec2::new(tile_click.0.x, tile_click.0.y)), - Anchor(Vec2::new(0.0, -0.25)), + Anchor(Vec2::new(0.0, -0.33)), Sprite::default(), AseAnimation { aseprite: asset_server diff --git a/src/gameplay/world/tilemap/mod.rs b/src/gameplay/world/tilemap/mod.rs index 7bf1163..d1427cc 100644 --- a/src/gameplay/world/tilemap/mod.rs +++ b/src/gameplay/world/tilemap/mod.rs @@ -12,8 +12,8 @@ pub mod chunk; pub mod coord; pub const CHUNK_SIZE: UVec2 = UVec2 { x: 16, y: 16 }; -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 const TILE_SIZE: Vec2 = Vec2 { x: 512.0, y: 256.0 }; +pub const TILE_OFFSET: Vec2 = Vec2 { x: 256.0, y: 128.0 }; pub fn plugin(app: &mut App) { app.add_plugins((chunk::plugin, coord::plugin));