feat: add profession concept, migrate harvesting and porting (#93)

Author: ssouthcity

assets/manifests/structures/foragers_outpost.structure.toml

@@ -0,0 +1,2 @@
+id = "foragers_outpost"
+name = "Forager's Outpost"

assets/manifests/structures/harvester.structure.toml

@@ -9,11 +9,3 @@ use crate::gameplay::item::assets::ItemDef;
 pub struct Inventory {
     pub items: HashMap<AssetId<ItemDef>, u32>,
 }
-
-impl Inventory {
-    pub fn with_single(item_id: AssetId<ItemDef>, amount: u32) -> Self {
-        Self {
-            items: HashMap::from([(item_id, amount)]),
-        }
-    }
-}

…ts/sprites/structures/harvester.aseprite …tes/structures/foragers_outpost.asepriteassets/sprites/structures/harvester.aseprite renamed to assets/sprites/structures/foragers_outpost.aseprite assets/sprites/structures/harvester.aseprite renamed to assets/sprites/structures/foragers_outpost.aseprite

@@ -24,7 +24,7 @@ pub fn plugin(app: &mut App) {
         FixedUpdate,
         (
             FactorySystems::Construction,
-            FactorySystems::Harvest,
+            FactorySystems::Forage,
             FactorySystems::Logistics,
             FactorySystems::Work,
             FactorySystems::Demolish,
@@ -50,7 +50,7 @@ pub fn plugin(app: &mut App) {
 #[derive(SystemSet, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
 pub enum FactorySystems {
     Construction,
-    Harvest,
+    Forage,
     Logistics,
     Work,
     Demolish,

…ites/structures/harvester_fauna.aseprite …ructures/foragers_outpost_fauna.asepriteassets/sprites/structures/harvester_fauna.aseprite renamed to assets/sprites/structures/foragers_outpost_fauna.aseprite assets/sprites/structures/harvester_fauna.aseprite renamed to assets/sprites/structures/foragers_outpost_fauna.aseprite

@@ -0,0 +1,117 @@
+use bevy::prelude::*;
+
+use crate::gameplay::{
+    FactorySystems,
+    item::inventory::Inventory,
+    people::{Assignment, Forager, Person},
+    structure::{
+        deposit::{Deposit, DepositDef},
+        foragers_outpost::ForagersOutpost,
+        range::Range,
+    },
+    world::{construction::Constructions, tilemap::coord::Coord},
+};
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(
+        FixedUpdate,
+        (
+            assign_deposit_to_forager,
+            forage_deposit,
+            cleanup_empty_deposits,
+        )
+            .chain()
+            .in_set(FactorySystems::Forage),
+    );
+}
+
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+#[relationship_target(relationship = Forages)]
+pub struct ForagedBy(Vec<Entity>);
+
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+#[relationship(relationship_target = ForagedBy)]
+#[require(ForagingTimer(Timer::from_seconds(1.0, TimerMode::Repeating)))]
+pub struct Forages(pub Entity);
+
+#[derive(Component, Reflect, Debug)]
+#[reflect(Component)]
+pub struct ForagingTimer(pub Timer);
+
+fn assign_deposit_to_forager(
+    foragers: Query<(Entity, &Assignment), (With<Person>, With<Forager>, Without<Forages>)>,
+    foragers_outposts: Query<(&Coord, &Range), With<ForagersOutpost>>,
+    deposit_query: Query<Entity, With<Deposit>>,
+    constructions: Res<Constructions>,
+    mut commands: Commands,
+) {
+    for (person, assignment) in foragers {
+        let Ok((coord, range)) = foragers_outposts.get(assignment.structure) else {
+            continue;
+        };
+
+        let Some(deposit) = range.iter(coord.0).find_map(|pos| {
+            constructions
+                .get(&pos)
+                .and_then(|d| deposit_query.get(*d).ok())
+        }) else {
+            continue;
+        };
+
+        commands.entity(person).insert(Forages(deposit));
+    }
+}
+
+fn forage_deposit(
+    foragers: Query<(&Forages, &mut ForagingTimer, &Assignment), With<Person>>,
+    mut foragers_outpost: Query<&mut Inventory>,
+    mut deposits: Query<&mut Deposit>,
+    deposit_definitions: Res<Assets<DepositDef>>,
+    time: Res<Time>,
+) {
+    for (forages, mut foraging_timer, assignment) in foragers {
+        if !foraging_timer.0.tick(time.delta()).just_finished() {
+            continue;
+        }
+
+        let Ok(mut foragers_outpost_inventory) = foragers_outpost.get_mut(assignment.structure)
+        else {
+            continue;
+        };
+
+        let Ok(mut deposit) = deposits.get_mut(forages.0) else {
+            continue;
+        };
+
+        let Some(deposit_def) = deposit_definitions.get(&deposit.handle) else {
+            continue;
+        };
+
+        if deposit.quantity == 0 {
+            continue;
+        }
+
+        deposit.quantity -= 1;
+
+        foragers_outpost_inventory
+            .items
+            .entry(deposit_def.item_id)
+            .and_modify(|v| *v += 1)
+            .or_insert(1);
+    }
+}
+
+fn cleanup_empty_deposits(
+    deposits: Query<(Entity, &Deposit, &Coord)>,
+    mut constructions: ResMut<Constructions>,
+    mut commands: Commands,
+) {
+    for (entity, deposit, coord) in deposits {
+        if deposit.quantity == 0 {
+            constructions.remove(coord);
+            commands.entity(entity).despawn();
+        }
+    }
+}

…ites/structures/harvester_flora.aseprite …ructures/foragers_outpost_flora.asepriteassets/sprites/structures/harvester_flora.aseprite renamed to assets/sprites/structures/foragers_outpost_flora.aseprite assets/sprites/structures/harvester_flora.aseprite renamed to assets/sprites/structures/foragers_outpost_flora.aseprite

@@ -2,12 +2,25 @@ use bevy::prelude::*;
 
 use crate::gameplay::{people::naming::NameManager, world::construction::StructureConstructed};
 
+pub mod foraging;
 pub mod naming;
 pub mod pathfinding;
 pub mod porting;
+pub mod profession;
+
+pub use profession::{
+    AssignPerson, Assignees, Assignment, Forager, PersonAssignmentChanged, Porter, Profession,
+    UnassignPerson,
+};
 
 pub(super) fn plugin(app: &mut App) {
-    app.add_plugins((naming::plugin, pathfinding::plugin, porting::plugin));
+    app.add_plugins((
+        foraging::plugin,
+        naming::plugin,
+        pathfinding::plugin,
+        porting::plugin,
+        profession::plugin,
+    ));
 
     app.add_systems(
         FixedUpdate,
@@ -19,24 +32,22 @@ pub(super) fn plugin(app: &mut App) {
 #[reflect(Component)]
 pub struct Person;
 
-#[derive(Component, Reflect, Debug)]
-#[reflect(Component)]
-#[relationship_target(relationship = HousedIn, linked_spawn)]
-pub struct Houses(Vec<Entity>);
-
-#[derive(Component, Reflect, Debug)]
-#[reflect(Component)]
-#[relationship(relationship_target = Houses)]
-pub struct HousedIn(pub Entity);
-
 fn add_housed_people_to_new_structures(
     mut structures_constructed: MessageReader<StructureConstructed>,
     mut commands: Commands,
     mut name_manager: ResMut<NameManager>,
 ) {
     for StructureConstructed(structure) in structures_constructed.read() {
         for _ in 0..3 {
-            commands.spawn((Name::new(name_manager.next()), Person, HousedIn(*structure)));
+            let id = commands
+                .spawn((Name::new(name_manager.next()), Person))
+                .id();
+
+            commands.trigger(AssignPerson {
+                person: id,
+                structure: *structure,
+                profession: Profession::Porter,
+            });
         }
     }
 }