From af45237701d833eed8ccd3f211337a4ba9d44463 Mon Sep 17 00:00:00 2001 From: Jim Date: Sun, 24 Aug 2025 20:13:22 -0400 Subject: [PATCH] basic core building --- Cargo.lock | 22 +++++++++++++ Cargo.toml | 2 ++ assets/settings/input_map.ron | 14 ++++----- crates/building/Cargo.toml | 11 +++++++ crates/building/src/lib.rs | 16 ++++++++++ crates/building_core/Cargo.toml | 15 +++++++++ crates/building_core/src/lib.rs | 55 +++++++++++++++++++++++++++++++++ crates/combat/src/lib.rs | 8 +++-- crates/level/Cargo.toml | 1 + crates/level/src/lib.rs | 11 +++++-- src/main.rs | 2 ++ 11 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 crates/building/Cargo.toml create mode 100644 crates/building/src/lib.rs create mode 100644 crates/building_core/Cargo.toml create mode 100644 crates/building_core/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index f81f9be..b70cf6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,6 +1617,25 @@ dependencies = [ "piper", ] +[[package]] +name = "building" +version = "0.1.0" +dependencies = [ + "bevy", + "combat", +] + +[[package]] +name = "building_core" +version = "0.1.0" +dependencies = [ + "avian3d", + "bevy", + "building", + "combat", + "state", +] + [[package]] name = "bumpalo" version = "3.19.0" @@ -1915,6 +1934,8 @@ version = "0.1.0" dependencies = [ "bevy", "bevy-inspector-egui", + "building", + "building_core", "camera", "combat", "input", @@ -2950,6 +2971,7 @@ version = "0.1.0" dependencies = [ "avian3d", "bevy", + "building_core", "camera", "combat", "state", diff --git a/Cargo.toml b/Cargo.toml index 6587141..9270aa1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,4 +43,6 @@ ui_pause = { path = "crates/ui_pause" } level = { path = "crates/level" } camera = { path = "crates/camera" } combat = { path = "crates/combat" } +building_core = { path = "crates/building_core" } +building = { path = "crates/building" } #new internal crates go here diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index 0941d5a..e6b702a 100644 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -1,7 +1,7 @@ ( map: { - MouseButton(Left): [ - CameraPanEnable, + KeyCode(F1): [ + ToggleDebugUI, ], MouseScroll: [ CameraZoom, @@ -13,14 +13,14 @@ KeyCode(Escape): [ TogglePause, ], - MouseMovementY: [ - CameraPanY, - ], MouseButton(Middle): [ CameraOrbitEnable, ], - KeyCode(F1): [ - ToggleDebugUI, + MouseButton(Left): [ + CameraPanEnable, + ], + MouseMovementY: [ + CameraPanY, ], }, ) \ No newline at end of file diff --git a/crates/building/Cargo.toml b/crates/building/Cargo.toml new file mode 100644 index 0000000..c499394 --- /dev/null +++ b/crates/building/Cargo.toml @@ -0,0 +1,11 @@ +[package] +name = "building" +version = "0.1.0" +edition = "2024" + +[dependencies] +bevy = { workspace = true } +combat = { path = "../combat" } + +[lints] +workspace = true diff --git a/crates/building/src/lib.rs b/crates/building/src/lib.rs new file mode 100644 index 0000000..7e28e42 --- /dev/null +++ b/crates/building/src/lib.rs @@ -0,0 +1,16 @@ +//bevy system signatures often violate these rules +#![allow(clippy::type_complexity)] +#![allow(clippy::too_many_arguments)] + +use bevy::prelude::*; +use combat::Health; + +pub struct BuildingPlugin; + +impl Plugin for BuildingPlugin { + fn build(&self, _app: &mut App) {} +} + +#[derive(Component, Default)] +#[require(Health)] +pub struct Building; diff --git a/crates/building_core/Cargo.toml b/crates/building_core/Cargo.toml new file mode 100644 index 0000000..b9e7632 --- /dev/null +++ b/crates/building_core/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "building_core" +version = "0.1.0" +edition = "2024" + +[dependencies] +bevy = { workspace = true } +avian3d = { workspace = true } + +combat = { path = "../combat" } +building = { path = "../building" } +state = { path = "../state" } + +[lints] +workspace = true diff --git a/crates/building_core/src/lib.rs b/crates/building_core/src/lib.rs new file mode 100644 index 0000000..505b767 --- /dev/null +++ b/crates/building_core/src/lib.rs @@ -0,0 +1,55 @@ +//bevy system signatures often violate these rules +#![allow(clippy::type_complexity)] +#![allow(clippy::too_many_arguments)] + +use avian3d::prelude::*; +use bevy::prelude::*; +use building::Building; +use combat::{Defense, Health}; +use state::GameSystemSet; + +pub struct BuildingCorePlugin; + +impl Plugin for BuildingCorePlugin { + fn build(&self, app: &mut App) { + app.add_event::() + .add_systems(FixedUpdate, spawn_core.in_set(GameSystemSet::PostTick)); + } +} + +#[derive(Component)] +#[require(Building)] +pub struct Core { + pub level: u32, +} + +#[derive(Event)] +pub struct SpawnCore { + pub transform: Transform, +} + +fn spawn_core( + mut reader: EventReader, + mut commands: Commands, + mut meshes: ResMut>, + mut materials: ResMut>, +) { + for SpawnCore { transform } in reader.read() { + commands.spawn(( + RigidBody::Static, + Collider::cuboid(2.0, 2.0, 2.0), + Mesh3d(meshes.add(Cuboid::from_length(2.0))), + MeshMaterial3d(materials.add(StandardMaterial { + base_color: Color::srgb_u8(166, 69, 16), + metallic: 0.0, + perceptual_roughness: 0.8, + ..default() + })), + Core { level: 0 }, + transform.clone(), + Health::new(100.0), + Defense::new(10.0), + Name::from("Core"), + )); + } +} diff --git a/crates/combat/src/lib.rs b/crates/combat/src/lib.rs index 7ab26e2..b337ebf 100644 --- a/crates/combat/src/lib.rs +++ b/crates/combat/src/lib.rs @@ -2,7 +2,7 @@ #![allow(clippy::type_complexity)] #![allow(clippy::too_many_arguments)] -use bevy::{audio::Sample, prelude::*}; +use bevy::prelude::*; pub struct CombatPlugin; @@ -55,7 +55,11 @@ pub struct Defense { impl Defense { pub fn calc_damage(&self, incoming_damage: f32) -> f32 { - (incoming_damage - self.amount * 0.5).max(0.0) + let min_damage = 0.1; + if incoming_damage < min_damage { + return 0.; + } + (incoming_damage - self.amount * 0.5).max(min_damage) } pub fn new(amount: f32) -> Self { diff --git a/crates/level/Cargo.toml b/crates/level/Cargo.toml index d5d46df..8100f0d 100644 --- a/crates/level/Cargo.toml +++ b/crates/level/Cargo.toml @@ -10,6 +10,7 @@ avian3d = { workspace = true } state = { path = "../state" } camera = { path = "../camera" } combat = { path = "../combat" } +building_core = { path = "../building_core" } [lints] workspace = true diff --git a/crates/level/src/lib.rs b/crates/level/src/lib.rs index 165be91..e5ccdbc 100644 --- a/crates/level/src/lib.rs +++ b/crates/level/src/lib.rs @@ -9,6 +9,7 @@ use bevy::{ prelude::*, render::camera::Exposure, }; +use building_core::SpawnCore; use camera::ControlledCamera; use combat::{Attacked, Defense, Health}; use state::AppState; @@ -25,13 +26,15 @@ fn setup( mut commands: Commands, mut meshes: ResMut>, mut materials: ResMut>, + mut core_writer: EventWriter, ) { let level_size = 50.0; // Static physics object with a collision shape commands.spawn(( RigidBody::Static, - Collider::cuboid(level_size, 0.5, level_size), - Mesh3d(meshes.add(Cuboid::new(level_size, 0.5, level_size))), + Collider::cuboid(level_size, 1.0, level_size), + Mesh3d(meshes.add(Cuboid::new(level_size, 1.0, level_size))), + Transform::from_xyz(0.0, -0.5, 0.0), MeshMaterial3d(materials.add(StandardMaterial { base_color: Color::srgb_u8(52, 125, 117), perceptual_roughness: 0.8, @@ -72,6 +75,10 @@ fn setup( ); } + core_writer.write(SpawnCore { + transform: Transform::from_xyz(5.0, 1.0, 5.0), + }); + // Light commands.spawn(( DirectionalLight { diff --git a/src/main.rs b/src/main.rs index 4f38a30..7b172a2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,6 +22,8 @@ fn main() { level::LevelPlugin, camera::CameraPlugin, combat::CombatPlugin, + building_core::BuildingCorePlugin, + building::BuildingPlugin, // new internal crates go here ));