make coranths go straight for core, and make them into balls
This commit is contained in:
parent
e2d0d553e9
commit
2d02e1cae6
3 changed files with 57 additions and 29 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use avian3d::prelude::*;
|
||||
use bevy::prelude::*;
|
||||
use building::Building;
|
||||
use building::Core;
|
||||
use combat::{GaveDamage, Health, Team};
|
||||
use combat_damagers::ContactDamage;
|
||||
use inhabitant::Inhabitant;
|
||||
|
|
@ -15,6 +15,7 @@ pub struct InhabitantCoranthPlugin;
|
|||
impl Plugin for InhabitantCoranthPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.add_event::<SpawnCoranth>()
|
||||
.add_systems(Startup, init)
|
||||
.add_systems(FixedUpdate, tick.in_set(GameSystemSet::Execute))
|
||||
.add_systems(FixedUpdate, spawn.in_set(GameSystemSet::PostTick));
|
||||
}
|
||||
|
|
@ -29,25 +30,42 @@ pub struct SpawnCoranth {
|
|||
pub transform: Transform,
|
||||
}
|
||||
|
||||
fn spawn(
|
||||
mut reader: EventReader<SpawnCoranth>,
|
||||
#[derive(Resource)]
|
||||
struct CoranthResources {
|
||||
material: Handle<StandardMaterial>,
|
||||
mesh: Handle<Mesh>,
|
||||
charge_timer: Timer,
|
||||
}
|
||||
|
||||
fn init(
|
||||
mut commands: Commands,
|
||||
mut meshes: ResMut<Assets<Mesh>>,
|
||||
mut materials: ResMut<Assets<StandardMaterial>>,
|
||||
) {
|
||||
commands.insert_resource(CoranthResources {
|
||||
material: materials.add(StandardMaterial {
|
||||
base_color: Color::srgb_u8(220, 156, 86),
|
||||
metallic: 1.0,
|
||||
perceptual_roughness: 0.3,
|
||||
..default()
|
||||
}),
|
||||
mesh: meshes.add(Sphere::new(0.25)),
|
||||
charge_timer: Timer::from_seconds(1.5, TimerMode::Repeating),
|
||||
});
|
||||
}
|
||||
fn spawn(
|
||||
mut reader: EventReader<SpawnCoranth>,
|
||||
mut commands: Commands,
|
||||
phase: Res<State<BasePhaseState>>,
|
||||
res: Res<CoranthResources>,
|
||||
) {
|
||||
for SpawnCoranth { transform } in reader.read() {
|
||||
commands
|
||||
.spawn((
|
||||
RigidBody::Dynamic,
|
||||
Collider::cuboid(0.5, 0.5, 0.5),
|
||||
Mesh3d(meshes.add(Cuboid::from_length(0.5))),
|
||||
MeshMaterial3d(materials.add(StandardMaterial {
|
||||
base_color: Color::srgb_u8(220, 156, 86),
|
||||
metallic: 1.0,
|
||||
perceptual_roughness: 0.3,
|
||||
..default()
|
||||
})),
|
||||
Collider::sphere(0.25),
|
||||
Mesh3d(res.mesh.clone()),
|
||||
MeshMaterial3d(res.material.clone()),
|
||||
MaxLinearSpeed(25.),
|
||||
Coranth,
|
||||
transform.clone(),
|
||||
|
|
@ -86,22 +104,32 @@ fn explode(
|
|||
|
||||
fn tick(
|
||||
mut coranths: Query<(&GlobalTransform, &mut LinearVelocity), With<Coranth>>,
|
||||
buildings: Query<&GlobalTransform, With<Building>>,
|
||||
core_gtf: Single<&GlobalTransform, With<Core>>,
|
||||
mut res: ResMut<CoranthResources>,
|
||||
time: Res<Time>,
|
||||
) {
|
||||
res.charge_timer.tick(time.delta());
|
||||
if !res.charge_timer.just_finished() {
|
||||
return;
|
||||
}
|
||||
for (coranth_tf, mut coranth_v) in coranths.iter_mut() {
|
||||
let coranth_pos = coranth_tf.translation();
|
||||
if let Some(closest_building) =
|
||||
buildings
|
||||
.iter()
|
||||
.map(|gtf| gtf.translation())
|
||||
.min_by(|a, b| {
|
||||
coranth_pos
|
||||
.distance_squared(*a)
|
||||
.total_cmp(&coranth_pos.distance_squared(*b))
|
||||
})
|
||||
{
|
||||
let delta = closest_building - coranth_pos;
|
||||
coranth_v.0 += delta.normalize_or_zero() * 0.1;
|
||||
}
|
||||
let core_pos = core_gtf.translation();
|
||||
|
||||
let delta = (core_pos - coranth_pos).with_y(0.);
|
||||
coranth_v.0 += delta.normalize_or_zero().with_y(0.5) * 7.;
|
||||
// if let Some(closest_building) =
|
||||
// buildings
|
||||
// .iter()
|
||||
// .map(|gtf| gtf.translation())
|
||||
// .min_by(|a, b| {
|
||||
// coranth_pos
|
||||
// .distance_squared(*a)
|
||||
// .total_cmp(&coranth_pos.distance_squared(*b))
|
||||
// })
|
||||
// {
|
||||
// let delta = (closest_building - coranth_pos).with_y(0.);
|
||||
// coranth_v.0 += delta.normalize_or_zero().with_y(0.5) * 7.;
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue