From 2d4dc3c708ee25e5a97c5f2bcb08a74b9a43e6b2 Mon Sep 17 00:00:00 2001 From: Jim Date: Tue, 2 Sep 2025 09:49:20 -0400 Subject: [PATCH] limit workers per resource deposit --- assets/settings/input_map.ron | 16 ++++++++-------- crates/combat/src/lib.rs | 3 +-- crates/resource_graveyard/src/lib.rs | 1 + crates/resources/src/lib.rs | 1 + crates/ui_ingame/src/lib.rs | 4 ++++ todo.txt | 18 ++++++++++++++++++ 6 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 todo.txt diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index 954bb8b..03d50a5 100755 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -3,20 +3,20 @@ KeyCode(ShiftLeft): [ MultiPlaceTower, ], - MouseButton(Middle): [ - CameraOrbitEnable, - ], - KeyCode(F1): [ - ToggleDebugUI, - ], MouseButton(Right): [ PlaceTower, ], + MouseButton(Left): [ + CameraPanEnable, + ], + MouseButton(Middle): [ + CameraOrbitEnable, + ], MouseScroll: [ CameraZoom, ], - MouseButton(Left): [ - CameraPanEnable, + KeyCode(F1): [ + ToggleDebugUI, ], MouseMovementX: [ CameraYaw, diff --git a/crates/combat/src/lib.rs b/crates/combat/src/lib.rs index d6edd89..5b585a3 100755 --- a/crates/combat/src/lib.rs +++ b/crates/combat/src/lib.rs @@ -10,7 +10,7 @@ use avian3d::prelude::*; use bevy::prelude::*; use physics::PhysicsLayers; use resources::{Drops, Resources}; -use state::{BasePhaseState, GameSystemSet}; +use state::GameSystemSet; pub struct CombatPlugin; @@ -212,7 +212,6 @@ fn on_die( trigger: Trigger, names: Query<&Name>, drops: Query<&Drops>, - phase: Res>, mut resources: ResMut, mut commands: Commands, ) { diff --git a/crates/resource_graveyard/src/lib.rs b/crates/resource_graveyard/src/lib.rs index dbf3535..ecb989a 100644 --- a/crates/resource_graveyard/src/lib.rs +++ b/crates/resource_graveyard/src/lib.rs @@ -67,6 +67,7 @@ fn spawn( bounty: Quantity { souls: 0, bones: 5 }, level: 0, harvest_time: Duration::from_secs(5), + max_workers: 2, }, Mesh3d(res.mesh.clone()), MeshMaterial3d(res.material.clone()), diff --git a/crates/resources/src/lib.rs b/crates/resources/src/lib.rs index 8f058a7..a98a89a 100644 --- a/crates/resources/src/lib.rs +++ b/crates/resources/src/lib.rs @@ -124,6 +124,7 @@ pub struct ResourceDeposit { pub bounty: Quantity, pub level: u32, pub harvest_time: Duration, + pub max_workers: u32, // todo - add finite resources and refresh timer } diff --git a/crates/ui_ingame/src/lib.rs b/crates/ui_ingame/src/lib.rs index 71dbf0e..442f981 100644 --- a/crates/ui_ingame/src/lib.rs +++ b/crates/ui_ingame/src/lib.rs @@ -238,6 +238,10 @@ fn side_panel( ui.add_enabled(false, egui::Button::new("Out of Core's range")); } else if available_workers.0 == 0 { ui.add_enabled(false, egui::Button::new("No workers available")); + } else if let Some(ref worked) = opt_worked + && worked.workers >= deposit.max_workers + { + ui.add_enabled(false, egui::Button::new("Maximum workers reached")); } else { if ui.button("Add worker").clicked() { available_workers.0 = available_workers.0.saturating_sub(1); diff --git a/todo.txt b/todo.txt new file mode 100644 index 0000000..6b876de --- /dev/null +++ b/todo.txt @@ -0,0 +1,18 @@ + +--- VERY IMPORTANT --- +- sound +- music +x limit workers per resource deposit +- main menu +- improve enemy AI +- balance + +--- IMPORTANT --- +- More towers +- More upgrades +- More enemy types +- More resource deposit types + +--- STILL PRETTY IMPORTANT --- +- Building repair +- core upgrade