try to balance a bit

This commit is contained in:
Jim 2025-09-02 17:36:22 -04:00
parent 6cea0e97e9
commit d35344f910
Signed by: jim
GPG key ID: 3D7D94BA53088BF4
10 changed files with 141 additions and 48 deletions

1
Cargo.lock generated
View file

@ -5495,6 +5495,7 @@ name = "upgrade"
version = "0.1.0"
dependencies = [
"bevy",
"combat",
"input",
"resources",
"state",

View file

@ -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<UpgradeApplied>, mut query: Query<&mut ProjectileLauncher>| {
if let Ok(mut launcher) = query.get_mut(trigger.event().building) {
|trigger: Trigger<UpgradeApplied>, 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<UpgradeApplied>,
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<UpgradeApplied>,
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;
}
},
)

View file

@ -83,24 +83,25 @@ fn get_upgrades(commands: &mut Commands) -> Vec<Entity> {
fn create_worker_upgrade(
commands: &mut Commands,
name: String,
desc: &'static str,
description: String,
cost: Quantity,
additional_workers: u32,
unlocks: Vec<Entity>,
) -> Entity {
commands
.spawn((
Name::new(name),
Upgrade {
description: desc.to_string(),
description,
cost,
unlocks,
},
))
.observe(
|_trigger: Trigger<UpgradeApplied>,
move |_trigger: Trigger<UpgradeApplied>,
mut workers: ResMut<AvailableWorkers>,
mut range: Single<&mut Range, With<Core>>| {
workers.0 += 1;
workers.0 += additional_workers;
range.0 += 5.0;
},
)
@ -114,14 +115,27 @@ fn get_upgrades(commands: &mut Commands) -> Vec<Entity> {
} 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,
));
}

View file

@ -95,12 +95,20 @@ fn register(
))
.observe(
|trigger: Trigger<UpgradeApplied>,
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<UpgradeApplied>,
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;
}
},
)

View file

@ -90,6 +90,10 @@ impl Health {
}
self.current / self.max
}
pub fn max_out(&mut self) {
self.current = self.max;
}
}
impl Default for Health {

View file

@ -59,6 +59,7 @@ fn spawn(
phase: Res<State<BasePhaseState>>,
res: Res<CoranthResources>,
) {
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(),
))

View file

