diff --git a/Cargo.lock b/Cargo.lock index d18057c..dbc099f 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -5495,6 +5495,7 @@ name = "upgrade" version = "0.1.0" dependencies = [ "bevy", + "combat", "input", "resources", "state", diff --git a/crates/building_barrager/src/lib.rs b/crates/building_barrager/src/lib.rs index 7266f50..1b408fe 100644 --- a/crates/building_barrager/src/lib.rs +++ b/crates/building_barrager/src/lib.rs @@ -61,25 +61,25 @@ fn register( }); let info = commands.spawn_empty().id(); - let test_unlocks = - vec![ + let test_unlocks = vec![ commands .spawn(( Name::new("ROCKET BARRAGE"), Upgrade { description: "bangbangbangbangbangbangbangbang".to_string(), cost: Quantity { - souls: 10, - bones: 20, + souls: 20, + bones: 5, }, unlocks: vec![], }, )) .observe( - |trigger: Trigger, mut query: Query<&mut ProjectileLauncher>| { - if let Ok(mut launcher) = query.get_mut(trigger.event().building) { + |trigger: Trigger, mut query: Query<(&mut ProjectileLauncher, &mut Defense)>| { + if let Ok((mut launcher, mut defense)) = query.get_mut(trigger.event().building) { let interval = launcher.fire_timer.duration().div_f32(2.0); launcher.set_interval(interval); + defense.amount += 0.5; } }, ) @@ -89,20 +89,21 @@ fn register( Name::new("Party Mode"), Upgrade { description: "I'm in the house tonight.".to_string(), - cost: Quantity { souls: 20, bones: 10 }, + cost: Quantity { souls: 25, bones: 10 }, unlocks: vec![], }, )) .observe( |trigger: Trigger, - mut query: Query<(&mut Barrager, &mut ProjectileLauncher)>| { - if let Ok((mut barrager, mut launcher)) = + mut query: Query<(&mut Barrager, &mut ProjectileLauncher, &mut Defense)>| { + if let Ok((mut barrager, mut launcher, mut defense)) = query.get_mut(trigger.event().building) { let interval = launcher.fire_timer.duration().div_f32(2.0); launcher.set_interval(interval); launcher.spread += 30.0_f32.to_radians(); barrager.projectile_count += 10; + defense.amount += 0.5; } }, ) @@ -123,12 +124,13 @@ fn register( )) .observe( |trigger: Trigger, - mut query: Query<(&mut Barrager, &mut ProjectileLauncher)>| { - if let Ok((mut barrager, mut launcher)) = + mut query: Query<(&mut Barrager, &mut ProjectileLauncher, &mut Defense)>| { + if let Ok((mut barrager, mut launcher, mut defense)) = query.get_mut(trigger.event().building) { barrager.projectile_count += 5; launcher.spread += 5.0_f32.to_radians(); + defense.amount += 0.5; } }, ) diff --git a/crates/building_core/src/lib.rs b/crates/building_core/src/lib.rs index bed2476..0381b5d 100755 --- a/crates/building_core/src/lib.rs +++ b/crates/building_core/src/lib.rs @@ -83,24 +83,25 @@ fn get_upgrades(commands: &mut Commands) -> Vec { fn create_worker_upgrade( commands: &mut Commands, name: String, - desc: &'static str, + description: String, cost: Quantity, + additional_workers: u32, unlocks: Vec, ) -> Entity { commands .spawn(( Name::new(name), Upgrade { - description: desc.to_string(), + description, cost, unlocks, }, )) .observe( - |_trigger: Trigger, - mut workers: ResMut, - mut range: Single<&mut Range, With>| { - workers.0 += 1; + move |_trigger: Trigger, + mut workers: ResMut, + mut range: Single<&mut Range, With>| { + workers.0 += additional_workers; range.0 += 5.0; }, ) @@ -114,14 +115,27 @@ fn get_upgrades(commands: &mut Commands) -> Vec { } else { Vec::new() }; + let additional_workers = ((i + 1) / 2).max(1); worker_upgrade = Some(create_worker_upgrade( commands, - format!("Create Worker {}", i), - "Forms a new worker, useful for harvesting resource deposits. Increases the Core's domain.", + format!( + "Create Worker{}", + if additional_workers > 1 { "s" } else { "" } + ), + format!( + "Forms {} new worker{}, useful for harvesting resource deposits. Increases the Core's domain.", + if additional_workers > 1 { + additional_workers.to_string() + } else { + "a".to_string() + }, + if additional_workers > 1 { "s" } else { "" } + ), Quantity { souls: 25 * 2_u32.pow(i - 1), - bones: 15 * 2_u32.pow(i - 1), + bones: 10 * 2_u32.pow(i - 1), }, + additional_workers, unlocks, )); } diff --git a/crates/building_suncannon/src/lib.rs b/crates/building_suncannon/src/lib.rs index 690732e..e8ad435 100644 --- a/crates/building_suncannon/src/lib.rs +++ b/crates/building_suncannon/src/lib.rs @@ -95,12 +95,20 @@ fn register( )) .observe( |trigger: Trigger, - mut query: Query<(&mut Range, &mut ProjectileLauncher, &mut Suncannon)>| { - if let Ok((mut range, mut launcher, mut suncannon)) = query.get_mut(trigger.event().building) { + mut query: Query<( + &mut Range, + &mut ProjectileLauncher, + &mut Suncannon, + &mut Defense, + )>| { + if let Ok((mut range, mut launcher, mut suncannon, mut defense)) = + query.get_mut(trigger.event().building) + { range.0 += 10.; let new_duration = launcher.fire_timer.duration() / 4; launcher.set_interval(new_duration); suncannon.pellet_damage *= 2.; + defense.amount += 1.0; } }, ) @@ -121,14 +129,15 @@ fn register( )) .observe( |trigger: Trigger, - mut query: Query<(&mut ProjectileLauncher, &mut Suncannon)>| { - if let Ok((mut launcher, mut suncannon)) = + mut query: Query<(&mut ProjectileLauncher, &mut Suncannon, &mut Defense)>| { + if let Ok((mut launcher, mut suncannon, mut defense)) = query.get_mut(trigger.event().building) { launcher.damage *= 1.5; suncannon.explosion_damage *= 2.; suncannon.explosion_knockback *= 2.; suncannon.pellet_damage *= 2.; + defense.amount += 0.5; } }, ) diff --git a/crates/combat/src/lib.rs b/crates/combat/src/lib.rs index 5b585a3..eaf8894 100755 --- a/crates/combat/src/lib.rs +++ b/crates/combat/src/lib.rs @@ -90,6 +90,10 @@ impl Health { } self.current / self.max } + + pub fn max_out(&mut self) { + self.current = self.max; + } } impl Default for Health { diff --git a/crates/inhabitant_coranth/src/lib.rs b/crates/inhabitant_coranth/src/lib.rs index c817337..9569986 100755 --- a/crates/inhabitant_coranth/src/lib.rs +++ b/crates/inhabitant_coranth/src/lib.rs @@ -59,6 +59,7 @@ fn spawn( phase: Res>, res: Res, ) { + let phase = phase.get().phase_count(); for SpawnCoranth { transform } in reader.read() { commands .spawn(( @@ -69,8 +70,8 @@ fn spawn( MaxLinearSpeed(25.), Coranth, transform.clone(), - Health::new(1.0 + phase.get().phase_count() as f32), - ContactDamage::new(5.0), + Health::new(1.0 + phase as f32), + ContactDamage::new(if phase < 8 { 4.0 } else { 5.0 }), Name::from("Coranth"), Team::Inhabitant.collision_layers(), )) diff --git a/crates/level/src/lib.rs b/crates/level/src/lib.rs index 51f83df..cc3eab1 100755 --- a/crates/level/src/lib.rs +++ b/crates/level/src/lib.rs @@ -149,6 +149,7 @@ fn setup( } fn spawn_enemies( + mut coranth_writer: EventWriter, mut simbert_writer: EventWriter, mut endrake_writer: EventWriter, core_query: Single<(&GlobalTransform, &Range), With>, @@ -156,16 +157,45 @@ fn spawn_enemies( time: Res