add endrake and simberts
This commit is contained in:
parent
2d02e1cae6
commit
52da1f8acb
14 changed files with 385 additions and 24 deletions
|
|
@ -14,7 +14,9 @@ use building_core::CorePreview;
|
|||
use building_placement::SelectBuildingPreview;
|
||||
use combat::Range;
|
||||
use input::{SelectEntity, Selected};
|
||||
use resources::{AvailableWorkers, Cost, ResourceDeposit, Resources, WorkedResourceDeposit};
|
||||
use resources::{
|
||||
AvailableWorkers, Cost, Quantity, ResourceDeposit, Resources, WorkedResourceDeposit,
|
||||
};
|
||||
use state::{BasePhaseState, CoreState, GameState, Phase};
|
||||
use ui_state::GameUIState;
|
||||
use upgrade::{UnlockUpgrade, Upgradable, Upgrade};
|
||||
|
|
@ -97,11 +99,7 @@ fn plan_ui(
|
|||
});
|
||||
}
|
||||
|
||||
fn execute_ui(
|
||||
mut contexts: EguiContexts,
|
||||
curr_phase: Res<State<BasePhaseState>>,
|
||||
mut next_phase: ResMut<NextState<BasePhaseState>>,
|
||||
) {
|
||||
fn execute_ui(mut contexts: EguiContexts, mut res: ResMut<Resources>) {
|
||||
let ctx = contexts.ctx_mut().unwrap();
|
||||
egui::Window::new("ExecuteUI")
|
||||
.resizable(false)
|
||||
|
|
@ -111,12 +109,14 @@ fn execute_ui(
|
|||
.show(ctx, |ui| {
|
||||
// todo - remove this
|
||||
if ui
|
||||
.button(RichText::new("DEBUG - PLAN").size(LARGE_FONT_SIZE))
|
||||
.button(RichText::new("DEBUG - $$$").size(LARGE_FONT_SIZE))
|
||||
.clicked()
|
||||
{
|
||||
next_phase.set(BasePhaseState::Plan {
|
||||
phase: curr_phase.get().phase_count() + 1,
|
||||
});
|
||||
res.0 = res.0
|
||||
+ Quantity {
|
||||
souls: 100,
|
||||
bones: 100,
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue