From 23af12d258f6c0f039f9e8b02ce3291caa78e94c Mon Sep 17 00:00:00 2001 From: Jim Date: Tue, 2 Sep 2025 14:05:10 -0400 Subject: [PATCH] delete buildings --- assets/settings/input_map.ron | 6 +++--- crates/building_barrager/src/lib.rs | 2 +- crates/ui_ingame/src/lib.rs | 13 ++++++++++++- todo.txt | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index 954bb8b..b82ce27 100755 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -1,11 +1,11 @@ ( map: { - KeyCode(ShiftLeft): [ - MultiPlaceTower, - ], MouseButton(Middle): [ CameraOrbitEnable, ], + KeyCode(ShiftLeft): [ + MultiPlaceTower, + ], KeyCode(F1): [ ToggleDebugUI, ], diff --git a/crates/building_barrager/src/lib.rs b/crates/building_barrager/src/lib.rs index 0f75dc9..7266f50 100644 --- a/crates/building_barrager/src/lib.rs +++ b/crates/building_barrager/src/lib.rs @@ -150,7 +150,7 @@ fn register( }, Range(10.0), Health::new(20.0), - Defense::new(7.0), + Defense::new(4.0), UpgradeTree { upgrades }, Cost(Quantity { souls: 10, diff --git a/crates/ui_ingame/src/lib.rs b/crates/ui_ingame/src/lib.rs index 5735211..c8221fe 100644 --- a/crates/ui_ingame/src/lib.rs +++ b/crates/ui_ingame/src/lib.rs @@ -9,7 +9,7 @@ use bevy_egui::{ EguiContexts, EguiPrimaryContextPass, egui::{self, Align2, RichText}, }; -use building::{BuildingInfo, Core}; +use building::{Building, BuildingInfo, Core}; use building_core::CorePreview; use building_placement::SelectBuildingPreview; use combat::Range; @@ -194,6 +194,7 @@ fn side_panel( upgradable: Query<&Upgradable>, upgrades: Query<(&Upgrade, &Name)>, core_query: Query<(&GlobalTransform, &Range), With>, + non_core_building_query: Query<(), (With, Without)>, mut selected_resource_deposit: Query<( &ResourceDeposit, &GlobalTransform, @@ -332,6 +333,16 @@ fn side_panel( }); } } + + //building deletion + if non_core_building_query.contains(selected) { + if ui + .button(RichText::new("Destroy").size(FONT_SIZE)) + .clicked() + { + commands.entity(selected).despawn(); + } + } return; } // --- view when nothing's selected --- diff --git a/todo.txt b/todo.txt index 6ee9cd2..9a3cc61 100644 --- a/todo.txt +++ b/todo.txt @@ -17,4 +17,4 @@ x More resource deposit types --- STILL PRETTY IMPORTANT --- - Building repair x core upgrade (yeah I'm just adding more workers and range) -- delete buildings +x delete buildings