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

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,
));
}