@ -149,6 +149,7 @@ fn setup(
}
fn spawn_enemies(
mut coranth_writer: EventWriter<SpawnCoranth>,
mut simbert_writer: EventWriter<SpawnSimbert>,
mut endrake_writer: EventWriter<SpawnEndrake>,
core_query: Single<(&GlobalTransform, &Range), With<Core>>,
@ -156,16 +157,45 @@ fn spawn_enemies(
time: Res<Time>,
mut setup: Local<bool>,
mut timer: Local<Timer>,
mut timer_ticks: Local<u32>,
) {
if !*setup {
*timer = Timer::new(Duration::from_secs(1), TimerMode::Repeating);
*setup = true;
}
let phase = phase_state.get().phase_count();
let clumps = 2 + (phase / 2).min(5);
let clump_size = 1 + phase / 3;
let endrake_phase = 15;
let endrakes_enabled = phase >= endrake_phase;
let ticks_per_endrake = 3_u32.saturating_sub((phase.saturating_sub(endrake_phase)) / 3) + 1;
let spawn_endrake = endrakes_enabled && *timer_ticks % ticks_per_endrake == 0;
let coranth_phases = [4, 5];
let full_coranth_phase = 8;
let ticks_per_coranth_wave = 2;
let coranth_clumps = (phase / 4).min(2);
let coranths_per_clump = phase / 2;
let simbert_phase = if phase >= full_coranth_phase || coranth_phases.contains(&phase) {
// make it a little easier once the coranths start coming out
phase - 2
} else {
phase
};
let mut simbert_clumps = 2 + (simbert_phase / 2).min(5);
let mut simberts_per_clump = 1 + simbert_phase / 3;
let mega_simbert_phases = [6, 7];
let always_spawn_mega_simbert_phase = 9;
let full_mega_simbert_phase = 12;
if mega_simbert_phases.contains(&phase) || phase >= always_spawn_mega_simbert_phase {
simbert_clumps -= 3;
simberts_per_clump -= 2;
}
timer.tick(time.delta());
if timer.just_finished() {
*timer_ticks += 1;
let (core_gtf, core_range) = core_query.into_inner();
let level_rect = Rect::new(
-LEVEL_SIZE / 2.,
@ -184,36 +214,63 @@ fn spawn_enemies(
safe_axes.push(Vec3::ZERO);
}
// endrake_writer.write(SpawnEndrake {
// transform: Transform::from_xyz(safe_axes[0].x, 2.0, safe_axes[0].z),
// });
// spawn endrakes
if spawn_endrake {
let point = safe_axes[(*timer_ticks / ticks_per_endrake) as usize % safe_axes.len()];
endrake_writer.write(SpawnEndrake {
transform: Transform::from_xyz(point.x, 2.0, point.z),
});
}
let mut rng = thread_rng();
let clump_angles = std::iter::repeat_with(|| rng.gen_range(-PI..=PI))
.take(clumps as usize)
// spawn simberts
let simbert_clump_angles = std::iter::repeat_with(|| rng.gen_range(-PI..=PI))
.take(simbert_clumps as usize)
.collect::<Vec<_>>();
for angle in clump_angles.iter() {
for angle in simbert_clump_angles.iter() {
let mut spawn_origin = core_gtf.translation()
+ core_range.0 * Quat::from_rotation_y(*angle).mul_vec3(Vec3::Z);
if !level_rect.contains(Vec2::new(spawn_origin.x, spawn_origin.z)) {
spawn_origin = safe_axes[rng.gen_range(0..safe_axes.len())];
}
for y in 0..clump_size {
for y in 0..simberts_per_clump {
simbert_writer.write(SpawnSimbert {
transform: Transform::from_xyz(
spawn_origin.x,
2.0 + y as f32 * 0.5,
spawn_origin.z,
),
mega: clump_size > 2 && y == 0,
mega: ((mega_simbert_phases.contains(&phase)
|| phase >= always_spawn_mega_simbert_phase)
&& y == 0)
|| phase >= full_mega_simbert_phase,
});
// writer.write(SpawnCoranth {
// transform: Transform::from_xyz(
// spawn_origin.x,
// 2.0 + y as f32 * 0.5,
// spawn_origin.z,
// ),
// });
}
}
// spawn coranths
if (phase >= full_coranth_phase || coranth_phases.contains(&phase))
&& *timer_ticks > ticks_per_coranth_wave
{
let coranth_clump_angles = std::iter::repeat_with(|| rng.gen_range(-PI..=PI))
.take(coranth_clumps as usize)
.collect::<Vec<_>>();
for angle in coranth_clump_angles.iter() {
let mut spawn_origin = core_gtf.translation()
+ core_range.0 * Quat::from_rotation_y(*angle).mul_vec3(Vec3::Z);
if !level_rect.contains(Vec2::new(spawn_origin.x, spawn_origin.z)) {
spawn_origin = safe_axes[rng.gen_range(0..safe_axes.len())];
}
for y in 0..coranths_per_clump {
coranth_writer.write(SpawnCoranth {
transform: Transform::from_xyz(
spawn_origin.x,
2.0 + y as f32 * 0.5,
spawn_origin.z,
),
});
}
}
}
}
@ -221,7 +278,7 @@ fn spawn_enemies(
fn on_execute(mut timer: ResMut<ExecuteTimer>, curr_phase: Res<State<BasePhaseState>>) {
timer.0 = Some(Timer::from_seconds(
(5. + 2. * curr_phase.get().phase_count() as f32).min(60.),
(10. + 2. * curr_phase.get().phase_count() as f32).min(90.),
TimerMode::Once,
));
}

View file

@ -9,6 +9,7 @@ bevy = { workspace = true }
state = { path = "../state" }
resources = { path = "../resources" }
input = { path = "../input" }
combat = { path = "../combat" }
[lints]
workspace = true

View file

@ -7,6 +7,7 @@ use bevy::{
platform::collections::HashSet,
prelude::*,
};
use combat::Health;
use input::Selectable;
use resources::Quantity;
@ -91,17 +92,20 @@ fn populate_initial_upgrades(mut world: DeferredWorld, context: HookContext) {
fn activate_upgrade(
trigger: Trigger<UnlockUpgrade>,
upgrade_query: Query<&Upgrade>,
mut building_query: Query<&mut Upgradable>,
mut building_query: Query<(&mut Upgradable, Option<&mut Health>)>,
mut commands: Commands,
) {
let Ok(upgrade) = upgrade_query.get(trigger.target()) else {
error!("activated upgrade on thing that was not an upgrade");
return;
};
let Ok(mut building) = building_query.get_mut(trigger.event().building) else {
let Ok((mut building, opt_health)) = building_query.get_mut(trigger.event().building) else {
error!("applying upgrade to non-upgradable thing");
return;
};
if let Some(mut health) = opt_health {
health.max_out();
}
building.available_upgrades.remove(&trigger.target());
building.active_upgrades.insert(trigger.target());
for unlock in upgrade.unlocks.iter() {

View file

@ -5,7 +5,7 @@
x limit workers per resource deposit
- main menu
x improve enemy AI
- balance
x balance (maybe)
--- IMPORTANT ---
x More towers
@ -15,6 +15,6 @@ x More resource deposit types
- Improve wave generation
--- STILL PRETTY IMPORTANT ---
- Building repair
~~Building repair: actually not doing this as it would be very hard to balance~~
x core upgrade (yeah I'm just adding more workers and range)
x delete buildings