add ramtower
This commit is contained in:
parent
23af12d258
commit
3e42fb6cf1
9 changed files with 356 additions and 7 deletions
16
Cargo.lock
generated
16
Cargo.lock
generated
|
|
@ -1687,6 +1687,21 @@ dependencies = [
|
|||
"ui_range_indicator",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "building_ramtower"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"avian3d",
|
||||
"bevy",
|
||||
"building",
|
||||
"combat",
|
||||
"combat_damagers",
|
||||
"inhabitant_endrake",
|
||||
"resources",
|
||||
"state",
|
||||
"upgrade",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.19.0"
|
||||
|
|
@ -2005,6 +2020,7 @@ dependencies = [
|
|||
"building_core",
|
||||
"building_impaler",
|
||||
"building_placement",
|
||||
"building_ramtower",
|
||||
"camera",
|
||||
"combat",
|
||||
"combat_damagers",
|
||||
|
|
|
|||
|
|
@ -61,4 +61,5 @@ ui_range_indicator = { path = "crates/ui_range_indicator" }
|
|||
inhabitant_simbert = { path = "crates/inhabitant_simbert" }
|
||||
inhabitant_endrake = { path = "crates/inhabitant_endrake" }
|
||||
resource_soul_spot = { path = "crates/resource_soul_spot" }
|
||||
building_ramtower = { path = "crates/building_ramtower" }
|
||||
#new internal crates go here
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
(
|
||||
map: {
|
||||
MouseButton(Middle): [
|
||||
CameraOrbitEnable,
|
||||
],
|
||||
KeyCode(ShiftLeft): [
|
||||
MultiPlaceTower,
|
||||
],
|
||||
MouseButton(Middle): [
|
||||
CameraOrbitEnable,
|
||||
],
|
||||
KeyCode(F1): [
|
||||
ToggleDebugUI,
|
||||
],
|
||||
|
|
|
|||
19
crates/building_ramtower/Cargo.toml
Normal file
19
crates/building_ramtower/Cargo.toml
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
[package]
|
||||
name = "building_ramtower"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
bevy = { workspace = true }
|
||||
avian3d = { workspace = true }
|
||||
|
||||
state = { path = "../state" }
|
||||
combat = { path = "../combat" }
|
||||
building = { path = "../building" }
|
||||
resources = { path = "../resources" }
|
||||
combat_damagers = { path = "../combat_damagers" }
|
||||
upgrade = { path = "../upgrade" }
|
||||
inhabitant_endrake = { path = "../inhabitant_endrake" }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
287
crates/building_ramtower/src/lib.rs
Normal file
287
crates/building_ramtower/src/lib.rs
Normal file
|
|
@ -0,0 +1,287 @@
|
|||
//bevy system signatures often violate these rules
|
||||
#![allow(clippy::type_complexity)]
|
||||
#![allow(clippy::too_many_arguments)]
|
||||
|
||||
use std::{cmp::Ordering, f32, time::Duration};
|
||||
|
||||
use avian3d::prelude::{Collider, GravityScale, LinearVelocity, RigidBody};
|
||||
use bevy::prelude::*;
|
||||
use building::{BuildingInfo, BuildingPreview, PREVIEW_ALPHA, PopulatePlacedBuilding};
|
||||
use combat::{
|
||||
Defense, Health, Range, Team,
|
||||
projectiles::{Fire, Projectile, ProjectileLauncher},
|
||||
};
|
||||
use combat_damagers::ContactDamage;
|
||||
use inhabitant_endrake::Endrake;
|
||||
use resources::{Cost, Quantity};
|
||||
use upgrade::{Upgrade, UpgradeApplied, UpgradeTree};
|
||||
|
||||
pub struct BuildingRamtowerPlugin;
|
||||
|
||||
impl Plugin for BuildingRamtowerPlugin {
|
||||
fn build(&self, app: &mut App) {
|
||||
app.add_systems(Startup, register).add_observer(populate);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Ramtower {
|
||||
pub prioritize_endrakes: bool,
|
||||
pub shot_velocity: f32,
|
||||
}
|
||||
|
||||
#[derive(Resource)]
|
||||
struct BuildingResources {
|
||||
mesh: Handle<Mesh>,
|
||||
material: Handle<StandardMaterial>,
|
||||
projectile_mesh: Handle<Mesh>,
|
||||
projectile_material: Handle<StandardMaterial>,
|
||||
projectile_collider: Collider,
|
||||
info_entity: Entity,
|
||||
}
|
||||
|
||||
const SIZE: UVec3 = UVec3::new(1, 4, 1);
|
||||
const PROJ_SIZE: Vec3 = Vec3::new(0.5, 0.5, 2.0);
|
||||
|
||||
fn register(
|
||||
mut commands: Commands,
|
||||
mut meshes: ResMut<Assets<Mesh>>,
|
||||
mut materials: ResMut<Assets<StandardMaterial>>,
|
||||
) {
|
||||
let mesh = meshes.add(Cuboid::from_size(SIZE.as_vec3()));
|
||||
let base_material = StandardMaterial {
|
||||
base_color: Color::srgb_u8(152, 174, 174),
|
||||
metallic: 0.2,
|
||||
perceptual_roughness: 0.6,
|
||||
..default()
|
||||
};
|
||||
let material = materials.add(base_material.clone());
|
||||
let preview_material = materials.add(StandardMaterial {
|
||||
alpha_mode: AlphaMode::Blend,
|
||||
base_color: base_material.base_color.with_alpha(PREVIEW_ALPHA),
|
||||
..base_material
|
||||
});
|
||||
let projectile_material = materials.add(StandardMaterial {
|
||||
alpha_mode: AlphaMode::Blend,
|
||||
base_color: Color::srgb_u8(86, 106, 106),
|
||||
metallic: 1.0,
|
||||
perceptual_roughness: 0.0,
|
||||
emissive: Color::srgb_u8(86, 106, 106).to_linear() * 0.3,
|
||||
..default()
|
||||
});
|
||||
|
||||
let info = commands.spawn_empty().id();
|
||||
let test_unlocks = vec![
|
||||
commands
|
||||
.spawn((
|
||||
Name::new("Endrake Assassain"),
|
||||
Upgrade {
|
||||
description:
|
||||
"Ramtower will prioritize destroying Endrakes. Deals even more damage."
|
||||
.to_string(),
|
||||
cost: Quantity {
|
||||
souls: 50,
|
||||
bones: 20,
|
||||
},
|
||||
unlocks: vec![],
|
||||
},
|
||||
))
|
||||
.observe(
|
||||
|trigger: Trigger<UpgradeApplied>,
|
||||
mut query: Query<(&mut Ramtower, &mut ProjectileLauncher)>| {
|
||||
if let Ok((mut ramtower, mut launcher)) =
|
||||
query.get_mut(trigger.event().building)
|
||||
{
|
||||
ramtower.prioritize_endrakes = true;
|
||||
launcher.damage *= 1.5;
|
||||
}
|
||||
},
|
||||
)
|
||||
.id(),
|
||||
commands
|
||||
.spawn((
|
||||
Name::new("Fortification"),
|
||||
Upgrade {
|
||||
description: "Fortified battering rams significantly more damage. Defense increases as well.".to_string(),
|
||||
cost: Quantity {
|
||||
souls: 50,
|
||||
bones: 10,
|
||||
},
|
||||
unlocks: vec![],
|
||||
},
|
||||
))
|
||||
.observe(
|
||||
|trigger: Trigger<UpgradeApplied>, mut query: Query<(&mut ProjectileLauncher, &mut Defense)>| {
|
||||
if let Ok((mut launcher, mut defense)) = query.get_mut(trigger.event().building) {
|
||||
launcher.damage *= 2.;
|
||||
defense.amount += 5.;
|
||||
}
|
||||
},
|
||||
)
|
||||
.id(),
|
||||
];
|
||||
let upgrades = vec![
|
||||
commands
|
||||
.spawn((
|
||||
Name::new("More Force"),
|
||||
Upgrade {
|
||||
description: "Battering rams move faster and can be launched farther."
|
||||
.to_string(),
|
||||
cost: Quantity {
|
||||
souls: 25,
|
||||
bones: 10,
|
||||
},
|
||||
unlocks: test_unlocks,
|
||||
},
|
||||
))
|
||||
.observe(
|
||||
|trigger: Trigger<UpgradeApplied>,
|
||||
mut query: Query<(&mut Ramtower, &mut Range)>| {
|
||||
if let Ok((mut ramtower, mut range)) = query.get_mut(trigger.event().building) {
|
||||
ramtower.shot_velocity += 20.;
|
||||
range.0 *= 1.5;
|
||||
}
|
||||
},
|
||||
)
|
||||
.id(),
|
||||
];
|
||||
let preview = commands
|
||||
.spawn((
|
||||
BuildingPreview { info },
|
||||
Visibility::Hidden,
|
||||
Mesh3d(mesh.clone()),
|
||||
MeshMaterial3d(preview_material),
|
||||
))
|
||||
.id();
|
||||
commands.entity(info).insert((
|
||||
BuildingInfo {
|
||||
preview,
|
||||
size: SIZE,
|
||||
unlocked: true,
|
||||
},
|
||||
Range(10.0),
|
||||
Health::new(10.0),
|
||||
Defense::new(4.0),
|
||||
UpgradeTree { upgrades },
|
||||
Cost(Quantity {
|
||||
souls: 5,
|
||||
bones: 15,
|
||||
}),
|
||||
Name::new("Ramtower"),
|
||||
));
|
||||
commands.insert_resource(BuildingResources {
|
||||
mesh: mesh,
|
||||
material: material.clone(),
|
||||
projectile_material: projectile_material,
|
||||
projectile_mesh: meshes.add(Cuboid::from_size(PROJ_SIZE)),
|
||||
projectile_collider: Collider::cuboid(PROJ_SIZE.x, PROJ_SIZE.y, PROJ_SIZE.z),
|
||||
info_entity: info,
|
||||
});
|
||||
}
|
||||
|
||||
fn populate(
|
||||
trigger: Trigger<PopulatePlacedBuilding>,
|
||||
mut commands: Commands,
|
||||
res: Res<BuildingResources>,
|
||||
) {
|
||||
if trigger.event().info != res.info_entity {
|
||||
return;
|
||||
}
|
||||
commands
|
||||
.entity(trigger.target())
|
||||
.insert((
|
||||
Ramtower {
|
||||
prioritize_endrakes: false,
|
||||
shot_velocity: 20.,
|
||||
},
|
||||
ContactDamage::new(2.0),
|
||||
ProjectileLauncher {
|
||||
custom_targeting: true,
|
||||
..ProjectileLauncher::new(
|
||||
Duration::from_secs(1),
|
||||
50.0,
|
||||
Vec3::Y * (SIZE.y as f32 + 0.5),
|
||||
Duration::from_secs(10),
|
||||
0.,
|
||||
)
|
||||
},
|
||||
Mesh3d(res.mesh.clone()),
|
||||
MeshMaterial3d(res.material.clone()),
|
||||
))
|
||||
.observe(on_fire);
|
||||
}
|
||||
|
||||
fn on_fire(
|
||||
trigger: Trigger<Fire>,
|
||||
query: Query<(&GlobalTransform, &Team, &Ramtower)>,
|
||||
mut commands: Commands,
|
||||
res: Res<BuildingResources>,
|
||||
enemy_query: Query<(&Team, &GlobalTransform, Option<&Endrake>)>,
|
||||
) {
|
||||
let Ok((
|
||||
gtf,
|
||||
team,
|
||||
Ramtower {
|
||||
prioritize_endrakes: prioritize_endrake,
|
||||
shot_velocity,
|
||||
},
|
||||
)) = query.get(trigger.target())
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let Some((target_pos, _endrake)) = trigger
|
||||
.event()
|
||||
.enemies_in_range
|
||||
.iter()
|
||||
.filter_map(|e| {
|
||||
enemy_query
|
||||
.get(*e)
|
||||
.ok()
|
||||
.and_then(|(enemy_team, enemy_gtf, opt_endrake)| {
|
||||
if enemy_team != team {
|
||||
Some((enemy_gtf.translation(), opt_endrake))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
})
|
||||
.min_by(|(a, a_e), (b, b_e)| {
|
||||
if *prioritize_endrake {
|
||||
// put endrakes first
|
||||
if a_e.is_some() && b_e.is_none() {
|
||||
Ordering::Less
|
||||
} else if a_e.is_none() && b_e.is_some() {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
// default to distance if both are endrakes
|
||||
gtf.translation()
|
||||
.distance_squared(*a)
|
||||
.total_cmp(>f.translation().distance_squared(*b))
|
||||
}
|
||||
} else {
|
||||
// default to closest by distance
|
||||
gtf.translation()
|
||||
.distance_squared(*a)
|
||||
.total_cmp(>f.translation().distance_squared(*b))
|
||||
}
|
||||
})
|
||||
else {
|
||||
info!("no closest enemy, is someone on the wrong physics layer for their team?");
|
||||
return;
|
||||
};
|
||||
let delta = (target_pos - trigger.event().spawn_pos).normalize_or_zero();
|
||||
commands.spawn((
|
||||
RigidBody::Dynamic,
|
||||
trigger.event().team,
|
||||
Health::new(1.0),
|
||||
GravityScale(0.0),
|
||||
ContactDamage::projectile(trigger.event().damage, f32::INFINITY),
|
||||
Transform::from_translation(trigger.event().spawn_pos).looking_at(target_pos, Vec3::Y),
|
||||
Projectile::from(&trigger.event().launcher),
|
||||
Projectile::collision_layers(trigger.event().team),
|
||||
LinearVelocity(delta * shot_velocity),
|
||||
res.projectile_collider.clone(),
|
||||
MeshMaterial3d(res.projectile_material.clone()),
|
||||
Mesh3d(res.projectile_mesh.clone()),
|
||||
));
|
||||
}
|
||||
|
|
@ -59,6 +59,8 @@ pub struct ProjectileLauncher {
|
|||
pub spread: f32,
|
||||
pub lifetime: Duration,
|
||||
pub damage: f32,
|
||||
/// will set fields in the fire event to be defaults, responsiblity of the building to set them up
|
||||
pub custom_targeting: bool,
|
||||
}
|
||||
|
||||
impl ProjectileLauncher {
|
||||
|
|
@ -75,6 +77,7 @@ impl ProjectileLauncher {
|
|||
damage,
|
||||
fire_offset,
|
||||
lifetime,
|
||||
custom_targeting: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -86,6 +89,8 @@ impl ProjectileLauncher {
|
|||
#[derive(Event)]
|
||||
pub struct Fire {
|
||||
pub target: Entity,
|
||||
pub damage: f32,
|
||||
pub enemies_in_range: Vec<Entity>,
|
||||
pub target_pos: Vec3,
|
||||
pub spawn_pos: Vec3,
|
||||
pub launcher: ProjectileLauncher,
|
||||
|
|
@ -123,6 +128,22 @@ fn fire_launcher(
|
|||
if enemies.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if launcher.custom_targeting {
|
||||
launcher.fire_timer.reset();
|
||||
commands.trigger_targets(
|
||||
Fire {
|
||||
target: Entity::PLACEHOLDER,
|
||||
damage: launcher.damage,
|
||||
target_pos: Vec3::ZERO,
|
||||
enemies_in_range: enemies,
|
||||
spawn_pos: gtf.translation() + launcher.fire_offset,
|
||||
launcher: launcher.clone(),
|
||||
team: team.clone(),
|
||||
},
|
||||
[launcher_entity],
|
||||
);
|
||||
continue;
|
||||
}
|
||||
let Some((closest_enemy, enemy_pos)) = enemies
|
||||
.iter()
|
||||
.filter_map(|e| {
|
||||
|
|
@ -151,6 +172,8 @@ fn fire_launcher(
|
|||
Fire {
|
||||
target: closest_enemy,
|
||||
target_pos: enemy_pos,
|
||||
damage: launcher.damage,
|
||||
enemies_in_range: enemies,
|
||||
spawn_pos: gtf.translation() + launcher.fire_offset,
|
||||
launcher: launcher.clone(),
|
||||
team: team.clone(),
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
use avian3d::prelude::*;
|
||||
use bevy::prelude::*;
|
||||
use building::Core;
|
||||
use combat::{Health, Team};
|
||||
use combat::{Defense, Health, Team};
|
||||
use combat_damagers::ContactDamage;
|
||||
use inhabitant::Inhabitant;
|
||||
use inhabitant_simbert::SpawnSimbert;
|
||||
|
|
@ -85,6 +85,7 @@ fn spawn(
|
|||
},
|
||||
transform.clone(),
|
||||
Health::new(2000.0 + 100. * phase.get().phase_count() as f32),
|
||||
Defense::new(5.),
|
||||
// todo: change enemy health bar color to differentiate from buildings
|
||||
BarSettings {
|
||||
offset: HEIGHT + 0.5,
|
||||
|
|
|
|||
|
|
@ -149,7 +149,8 @@ fn setup(
|
|||
}
|
||||
|
||||
fn spawn_enemies(
|
||||
mut writer: EventWriter<SpawnSimbert>,
|
||||
mut simbert_writer: EventWriter<SpawnSimbert>,
|
||||
mut endrake_writer: EventWriter<SpawnEndrake>,
|
||||
core_query: Single<(&GlobalTransform, &Range), With<Core>>,
|
||||
phase_state: Res<State<BasePhaseState>>,
|
||||
time: Res<Time>,
|
||||
|
|
@ -183,7 +184,7 @@ fn spawn_enemies(
|
|||
safe_axes.push(Vec3::ZERO);
|
||||
}
|
||||
|
||||
// writer.write(SpawnEndrake {
|
||||
// endrake_writer.write(SpawnEndrake {
|
||||
// transform: Transform::from_xyz(safe_axes[0].x, 2.0, safe_axes[0].z),
|
||||
// });
|
||||
|
||||
|
|
@ -198,7 +199,7 @@ fn spawn_enemies(
|
|||
spawn_origin = safe_axes[rng.gen_range(0..safe_axes.len())];
|
||||
}
|
||||
for y in 0..clump_size {
|
||||
writer.write(SpawnSimbert {
|
||||
simbert_writer.write(SpawnSimbert {
|
||||
transform: Transform::from_xyz(
|
||||
spawn_origin.x,
|
||||
2.0 + y as f32 * 0.5,
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ fn main() {
|
|||
inhabitant_endrake::InhabitantEndrakePlugin,
|
||||
resource_soul_spot::ResourceSoulSpotPlugin,
|
||||
),
|
||||
building_ramtower::BuildingRamtowerPlugin,
|
||||
// new internal crates go here
|
||||
));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue