diff --git a/Cargo.lock b/Cargo.lock index dbc099f..4603a8f 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -3095,6 +3095,7 @@ dependencies = [ "combat_damagers", "inhabitant", "inhabitant_simbert", + "resources", "state", "ui_health_bar", ] @@ -3109,6 +3110,7 @@ dependencies = [ "combat", "combat_damagers", "inhabitant", + "resources", "state", ] diff --git a/assets/settings/input_map.ron b/assets/settings/input_map.ron index 03d50a5..b82ce27 100755 --- a/assets/settings/input_map.ron +++ b/assets/settings/input_map.ron @@ -1,22 +1,22 @@ ( map: { + MouseButton(Middle): [ + CameraOrbitEnable, + ], KeyCode(ShiftLeft): [ MultiPlaceTower, ], + KeyCode(F1): [ + ToggleDebugUI, + ], MouseButton(Right): [ PlaceTower, ], - MouseButton(Left): [ - CameraPanEnable, - ], - MouseButton(Middle): [ - CameraOrbitEnable, - ], MouseScroll: [ CameraZoom, ], - KeyCode(F1): [ - ToggleDebugUI, + MouseButton(Left): [ + CameraPanEnable, ], MouseMovementX: [ CameraYaw, diff --git a/crates/combat/src/lib.rs b/crates/combat/src/lib.rs index eaf8894..e327a1b 100755 --- a/crates/combat/src/lib.rs +++ b/crates/combat/src/lib.rs @@ -24,7 +24,27 @@ impl Plugin for CombatPlugin { tick_invulnerability.in_set(GameSystemSet::StatusEffects), ) .register_type::() - .register_type::(); + .register_type::() + .insert_resource(Difficulty::Chill); + } +} + +#[derive(Resource)] +pub enum Difficulty { + Chill, + Casual, + Standard, + Intense, +} + +impl Difficulty { + pub fn core_damage_taken_mult(&self) -> f32 { + match self { + Difficulty::Chill => 0.65, + Difficulty::Casual => 0.8, + Difficulty::Standard => 1.0, + Difficulty::Intense => 1.2, + } } } @@ -164,6 +184,7 @@ fn on_attack( Without, >, names: Query<&Name>, + difficulty: Res, ) { let Ok((mut health, invulnerability, opt_defense, opt_team)) = attacked_query.get_mut(trigger.target()) @@ -177,7 +198,16 @@ fn on_attack( return; } let defense = opt_defense.cloned().unwrap_or_default(); - let damage_taken = defense.calc_damage(trigger.event().amount); + let damage_amount = if matches!(opt_team, Some(Team::Core)) { + info!( + "reduced damage by {:?}", + difficulty.core_damage_taken_mult() + ); + trigger.event().amount * difficulty.core_damage_taken_mult() + } else { + trigger.event().amount + }; + let damage_taken = defense.calc_damage(damage_amount); let old_health = health.current; health.current = (old_health - damage_taken).max(0.0); info!( @@ -220,7 +250,7 @@ fn on_die( mut commands: Commands, ) { if let Ok(drop) = drops.get(trigger.target()) { - resources.souls += drop.souls; + resources.0 = resources.0 + drop.0; } if let Ok(mut ec) = commands.get_entity(trigger.target()) { info!( diff --git a/crates/inhabitant_endrake/Cargo.toml b/crates/inhabitant_endrake/Cargo.toml index 1f4e64e..4166669 100644 --- a/crates/inhabitant_endrake/Cargo.toml +++ b/crates/inhabitant_endrake/Cargo.toml @@ -11,6 +11,7 @@ state = { path = "../state" } combat = { path = "../combat" } building = { path = "../building" } inhabitant = { path = "../inhabitant" } +resources = { path = "../resources" } combat_damagers = { path = "../combat_damagers" } ui_health_bar = { path = "../ui_health_bar" } inhabitant_simbert = { path = "../inhabitant_simbert" } diff --git a/crates/inhabitant_endrake/src/lib.rs b/crates/inhabitant_endrake/src/lib.rs index 871c3a0..8c633c4 100644 --- a/crates/inhabitant_endrake/src/lib.rs +++ b/crates/inhabitant_endrake/src/lib.rs @@ -9,6 +9,7 @@ use combat::{Defense, Health, Team}; use combat_damagers::ContactDamage; use inhabitant::Inhabitant; use inhabitant_simbert::SpawnSimbert; +use resources::{Drops, Quantity}; use state::{BasePhaseState, GameSystemSet}; use ui_health_bar::BarSettings; @@ -83,6 +84,10 @@ fn spawn( spawn_timer: Timer::from_seconds(2.0, TimerMode::Repeating), spawn_count: 10, }, + Drops(Quantity { + souls: 50, + bones: 25, + }), transform.clone(), Health::new(2000.0 + 100. * phase.get().phase_count() as f32), Defense::new(5.), diff --git a/crates/inhabitant_simbert/Cargo.toml b/crates/inhabitant_simbert/Cargo.toml index e456fe3..b5614ba 100644 --- a/crates/inhabitant_simbert/Cargo.toml +++ b/crates/inhabitant_simbert/Cargo.toml @@ -11,6 +11,7 @@ state = { path = "../state" } combat = { path = "../combat" } building = { path = "../building" } inhabitant = { path = "../inhabitant" } +resources = { path = "../resources" } combat_damagers = { path = "../combat_damagers" } [lints] diff --git a/crates/inhabitant_simbert/src/lib.rs b/crates/inhabitant_simbert/src/lib.rs index 918d290..5d7f60c 100644 --- a/crates/inhabitant_simbert/src/lib.rs +++ b/crates/inhabitant_simbert/src/lib.rs @@ -8,6 +8,7 @@ use building::Building; use combat::{GaveDamage, Health, Team}; use combat_damagers::ContactDamage; use inhabitant::Inhabitant; +use resources::{Drops, Quantity}; use state::{BasePhaseState, GameSystemSet}; pub struct InhabitantSimbertPlugin; @@ -68,12 +69,13 @@ fn spawn( res: Res, ) { for SpawnSimbert { transform, mega } in reader.read() { - let (health, damage, transform, material) = if *mega { + let (health, damage, transform, material, drops) = if *mega { ( Health::new(5.0 + 1.5 * phase.get().phase_count() as f32), ContactDamage::new(6.0), transform.with_scale(transform.scale * res.mega_scale), res.mega_material.clone(), + Drops(Quantity { souls: 3, bones: 0 }), ) } else { ( @@ -81,6 +83,7 @@ fn spawn( ContactDamage::new(3.0), transform.clone(), res.material.clone(), + Drops::default(), ) }; commands @@ -91,6 +94,7 @@ fn spawn( MeshMaterial3d(material), MaxLinearSpeed(25.), Simbert, + drops, transform, health, damage, diff --git a/crates/level/src/lib.rs b/crates/level/src/lib.rs index cc3eab1..7ba61ff 100755 --- a/crates/level/src/lib.rs +++ b/crates/level/src/lib.rs @@ -7,7 +7,6 @@ use std::time::Duration; use avian3d::{math::PI, prelude::*}; use bevy::{ core_pipeline::{bloom::Bloom, experimental::taa::TemporalAntiAliasing}, - math::VectorSpace, pbr::{Atmosphere, ScreenSpaceAmbientOcclusion, light_consts::lux}, prelude::*, render::camera::Exposure, diff --git a/crates/resources/src/lib.rs b/crates/resources/src/lib.rs index ecee08f..6d01c4b 100644 --- a/crates/resources/src/lib.rs +++ b/crates/resources/src/lib.rs @@ -108,13 +108,11 @@ impl std::ops::Sub for Quantity { } #[derive(Component)] -pub struct Drops { - pub souls: u32, -} +pub struct Drops(pub Quantity); impl Default for Drops { fn default() -> Self { - Self { souls: 1 } + Self(Quantity { souls: 1, bones: 0 }) } }