resource production via graveyard, workers, and selectable buildlings
This commit is contained in:
parent
87fcc35a49
commit
921947c131
20 changed files with 364 additions and 24 deletions
|
|
@ -2,14 +2,19 @@
|
|||
#![allow(clippy::type_complexity)]
|
||||
#![allow(clippy::too_many_arguments)]
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use bevy::prelude::*;
|
||||
use state::AppState;
|
||||
use state::{AppState, GameSystemSet};
|
||||
|
||||
pub struct ResourcesPlugin;
|
||||
|
||||
impl Plugin for ResourcesPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.add_systems(OnEnter(AppState::Game), setup);
|
||||
app.add_systems(OnEnter(AppState::Game), setup)
|
||||
.add_systems(FixedUpdate, tick_harvest.in_set(GameSystemSet::Execute))
|
||||
.insert_resource(AvailableWorkers(5))
|
||||
.add_observer(on_harvest);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -38,14 +43,32 @@ impl Resources {
|
|||
self.bones = self.bones.saturating_sub(cost.bones);
|
||||
true
|
||||
}
|
||||
pub fn add(&mut self, quantity: Quantity) {
|
||||
self.souls = self.souls.saturating_add(quantity.souls);
|
||||
self.bones = self.bones.saturating_add(quantity.bones);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component, Default)]
|
||||
pub struct Cost {
|
||||
#[derive(Component, Default, Deref, DerefMut)]
|
||||
pub struct Cost(pub Quantity);
|
||||
|
||||
#[derive(Default, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct Quantity {
|
||||
pub souls: u32,
|
||||
pub bones: u32,
|
||||
}
|
||||
|
||||
impl std::ops::Mul<u32> for Quantity {
|
||||
type Output = Quantity;
|
||||
|
||||
fn mul(self, rhs: u32) -> Self::Output {
|
||||
Self {
|
||||
souls: self.souls.saturating_mul(rhs),
|
||||
bones: self.bones.saturating_mul(rhs),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Drops {
|
||||
pub souls: u32,
|
||||
|
|
@ -56,3 +79,52 @@ impl Default for Drops {
|
|||
Self { souls: 1 }
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component, Default)]
|
||||
#[require(Transform, Name)]
|
||||
pub struct ResourceDeposit {
|
||||
pub bounty: Quantity,
|
||||
pub level: u32,
|
||||
pub harvest_time: Duration,
|
||||
// todo - add finite resources and refresh timer
|
||||
}
|
||||
|
||||
#[derive(Component, Default)]
|
||||
#[require(ResourceDeposit)]
|
||||
pub struct WorkedResourceDeposit {
|
||||
pub workers: u32,
|
||||
pub worked_duration: Duration,
|
||||
}
|
||||
|
||||
#[derive(Event)]
|
||||
pub struct Harvested;
|
||||
|
||||
fn tick_harvest(
|
||||
mut commands: Commands,
|
||||
mut deposit_query: Query<(Entity, &ResourceDeposit, &mut WorkedResourceDeposit)>,
|
||||
time: Res<Time>,
|
||||
) {
|
||||
let delta = time.delta();
|
||||
for (entity, deposit, mut worked) in deposit_query.iter_mut() {
|
||||
worked.worked_duration += delta;
|
||||
if worked.worked_duration >= deposit.harvest_time {
|
||||
commands.trigger_targets(Harvested, entity);
|
||||
worked.worked_duration -= deposit.harvest_time;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn on_harvest(
|
||||
trigger: Trigger<Harvested>,
|
||||
deposit_query: Query<(&ResourceDeposit, &WorkedResourceDeposit)>,
|
||||
mut resources: ResMut<Resources>,
|
||||
) {
|
||||
let Ok((deposit, worked)) = deposit_query.get(trigger.target()) else {
|
||||
error!("harvested something that was not a resource deposit or not worked OwO");
|
||||
return;
|
||||
};
|
||||
resources.add(deposit.bounty * worked.workers);
|
||||
}
|
||||
|
||||
#[derive(Resource)]
|
||||
pub struct AvailableWorkers(pub u32);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue