Multitile objects are now connected and share data, WIP on cleanup

Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 bevy = "0.9"
 bevy_asset_loader = { version = "0.14", features = ["2d", "stageless"]}
 bevy_ecs_tilemap = { version = "0.9", features = ["atlas"] }
-bevy_pixel_camera = "0.3"
 iyes_loopless = "0.9.1"
 rand = "0.8.5"
 bracket-noise = "0.8"

docs/planning.md

@@ -32,3 +32,9 @@
 ## Ideas
 - A flowing ocean with animated tiles?
 - Fishing
+- Mining ideas, multi block hit so you can hit multiple blocks
+- Certain terrain could require upgraded materials
+
+## MultiTile problem
+- we have a dest_tile we need to see if an interactable object exists there
+- interactable objects can take from 1 to many tilepos

src/camera.rs

@@ -4,7 +4,6 @@ use crate::{
     AppState, 
 };
 use bevy::{input::mouse::MouseWheel, prelude::*};
-use bevy_pixel_camera::PixelCameraBundle;
 use iyes_loopless::prelude::*;
 
 const CAM_Z: f32 = 100.; // Generally the highest depth and sprites past it will not be rendered
@@ -30,12 +29,11 @@ struct CamScrollLock(bool);
 
 fn load_camera(mut commands: Commands) {
     let _camera_entity = commands
-        // .spawn(PixelCameraBundle::from_resolution(160, 120));
         .spawn((
             Camera2dBundle {
                 transform: Transform::from_xyz(0.0, 0.0, CAM_Z),
                 projection: OrthographicProjection {
-                    scale: 1.0,
+                    scale: 0.5,
                     ..default()
                 },
                 ..default()

src/constants/world_obj_sprites.rs

@@ -1,3 +1,4 @@
+// Position of sprites inside the world_objs.png
 #![allow(dead_code)]
 
 pub const TREE_TOP: u32 = 0;

src/interact.rs

@@ -1,4 +1,4 @@
-use crate::world_gen::Blocking;
+use crate::world_gen::{Blocking, ObjectSize};
 use bevy::prelude::*;
 use bevy_ecs_tilemap::prelude::*;
 
@@ -12,11 +12,10 @@ impl Plugin for InteractPlugin {
 
 /// Type of the interaction with relavent information
 #[derive(Component)]
+#[allow(dead_code)]
 pub enum Interact {
     Harvest(Health),
-    #[allow(dead_code)]
     Pickup(),
-    #[allow(dead_code)]
     Consume(),
 }
 
@@ -36,11 +35,13 @@ impl Health {
     }
 }
 
+//TODO: update all entities that relate to the tileobj
 fn destroy_dead(
     mut commands: Commands,
     mut ev_killed: EventReader<HealthBelowZeroEvent>,
     mut tile_storage_q: Query<&mut TileStorage, With<Blocking>>,
 ) {
+    //
     for ev in ev_killed.iter() {
         for mut tile_storage in tile_storage_q.iter_mut() {
             tile_storage.remove(&ev.1);

src/main.rs

@@ -17,7 +17,6 @@ use player::PlayerPlugin;
 use bevy::prelude::*;
 use bevy::window::PresentMode;
 use bevy_ecs_tilemap::TilemapPlugin;
-use bevy_pixel_camera::PixelCameraPlugin;
 use iyes_loopless::prelude::*;
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
@@ -31,7 +30,6 @@ fn main() {
     App::new()
         .add_loopless_state(AppState::AssetLoading) // Starting state which leads to the plugin doing its job first
         .add_plugin(DefaultPluginsWithImage)
-        // .add_plugin(PixelCameraPlugin)
         .add_plugin(AssetLoadPlugin)
         .add_plugin(TilemapPlugin)
         .add_plugin(WorldGenerationPlugin)

src/player.rs

@@ -9,7 +9,7 @@ use crate::{
     effects::lerp,
     entity_tile_pos::EntityTilePos,
     interact::{HealthBelowZeroEvent, Interact},
-    world_gen::{within_bounds, Blocking},
+    world_gen::{within_bounds, Blocking, ObjectSize},
     AppState,
 };
 
@@ -148,8 +148,10 @@ fn update_sprite_position<Type: Component>(mut entity_q: Query<(&mut Transform,
 /// Checks to ensure dest tile is inbounds of the map
 fn directional_input_handle(
     mut player_q: Query<(Entity, &EntityTilePos, &mut Direction), With<Player>>,
-    interactables_q: Query<(Entity, &TilePos), With<Interact>>,
     blocking_q: Query<&TilePos, With<Blocking>>,
+    blocking_interact_q: Query<(Entity, &TilePos), (With<Interact>, With<Blocking>)>,
+    obj_tiles_q: Query<(Entity, &ObjectSize, &TilePos)>,
+    tile_storage_q: Query<&TileStorage>,
     keeb: Res<Input<KeyCode>>,
     mut ev_moveplayer: EventWriter<MoveEvent>,
     mut ev_interact: EventWriter<Interaction>,
@@ -187,16 +189,32 @@ fn directional_input_handle(
         y: dest_tile.y as u32,
     };
 
-    // if there are any in here then we cant move
-    if let Some((interactable_entity, _)) = interactables_q.iter().find(|(_, elem)| dest_tile.eq(elem)) {
-        ev_interact.send(Interaction { sender: player_entity, reciever: interactable_entity });
-    }
-    else if let Some(_) = blocking_q.iter().find(|elem| dest_tile.eq(elem)) {
+    // check if the tile is an interactable
+    //   is the dest_tile part of a multi tile -> get owner entity
+    //   is the owner entity in the interactable query -> get entity with components
+    //   give entity to the interact system
+    if let Some((dest_entity, size, _)) = obj_tiles_q.iter().find(|x| dest_tile.eq(x.2)) {
+        match *size {
+            ObjectSize::Single => {
+                ev_interact.send(Interaction { sender: player_entity, reciever: dest_entity});
+            },
+            ObjectSize::Multi(owner) => {
+                if let Ok(_) = blocking_interact_q.get(owner) {
+                    ev_interact.send(Interaction { sender: player_entity, reciever: owner});
+                };
+            },
+        }
+    } else if let Some(_) = blocking_q.iter().find(|elem| dest_tile.eq(elem)) {
         return;
     }
     else {
         ev_moveplayer.send(MoveEvent(player_entity, dest_tile));
     }
+
+
+    // if let Some((interactable_entity, _)) = blocking_interact_q.iter().find(|(_, elem)| dest_tile.eq(elem)) {
+    //     ev_interact.send(Interaction { sender: player_entity, reciever: interactable_entity });
+    // }
 }
 
 fn player_interact_handler(
@@ -206,15 +224,18 @@ fn player_interact_handler(
     mut ev_killed: EventWriter<HealthBelowZeroEvent>,
 ) {
     for ev in ev_interact.iter() {
+        //TODO: remove this if not necessary
         let _ = match player_q.get_mut(ev.sender) {
             Ok(player_entity) => player_entity,
             Err(_) => return,
         };
+
         let mut interact = match interactables_q.get_mut(ev.reciever) {
             Ok(interact) => interact,
             Err(_) => return,
         };
         match &mut *interact.0 {
+            // TODO: this should be moved into their own interact fns
             Interact::Harvest(health) => {
                 if health.hp <= 0 {
                     return;