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
16
Cargo.lock
generated
16
Cargo.lock
generated
|
|
@ -1627,6 +1627,7 @@ dependencies = [
|
||||||
"avian3d",
|
"avian3d",
|
||||||
"bevy",
|
"bevy",
|
||||||
"combat",
|
"combat",
|
||||||
|
"input",
|
||||||
"resources",
|
"resources",
|
||||||
"state",
|
"state",
|
||||||
]
|
]
|
||||||
|
|
@ -2003,6 +2004,7 @@ dependencies = [
|
||||||
"input",
|
"input",
|
||||||
"level",
|
"level",
|
||||||
"physics",
|
"physics",
|
||||||
|
"resource_graveyard",
|
||||||
"resources",
|
"resources",
|
||||||
"setup",
|
"setup",
|
||||||
"state",
|
"state",
|
||||||
|
|
@ -3059,6 +3061,7 @@ dependencies = [
|
||||||
name = "input"
|
name = "input"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"avian3d",
|
||||||
"bevy",
|
"bevy",
|
||||||
"ron 0.10.1",
|
"ron 0.10.1",
|
||||||
"serde",
|
"serde",
|
||||||
|
|
@ -3191,6 +3194,7 @@ dependencies = [
|
||||||
"combat",
|
"combat",
|
||||||
"inhabitant_coranth",
|
"inhabitant_coranth",
|
||||||
"physics",
|
"physics",
|
||||||
|
"resource_graveyard",
|
||||||
"state",
|
"state",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -4490,6 +4494,17 @@ version = "1.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "resource_graveyard"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"avian3d",
|
||||||
|
"bevy",
|
||||||
|
"input",
|
||||||
|
"resources",
|
||||||
|
"state",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "resources"
|
name = "resources"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
@ -5278,6 +5293,7 @@ dependencies = [
|
||||||
"bevy_egui",
|
"bevy_egui",
|
||||||
"building",
|
"building",
|
||||||
"building_placement",
|
"building_placement",
|
||||||
|
"input",
|
||||||
"resources",
|
"resources",
|
||||||
"ui_state",
|
"ui_state",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -54,4 +54,5 @@ building_placement = { path = "crates/building_placement" }
|
||||||
ui_ingame = { path = "crates/ui_ingame" }
|
ui_ingame = { path = "crates/ui_ingame" }
|
||||||
resources = { path = "crates/resources" }
|
resources = { path = "crates/resources" }
|
||||||
building_barrager = { path = "crates/building_barrager" }
|
building_barrager = { path = "crates/building_barrager" }
|
||||||
|
resource_graveyard = { path = "crates/resource_graveyard" }
|
||||||
#new internal crates go here
|
#new internal crates go here
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
(
|
(
|
||||||
map: {
|
map: {
|
||||||
MouseButton(Middle): [
|
KeyCode(ShiftLeft): [
|
||||||
CameraOrbitEnable,
|
MultiPlaceTower,
|
||||||
],
|
],
|
||||||
MouseButton(Right): [
|
MouseButton(Right): [
|
||||||
PlaceTower,
|
PlaceTower,
|
||||||
|
|
@ -9,8 +9,8 @@
|
||||||
MouseButton(Left): [
|
MouseButton(Left): [
|
||||||
CameraPanEnable,
|
CameraPanEnable,
|
||||||
],
|
],
|
||||||
KeyCode(ShiftLeft): [
|
MouseButton(Middle): [
|
||||||
MultiPlaceTower,
|
CameraOrbitEnable,
|
||||||
],
|
],
|
||||||
MouseScroll: [
|
MouseScroll: [
|
||||||
CameraZoom,
|
CameraZoom,
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ avian3d = { workspace = true }
|
||||||
combat = { path = "../combat" }
|
combat = { path = "../combat" }
|
||||||
state = { path = "../state" }
|
state = { path = "../state" }
|
||||||
resources = { path = "../resources" }
|
resources = { path = "../resources" }
|
||||||
|
input = { path = "../input" }
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ use bevy::{
|
||||||
prelude::*,
|
prelude::*,
|
||||||
};
|
};
|
||||||
use combat::{Health, Team};
|
use combat::{Health, Team};
|
||||||
|
use input::Selectable;
|
||||||
use resources::{Cost, Resources};
|
use resources::{Cost, Resources};
|
||||||
use state::GameSystemSet;
|
use state::GameSystemSet;
|
||||||
|
|
||||||
|
|
@ -24,7 +25,7 @@ impl Plugin for BuildingPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Component)]
|
#[derive(Component)]
|
||||||
#[require(Health, Team::Core, PhysicsPickable)]
|
#[require(Health, Team::Core, PhysicsPickable, Selectable)]
|
||||||
pub struct Building {
|
pub struct Building {
|
||||||
pub level: u32,
|
pub level: u32,
|
||||||
pub info: Entity,
|
pub info: Entity,
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ use combat::{
|
||||||
projectiles::{Fire, Projectile, ProjectileLauncher, get_shotgun_launch_vectors},
|
projectiles::{Fire, Projectile, ProjectileLauncher, get_shotgun_launch_vectors},
|
||||||
};
|
};
|
||||||
use combat_damagers::ContactDamage;
|
use combat_damagers::ContactDamage;
|
||||||
use resources::Cost;
|
use resources::{Cost, Quantity};
|
||||||
|
|
||||||
pub struct BuildingBarragerPlugin;
|
pub struct BuildingBarragerPlugin;
|
||||||
|
|
||||||
|
|
@ -72,7 +72,10 @@ fn register(
|
||||||
size: SIZE,
|
size: SIZE,
|
||||||
unlocked: true,
|
unlocked: true,
|
||||||
},
|
},
|
||||||
Cost { souls: 0, bones: 0 },
|
Cost(Quantity {
|
||||||
|
souls: 20,
|
||||||
|
bones: 20,
|
||||||
|
}),
|
||||||
Name::new("Barrager"),
|
Name::new("Barrager"),
|
||||||
));
|
));
|
||||||
commands.insert_resource(BuildingResources {
|
commands.insert_resource(BuildingResources {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ use bevy::prelude::*;
|
||||||
use building::{BuildingInfo, BuildingPreview, PREVIEW_ALPHA, PopulatePlacedBuilding};
|
use building::{BuildingInfo, BuildingPreview, PREVIEW_ALPHA, PopulatePlacedBuilding};
|
||||||
use combat::{Defense, Health};
|
use combat::{Defense, Health};
|
||||||
use combat_damagers::ContactDamage;
|
use combat_damagers::ContactDamage;
|
||||||
use resources::Cost;
|
use resources::{Cost, Quantity};
|
||||||
|
|
||||||
pub struct BuildingImpalerPlugin;
|
pub struct BuildingImpalerPlugin;
|
||||||
|
|
||||||
|
|
@ -62,7 +62,7 @@ fn register(
|
||||||
size: SIZE,
|
size: SIZE,
|
||||||
unlocked: true,
|
unlocked: true,
|
||||||
},
|
},
|
||||||
Cost { souls: 5, bones: 0 },
|
Cost(Quantity { souls: 5, bones: 0 }),
|
||||||
Name::new("Impaler"),
|
Name::new("Impaler"),
|
||||||
));
|
));
|
||||||
commands.insert_resource(ImpalerResources {
|
commands.insert_resource(ImpalerResources {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use building::{BuildingInfo, BuildingPreview, PlaceBuilding, PlacedBuildings};
|
use building::{BuildingInfo, BuildingPreview, PlaceBuilding, PlacedBuildings};
|
||||||
use input::{Cancellable, Inputs, actions::InputAction};
|
use input::{Cancellable, Inputs, Selected, actions::InputAction};
|
||||||
use physics::Ground;
|
use physics::Ground;
|
||||||
|
|
||||||
pub struct BuildingPlacementPlugin;
|
pub struct BuildingPlacementPlugin;
|
||||||
|
|
@ -37,9 +37,10 @@ fn init(mut commands: Commands, query: Single<Entity, With<Ground>>, mut setup:
|
||||||
fn cancel_preview(
|
fn cancel_preview(
|
||||||
mut writer: EventWriter<SelectBuildingPreview>,
|
mut writer: EventWriter<SelectBuildingPreview>,
|
||||||
query: Query<(), (With<ActiveBuildingPreview>, With<Cancellable>)>,
|
query: Query<(), (With<ActiveBuildingPreview>, With<Cancellable>)>,
|
||||||
|
selected: Query<(), With<Selected>>,
|
||||||
inputs: Res<Inputs<Update>>,
|
inputs: Res<Inputs<Update>>,
|
||||||
) {
|
) {
|
||||||
if !query.is_empty() && inputs.just_pressed(InputAction::Cancel) {
|
if !query.is_empty() && (inputs.just_pressed(InputAction::Cancel) || !selected.is_empty()) {
|
||||||
writer.write(SelectBuildingPreview(None));
|
writer.write(SelectBuildingPreview(None));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,6 @@ fn on_die(
|
||||||
) {
|
) {
|
||||||
if let Ok(drop) = drops.get(trigger.target()) {
|
if let Ok(drop) = drops.get(trigger.target()) {
|
||||||
resources.souls += drop.souls;
|
resources.souls += drop.souls;
|
||||||
info!("you now have {} souls", resources.souls);
|
|
||||||
}
|
}
|
||||||
if let Ok(mut ec) = commands.get_entity(trigger.target()) {
|
if let Ok(mut ec) = commands.get_entity(trigger.target()) {
|
||||||
info!(
|
info!(
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = { workspace = true }
|
bevy = { workspace = true }
|
||||||
|
avian3d = { workspace = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
ron = { workspace = true }
|
ron = { workspace = true }
|
||||||
state = { path = "../state" }
|
state = { path = "../state" }
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ pub mod conditions;
|
||||||
|
|
||||||
use std::{fs, marker::PhantomData};
|
use std::{fs, marker::PhantomData};
|
||||||
|
|
||||||
|
use avian3d::prelude::*;
|
||||||
use bevy::{
|
use bevy::{
|
||||||
input::mouse::{AccumulatedMouseMotion, AccumulatedMouseScroll},
|
input::mouse::{AccumulatedMouseMotion, AccumulatedMouseScroll},
|
||||||
platform::collections::HashMap,
|
platform::collections::HashMap,
|
||||||
|
|
@ -22,21 +23,93 @@ pub struct InputPlugin;
|
||||||
|
|
||||||
impl Plugin for InputPlugin {
|
impl Plugin for InputPlugin {
|
||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
app.init_resource::<Inputs<FixedUpdate>>()
|
app.add_event::<SelectEntity>()
|
||||||
|
.init_resource::<Inputs<FixedUpdate>>()
|
||||||
.init_resource::<Inputs<Update>>()
|
.init_resource::<Inputs<Update>>()
|
||||||
.configure_sets(Update, GameSystemSet::UpdateInputs)
|
.configure_sets(Update, GameSystemSet::UpdateInputs)
|
||||||
.add_systems(Startup, setup_input_map)
|
.add_systems(Startup, setup_input_map)
|
||||||
.add_systems(
|
.add_systems(
|
||||||
Update,
|
Update,
|
||||||
(update_inputs_frame, save_input_map).in_set(GameSystemSet::UpdateInputs),
|
(
|
||||||
|
update_inputs_frame,
|
||||||
|
save_input_map,
|
||||||
|
(cancel_selection, update_selection).chain(),
|
||||||
)
|
)
|
||||||
.add_systems(FixedPostUpdate, clear_changed_fixed);
|
.in_set(GameSystemSet::UpdateInputs),
|
||||||
|
)
|
||||||
|
.add_systems(FixedPostUpdate, clear_changed_fixed)
|
||||||
|
.add_observer(select);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Component)]
|
#[derive(Component)]
|
||||||
pub struct Cancellable;
|
pub struct Cancellable;
|
||||||
|
|
||||||
|
#[derive(Component, Default)]
|
||||||
|
pub struct Selectable;
|
||||||
|
|
||||||
|
#[derive(Component)]
|
||||||
|
pub struct Selected;
|
||||||
|
|
||||||
|
#[derive(Event)]
|
||||||
|
pub struct SelectEntity(pub Option<Entity>);
|
||||||
|
|
||||||
|
fn cancel_selection(
|
||||||
|
mut writer: EventWriter<SelectEntity>,
|
||||||
|
query: Query<(), (With<Selected>, With<Cancellable>)>,
|
||||||
|
inputs: Res<Inputs<Update>>,
|
||||||
|
) {
|
||||||
|
if !query.is_empty() && inputs.just_pressed(InputAction::Cancel) {
|
||||||
|
writer.write(SelectEntity(None));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn select(
|
||||||
|
trigger: Trigger<Pointer<Click>>,
|
||||||
|
physics_query: Query<(), With<PhysicsPickable>>,
|
||||||
|
mut writer: EventWriter<SelectEntity>,
|
||||||
|
) {
|
||||||
|
// avoid deselecting when clicking on ui
|
||||||
|
if physics_query.contains(trigger.event().target) {
|
||||||
|
writer.write(SelectEntity(Some(trigger.event().target)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update_selection(
|
||||||
|
mut reader: EventReader<SelectEntity>,
|
||||||
|
mut old_query: Query<Entity, With<Selected>>,
|
||||||
|
new_query: Query<(), With<Selectable>>,
|
||||||
|
name_query: Query<&Name>,
|
||||||
|
mut commands: Commands,
|
||||||
|
) {
|
||||||
|
let Some(SelectEntity(opt_entity)) = reader.read().last() else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let Some(new_entity) = opt_entity else {
|
||||||
|
for entity in old_query.iter_mut() {
|
||||||
|
if *opt_entity != Some(entity) {
|
||||||
|
commands.entity(entity).remove::<(Selected, Cancellable)>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
if !new_query.contains(*new_entity) {
|
||||||
|
info!(
|
||||||
|
"thing is not selectable {:?} {:?}",
|
||||||
|
new_entity,
|
||||||
|
name_query.get(*new_entity)
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for entity in old_query.iter_mut() {
|
||||||
|
if *opt_entity != Some(entity) {
|
||||||
|
commands.entity(entity).remove::<(Selected, Cancellable)>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
commands.entity(*new_entity).insert((Selected, Cancellable));
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Hash, Clone, Copy, Debug, Reflect, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Hash, Clone, Copy, Debug, Reflect, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub enum InputMethod {
|
pub enum InputMethod {
|
||||||
Unbound,
|
Unbound,
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ combat = { path = "../combat" }
|
||||||
physics = { path = "../physics" }
|
physics = { path = "../physics" }
|
||||||
building = { path = "../building" }
|
building = { path = "../building" }
|
||||||
inhabitant_coranth = { path = "../inhabitant_coranth" }
|
inhabitant_coranth = { path = "../inhabitant_coranth" }
|
||||||
|
resource_graveyard = { path = "../resource_graveyard" }
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ use building::{BuildingTypes, PlaceBuilding};
|
||||||
use camera::ControlledCamera;
|
use camera::ControlledCamera;
|
||||||
use inhabitant_coranth::SpawnCoranth;
|
use inhabitant_coranth::SpawnCoranth;
|
||||||
use physics::{Ground, PhysicsLayers};
|
use physics::{Ground, PhysicsLayers};
|
||||||
|
use resource_graveyard::PlaceGraveyard;
|
||||||
use state::{AppState, GameSystemSet};
|
use state::{AppState, GameSystemSet};
|
||||||
|
|
||||||
pub struct LevelPlugin;
|
pub struct LevelPlugin;
|
||||||
|
|
@ -34,6 +35,7 @@ fn setup(
|
||||||
buildings: Res<BuildingTypes>,
|
buildings: Res<BuildingTypes>,
|
||||||
mut place_writer: EventWriter<PlaceBuilding>,
|
mut place_writer: EventWriter<PlaceBuilding>,
|
||||||
mut coranth_writer: EventWriter<SpawnCoranth>,
|
mut coranth_writer: EventWriter<SpawnCoranth>,
|
||||||
|
mut graveyard_writer: EventWriter<PlaceGraveyard>,
|
||||||
) {
|
) {
|
||||||
let level_size = 50.0;
|
let level_size = 50.0;
|
||||||
// Static physics object with a collision shape
|
// Static physics object with a collision shape
|
||||||
|
|
@ -50,6 +52,7 @@ fn setup(
|
||||||
CollisionLayers::new(PhysicsLayers::Ground, LayerMask::ALL),
|
CollisionLayers::new(PhysicsLayers::Ground, LayerMask::ALL),
|
||||||
PhysicsPickable,
|
PhysicsPickable,
|
||||||
Ground,
|
Ground,
|
||||||
|
Name::new("ground"),
|
||||||
));
|
));
|
||||||
|
|
||||||
for y in 5..15 {
|
for y in 5..15 {
|
||||||
|
|
@ -57,6 +60,9 @@ fn setup(
|
||||||
transform: Transform::from_xyz(y as f32 * 0.25, y as f32 * 1.1, 0.0),
|
transform: Transform::from_xyz(y as f32 * 0.25, y as f32 * 1.1, 0.0),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
graveyard_writer.write(PlaceGraveyard(Vec3::new(-10., 0.25, -10.)));
|
||||||
|
|
||||||
place_writer.write(PlaceBuilding {
|
place_writer.write(PlaceBuilding {
|
||||||
info: buildings.info.get("Core").unwrap().0,
|
info: buildings.info.get("Core").unwrap().0,
|
||||||
location: IVec3 { x: 5, y: 0, z: 5 },
|
location: IVec3 { x: 5, y: 0, z: 5 },
|
||||||
|
|
@ -72,6 +78,11 @@ fn setup(
|
||||||
},
|
},
|
||||||
Transform::from_xyz(-2.5, 4.5, 2.5).looking_at(Vec3::ZERO, Dir3::Y),
|
Transform::from_xyz(-2.5, 4.5, 2.5).looking_at(Vec3::ZERO, Dir3::Y),
|
||||||
));
|
));
|
||||||
|
commands.insert_resource(AmbientLight {
|
||||||
|
brightness: lux::AMBIENT_DAYLIGHT,
|
||||||
|
color: Color::srgb(0.98, 0.95, 0.82),
|
||||||
|
..default()
|
||||||
|
});
|
||||||
|
|
||||||
// Camera
|
// Camera
|
||||||
commands.spawn((
|
commands.spawn((
|
||||||
|
|
|
||||||
15
crates/resource_graveyard/Cargo.toml
Normal file
15
crates/resource_graveyard/Cargo.toml
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
[package]
|
||||||
|
name = "resource_graveyard"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
bevy = { workspace = true }
|
||||||
|
avian3d = {workspace = true }
|
||||||
|
|
||||||
|
state = { path = "../state" }
|
||||||
|
resources = { path = "../resources" }
|
||||||
|
input = { path = "../input" }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
81
crates/resource_graveyard/src/lib.rs
Normal file
81
crates/resource_graveyard/src/lib.rs
Normal file
|
|
@ -0,0 +1,81 @@
|
||||||
|
//bevy system signatures often violate these rules
|
||||||
|
#![allow(clippy::type_complexity)]
|
||||||
|
#![allow(clippy::too_many_arguments)]
|
||||||
|
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use avian3d::prelude::{Collider, PhysicsPickable, RigidBody, Sensor};
|
||||||
|
use bevy::prelude::*;
|
||||||
|
use input::Selectable;
|
||||||
|
use resources::{Quantity, ResourceDeposit};
|
||||||
|
use state::GameSystemSet;
|
||||||
|
|
||||||
|
pub struct ResourceGraveyardPlugin;
|
||||||
|
|
||||||
|
impl Plugin for ResourceGraveyardPlugin {
|
||||||
|
fn build(&self, app: &mut App) {
|
||||||
|
app.add_event::<PlaceGraveyard>()
|
||||||
|
.add_systems(Startup, init)
|
||||||
|
.add_systems(FixedUpdate, spawn.in_set(GameSystemSet::PostTick));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Component)]
|
||||||
|
pub struct Graveyard;
|
||||||
|
|
||||||
|
#[derive(Event)]
|
||||||
|
pub struct PlaceGraveyard(pub Vec3);
|
||||||
|
|
||||||
|
#[derive(Resource)]
|
||||||
|
struct GraveyardResources {
|
||||||
|
mesh: Handle<Mesh>,
|
||||||
|
material: Handle<StandardMaterial>,
|
||||||
|
}
|
||||||
|
|
||||||
|
const SIZE: Vec3 = Vec3::new(2.0, 0.5, 2.0);
|
||||||
|
|
||||||
|
fn init(
|
||||||
|
mut commands: Commands,
|
||||||
|
mut meshes: ResMut<Assets<Mesh>>,
|
||||||
|
mut materials: ResMut<Assets<StandardMaterial>>,
|
||||||
|
) {
|
||||||
|
let mesh = meshes.add(Cuboid::from_size(SIZE));
|
||||||
|
let base_material = StandardMaterial {
|
||||||
|
base_color: Color::srgb_u8(0xff, 0xe2, 0xe2),
|
||||||
|
metallic: 0.2,
|
||||||
|
perceptual_roughness: 0.8,
|
||||||
|
..default()
|
||||||
|
};
|
||||||
|
let material = materials.add(base_material);
|
||||||
|
|
||||||
|
commands.insert_resource(GraveyardResources {
|
||||||
|
mesh: mesh,
|
||||||
|
material: material,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn spawn(
|
||||||
|
mut reader: EventReader<PlaceGraveyard>,
|
||||||
|
mut commands: Commands,
|
||||||
|
res: Res<GraveyardResources>,
|
||||||
|
) {
|
||||||
|
for PlaceGraveyard(dest) in reader.read() {
|
||||||
|
commands.spawn((
|
||||||
|
Graveyard,
|
||||||
|
Transform::from_translation(*dest),
|
||||||
|
ResourceDeposit {
|
||||||
|
bounty: Quantity { souls: 0, bones: 5 },
|
||||||
|
level: 0,
|
||||||
|
harvest_time: Duration::from_secs(5),
|
||||||
|
},
|
||||||
|
Mesh3d(res.mesh.clone()),
|
||||||
|
MeshMaterial3d(res.material.clone()),
|
||||||
|
Sensor,
|
||||||
|
RigidBody::Static,
|
||||||
|
Collider::cuboid(SIZE.x, SIZE.y, SIZE.z),
|
||||||
|
PhysicsPickable,
|
||||||
|
Selectable,
|
||||||
|
Name::new("Graveyard"),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -2,14 +2,19 @@
|
||||||
#![allow(clippy::type_complexity)]
|
#![allow(clippy::type_complexity)]
|
||||||
#![allow(clippy::too_many_arguments)]
|
#![allow(clippy::too_many_arguments)]
|
||||||
|
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use state::AppState;
|
use state::{AppState, GameSystemSet};
|
||||||
|
|
||||||
pub struct ResourcesPlugin;
|
pub struct ResourcesPlugin;
|
||||||
|
|
||||||
impl Plugin for ResourcesPlugin {
|
impl Plugin for ResourcesPlugin {
|
||||||
fn build(&self, app: &mut App) {
|
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);
|
self.bones = self.bones.saturating_sub(cost.bones);
|
||||||
true
|
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)]
|
#[derive(Component, Default, Deref, DerefMut)]
|
||||||
pub struct Cost {
|
pub struct Cost(pub Quantity);
|
||||||
|
|
||||||
|
#[derive(Default, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub struct Quantity {
|
||||||
pub souls: u32,
|
pub souls: u32,
|
||||||
pub bones: 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)]
|
#[derive(Component)]
|
||||||
pub struct Drops {
|
pub struct Drops {
|
||||||
pub souls: u32,
|
pub souls: u32,
|
||||||
|
|
@ -56,3 +79,52 @@ impl Default for Drops {
|
||||||
Self { souls: 1 }
|
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);
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
#![allow(clippy::type_complexity)]
|
#![allow(clippy::type_complexity)]
|
||||||
#![allow(clippy::too_many_arguments)]
|
#![allow(clippy::too_many_arguments)]
|
||||||
|
|
||||||
use avian3d::prelude::*;
|
// use avian3d::prelude::*;
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use bevy_inspector_egui::quick::WorldInspectorPlugin;
|
use bevy_inspector_egui::quick::WorldInspectorPlugin;
|
||||||
use input::{actions::InputAction, conditions::action_just_pressed};
|
use input::{actions::InputAction, conditions::action_just_pressed};
|
||||||
|
|
@ -14,7 +14,7 @@ impl Plugin for UiDebugPlugin {
|
||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
app.init_state::<DebugUIState>()
|
app.init_state::<DebugUIState>()
|
||||||
.add_plugins(WorldInspectorPlugin::new().run_if(in_state(DebugUIState::Enabled)))
|
.add_plugins(WorldInspectorPlugin::new().run_if(in_state(DebugUIState::Enabled)))
|
||||||
.add_plugins(PhysicsDebugPlugin::default())
|
// .add_plugins(PhysicsDebugPlugin::default())
|
||||||
.add_systems(
|
.add_systems(
|
||||||
Update,
|
Update,
|
||||||
toggle_debug_ui
|
toggle_debug_ui
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ bevy_egui = { workspace = true }
|
||||||
ui_state = { path = "../ui_state" }
|
ui_state = { path = "../ui_state" }
|
||||||
resources = { path = "../resources" }
|
resources = { path = "../resources" }
|
||||||
building = { path = "../building" }
|
building = { path = "../building" }
|
||||||
|
input = { path = "../input" }
|
||||||
building_placement = { path = "../building_placement" }
|
building_placement = { path = "../building_placement" }
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,8 @@ use bevy_egui::{
|
||||||
};
|
};
|
||||||
use building::BuildingInfo;
|
use building::BuildingInfo;
|
||||||
use building_placement::SelectBuildingPreview;
|
use building_placement::SelectBuildingPreview;
|
||||||
use resources::{Cost, Resources};
|
use input::{SelectEntity, Selected};
|
||||||
|
use resources::{AvailableWorkers, Cost, ResourceDeposit, Resources, WorkedResourceDeposit};
|
||||||
use ui_state::GameUIState;
|
use ui_state::GameUIState;
|
||||||
|
|
||||||
pub struct UiIngamePlugin;
|
pub struct UiIngamePlugin;
|
||||||
|
|
@ -25,9 +26,14 @@ impl Plugin for UiIngamePlugin {
|
||||||
|
|
||||||
fn resource_ui(
|
fn resource_ui(
|
||||||
mut contexts: EguiContexts,
|
mut contexts: EguiContexts,
|
||||||
|
mut commands: Commands,
|
||||||
resources: Res<Resources>,
|
resources: Res<Resources>,
|
||||||
|
mut available_workers: ResMut<AvailableWorkers>,
|
||||||
buildings: Query<(&BuildingInfo, &Cost, &Name)>,
|
buildings: Query<(&BuildingInfo, &Cost, &Name)>,
|
||||||
mut select_writer: EventWriter<SelectBuildingPreview>,
|
selected: Query<(Entity, &Name), With<Selected>>,
|
||||||
|
mut selected_resource_deposit: Query<(&ResourceDeposit, Option<&mut WorkedResourceDeposit>)>,
|
||||||
|
mut selected_preview_writer: EventWriter<SelectBuildingPreview>,
|
||||||
|
mut select_writer: EventWriter<SelectEntity>,
|
||||||
) {
|
) {
|
||||||
let ctx = contexts.ctx_mut().unwrap();
|
let ctx = contexts.ctx_mut().unwrap();
|
||||||
let large_font_size = 24.;
|
let large_font_size = 24.;
|
||||||
|
|
@ -38,6 +44,62 @@ fn resource_ui(
|
||||||
.title_bar(false)
|
.title_bar(false)
|
||||||
.anchor(Align2::RIGHT_TOP, [0., 0.])
|
.anchor(Align2::RIGHT_TOP, [0., 0.])
|
||||||
.show(ctx, |ui| {
|
.show(ctx, |ui| {
|
||||||
|
if let Ok((selected, selected_name)) = selected.single() {
|
||||||
|
if ui.button("x").clicked() {
|
||||||
|
select_writer.write(SelectEntity(None));
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.heading(selected_name.as_str());
|
||||||
|
if let Ok((deposit, mut opt_worked)) = selected_resource_deposit.get_mut(selected) {
|
||||||
|
ui.label(
|
||||||
|
RichText::new(format!("Level {} deposit", deposit.level)).size(font_size),
|
||||||
|
);
|
||||||
|
ui.heading(
|
||||||
|
RichText::new(if let Some(ref worked) = opt_worked {
|
||||||
|
format!("{} workers", worked.workers)
|
||||||
|
} else {
|
||||||
|
"Not worked".to_string()
|
||||||
|
})
|
||||||
|
.size(large_font_size)
|
||||||
|
.underline(),
|
||||||
|
);
|
||||||
|
// worker management buttons
|
||||||
|
// add
|
||||||
|
if available_workers.0 == 0 {
|
||||||
|
ui.add_enabled(false, egui::Button::new("No workers available"));
|
||||||
|
} else {
|
||||||
|
if ui.button("Add worker").clicked() {
|
||||||
|
available_workers.0 = available_workers.0.saturating_sub(1);
|
||||||
|
if let Some(ref mut worked) = opt_worked {
|
||||||
|
worked.workers = worked.workers.saturating_add(1);
|
||||||
|
} else {
|
||||||
|
commands.entity(selected).insert(WorkedResourceDeposit {
|
||||||
|
workers: 1,
|
||||||
|
..default()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// remove
|
||||||
|
if let Some(ref mut worked) = opt_worked {
|
||||||
|
if ui.button("Remove worker").clicked() {
|
||||||
|
worked.workers = worked.workers.saturating_sub(1);
|
||||||
|
available_workers.0 = available_workers.0.saturating_add(1);
|
||||||
|
if worked.workers == 0 {
|
||||||
|
commands.entity(selected).remove::<WorkedResourceDeposit>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ui.heading(RichText::new("Bounty").underline());
|
||||||
|
ui.label(
|
||||||
|
RichText::new(format!("Souls: {}", deposit.bounty.souls)).size(font_size),
|
||||||
|
);
|
||||||
|
ui.label(
|
||||||
|
RichText::new(format!("Bones: {}", deposit.bounty.bones)).size(font_size),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
ui.label(RichText::new(format!("Souls: {}", resources.souls)).size(large_font_size));
|
ui.label(RichText::new(format!("Souls: {}", resources.souls)).size(large_font_size));
|
||||||
ui.label(RichText::new(format!("Bones: {}", resources.bones)).size(large_font_size));
|
ui.label(RichText::new(format!("Bones: {}", resources.bones)).size(large_font_size));
|
||||||
ui.heading(RichText::new("Buildings").underline());
|
ui.heading(RichText::new("Buildings").underline());
|
||||||
|
|
@ -72,7 +134,7 @@ fn resource_ui(
|
||||||
)
|
)
|
||||||
.clicked()
|
.clicked()
|
||||||
{
|
{
|
||||||
select_writer.write(SelectBuildingPreview(Some(info.preview)));
|
selected_preview_writer.write(SelectBuildingPreview(Some(info.preview)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ fn main() {
|
||||||
ui_ingame::UiIngamePlugin,
|
ui_ingame::UiIngamePlugin,
|
||||||
resources::ResourcesPlugin,
|
resources::ResourcesPlugin,
|
||||||
building_barrager::BuildingBarragerPlugin,
|
building_barrager::BuildingBarragerPlugin,
|
||||||
|
resource_graveyard::ResourceGraveyardPlugin,
|
||||||
// new internal crates go here
|
// new internal crates go here
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue