upgrade system

This commit is contained in:
Jim 2025-08-31 23:59:50 -04:00
parent 921947c131
commit 83256bfbe5
Signed by: jim
GPG key ID: 3D7D94BA53088BF4
15 changed files with 331 additions and 43 deletions

14
Cargo.lock generated
View file

@ -1630,6 +1630,7 @@ dependencies = [
"input", "input",
"resources", "resources",
"state", "state",
"upgrade",
] ]
[[package]] [[package]]
@ -1643,6 +1644,7 @@ dependencies = [
"combat_damagers", "combat_damagers",
"resources", "resources",
"state", "state",
"upgrade",
] ]
[[package]] [[package]]
@ -2013,6 +2015,7 @@ dependencies = [
"ui_ingame", "ui_ingame",
"ui_pause", "ui_pause",
"ui_state", "ui_state",
"upgrade",
] ]
[[package]] [[package]]
@ -5296,6 +5299,7 @@ dependencies = [
"input", "input",
"resources", "resources",
"ui_state", "ui_state",
"upgrade",
] ]
[[package]] [[package]]
@ -5377,6 +5381,16 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "upgrade"
version = "0.1.0"
dependencies = [
"bevy",
"input",
"resources",
"state",
]
[[package]] [[package]]
name = "url" name = "url"
version = "2.5.7" version = "2.5.7"

View file

@ -55,4 +55,5 @@ ui_ingame = { path = "crates/ui_ingame" }
resources = { path = "crates/resources" } resources = { path = "crates/resources" }
building_barrager = { path = "crates/building_barrager" } building_barrager = { path = "crates/building_barrager" }
resource_graveyard = { path = "crates/resource_graveyard" } resource_graveyard = { path = "crates/resource_graveyard" }
upgrade = { path = "crates/upgrade" }
#new internal crates go here #new internal crates go here

View file

@ -1,7 +1,7 @@
( (
map: { map: {
KeyCode(ShiftLeft): [ MouseButton(Middle): [
MultiPlaceTower, CameraOrbitEnable,
], ],
MouseButton(Right): [ MouseButton(Right): [
PlaceTower, PlaceTower,
@ -9,8 +9,8 @@
MouseButton(Left): [ MouseButton(Left): [
CameraPanEnable, CameraPanEnable,
], ],
MouseButton(Middle): [ KeyCode(ShiftLeft): [
CameraOrbitEnable, MultiPlaceTower,
], ],
MouseScroll: [ MouseScroll: [
CameraZoom, CameraZoom,

View file

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

View file

@ -12,6 +12,7 @@ use combat::{Health, Team};
use input::Selectable; use input::Selectable;
use resources::{Cost, Resources}; use resources::{Cost, Resources};
use state::GameSystemSet; use state::GameSystemSet;
use upgrade::{Upgradable, UpgradeTree};
pub struct BuildingPlugin; pub struct BuildingPlugin;
@ -56,7 +57,7 @@ fn on_building_removed(mut world: DeferredWorld, context: HookContext) {
} }
#[derive(Component, Clone)] #[derive(Component, Clone)]
#[require(Name, Cost)] #[require(Name, Cost, UpgradeTree)]
#[component(on_add = register_building_info)] #[component(on_add = register_building_info)]
#[component(on_remove = unregister_building_info)] #[component(on_remove = unregister_building_info)]
#[component(immutable)] #[component(immutable)]
@ -198,7 +199,7 @@ fn place_building(
mut building_map: ResMut<PlacedBuildings>, mut building_map: ResMut<PlacedBuildings>,
mut commands: Commands, mut commands: Commands,
mut resources: ResMut<Resources>, mut resources: ResMut<Resources>,
info_query: Query<(&BuildingInfo, &Cost, &Name)>, info_query: Query<(&BuildingInfo, &Cost, &Name), With<UpgradeTree>>,
) { ) {
for PlaceBuilding { for PlaceBuilding {
info: info_entity, info: info_entity,
@ -206,7 +207,7 @@ fn place_building(
} in reader.read() } in reader.read()
{ {
let Ok((info, cost, name)) = info_query.get(*info_entity) else { let Ok((info, cost, name)) = info_query.get(*info_entity) else {
error!("tried to place building without info!"); error!("tried to place building without info or required components!");
continue; continue;
}; };
if !building_map.placement_valid(*location, info) { if !building_map.placement_valid(*location, info) {
@ -232,6 +233,7 @@ fn place_building(
name.clone(), name.clone(),
RigidBody::Static, RigidBody::Static,
Team::Core.collision_layers(), Team::Core.collision_layers(),
Upgradable::new(*info_entity),
)) ))
.id(); .id();
building_map.place_building(*location, info, *info_entity, instance); building_map.place_building(*location, info, *info_entity, instance);

View file

@ -12,6 +12,7 @@ combat = { path = "../combat" }
building = { path = "../building" } building = { path = "../building" }
resources = { path = "../resources" } resources = { path = "../resources" }
combat_damagers = { path = "../combat_damagers" } combat_damagers = { path = "../combat_damagers" }
upgrade = { path = "../upgrade" }
[lints] [lints]
workspace = true workspace = true

View file

@ -13,6 +13,7 @@ use combat::{
}; };
use combat_damagers::ContactDamage; use combat_damagers::ContactDamage;
use resources::{Cost, Quantity}; use resources::{Cost, Quantity};
use upgrade::{Upgrade, UpgradeApplied, UpgradeTree};
pub struct BuildingBarragerPlugin; pub struct BuildingBarragerPlugin;
@ -23,7 +24,9 @@ impl Plugin for BuildingBarragerPlugin {
} }
#[derive(Component)] #[derive(Component)]
pub struct Barrager; pub struct Barrager {
pub projectile_count: u32,
}
#[derive(Resource)] #[derive(Resource)]
struct BuildingResources { struct BuildingResources {
@ -58,6 +61,78 @@ fn register(
}); });
let info = commands.spawn_empty().id(); let info = commands.spawn_empty().id();
let test_unlocks = vec![
commands
.spawn((
Name::new("ROCKET BARRAGE"),
Upgrade {
description: "bangbangbangbangbangbangbangbang".to_string(),
cost: Quantity {
souls: 10,
bones: 10,
},
unlocks: vec![],
},
))
.observe(
|trigger: Trigger<UpgradeApplied>, mut query: Query<&mut ProjectileLauncher>| {
if let Ok(mut launcher) = query.get_mut(trigger.event().building) {
let interval = launcher.fire_timer.duration().div_f32(2.0);
launcher.set_interval(interval);
}
},
)
.id(),
commands
.spawn((
Name::new("Party Mode"),
Upgrade {
description: "I'm in the house tonight.".to_string(),
cost: Quantity { souls: 0, bones: 0 },
unlocks: vec![],
},
))
.observe(
|trigger: Trigger<UpgradeApplied>,
mut query: Query<(&mut Barrager, &mut ProjectileLauncher)>| {
if let Ok((mut barrager, mut launcher)) =
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;
}
},
)
.id(),
];
let upgrades = vec![
commands
.spawn((
Name::new("More Bullets"),
Upgrade {
description: "Shoots some more bullets".to_string(),
cost: Quantity {
souls: 10,
bones: 0,
},
unlocks: test_unlocks,
},
))
.observe(
|trigger: Trigger<UpgradeApplied>,
mut query: Query<(&mut Barrager, &mut ProjectileLauncher)>| {
if let Ok((mut barrager, mut launcher)) =
query.get_mut(trigger.event().building)
{
barrager.projectile_count += 5;
launcher.spread += 5.0_f32.to_radians();
}
},
)
.id(),
];
let preview = commands let preview = commands
.spawn(( .spawn((
BuildingPreview { info }, BuildingPreview { info },
@ -72,9 +147,10 @@ fn register(
size: SIZE, size: SIZE,
unlocked: true, unlocked: true,
}, },
UpgradeTree { upgrades },
Cost(Quantity { Cost(Quantity {
souls: 20, souls: 10,
bones: 20, bones: 10,
}), }),
Name::new("Barrager"), Name::new("Barrager"),
)); ));
@ -99,7 +175,9 @@ fn populate(
commands commands
.entity(trigger.target()) .entity(trigger.target())
.insert(( .insert((
Barrager, Barrager {
projectile_count: 5,
},
Health::new(20.0), Health::new(20.0),
Defense::new(7.0), Defense::new(7.0),
ContactDamage::new(2.0), ContactDamage::new(2.0),
@ -117,13 +195,21 @@ fn populate(
.observe(on_fire); .observe(on_fire);
} }
fn on_fire(trigger: Trigger<Fire>, mut commands: Commands, res: Res<BuildingResources>) { fn on_fire(
trigger: Trigger<Fire>,
query: Query<&Barrager>,
mut commands: Commands,
res: Res<BuildingResources>,
) {
let Ok(Barrager { projectile_count }) = query.get(trigger.target()) else {
return;
};
for v in get_shotgun_launch_vectors( for v in get_shotgun_launch_vectors(
trigger.event().spawn_pos, trigger.event().spawn_pos,
trigger.event().target_pos, trigger.event().target_pos,
5.0, 5.0,
trigger.event().launcher.spread, trigger.event().launcher.spread,
5, *projectile_count,
) { ) {
commands.spawn(( commands.spawn((
RigidBody::Dynamic, RigidBody::Dynamic,

View file

@ -74,6 +74,10 @@ impl ProjectileLauncher {
lifetime, lifetime,
} }
} }
pub fn set_interval(&mut self, interval: Duration) {
self.fire_timer = Timer::new(interval, TimerMode::Once);
}
} }
#[derive(Event)] #[derive(Event)]
@ -173,10 +177,11 @@ pub fn get_shotgun_launch_vectors(
target: Vec3, target: Vec3,
height: f32, height: f32,
spread: f32, spread: f32,
shots: usize, shots: u32,
) -> impl Iterator<Item = Vec3> { ) -> impl Iterator<Item = Vec3> {
let base_v = get_launch_vector(start, target, height, 0.0); let base_v = get_launch_vector(start, target, height, 0.0);
std::iter::repeat_n(base_v, shots).map(move |v| twiddle_angle(v, spread, &mut thread_rng())) std::iter::repeat_n(base_v, shots as usize)
.map(move |v| twiddle_angle(v, spread, &mut thread_rng()))
} }
pub fn twiddle_angle(v: Vec3, max_angle: f32, rng: &mut impl Rng) -> Vec3 { pub fn twiddle_angle(v: Vec3, max_angle: f32, rng: &mut impl Rng) -> Vec3 {

View file

@ -79,7 +79,6 @@ fn update_selection(
mut reader: EventReader<SelectEntity>, mut reader: EventReader<SelectEntity>,
mut old_query: Query<Entity, With<Selected>>, mut old_query: Query<Entity, With<Selected>>,
new_query: Query<(), With<Selectable>>, new_query: Query<(), With<Selectable>>,
name_query: Query<&Name>,
mut commands: Commands, mut commands: Commands,
) { ) {
let Some(SelectEntity(opt_entity)) = reader.read().last() else { let Some(SelectEntity(opt_entity)) = reader.read().last() else {
@ -94,11 +93,6 @@ fn update_selection(
return; return;
}; };
if !new_query.contains(*new_entity) { if !new_query.contains(*new_entity) {
info!(
"thing is not selectable {:?} {:?}",
new_entity,
name_query.get(*new_entity)
);
return; return;
} }
for entity in old_query.iter_mut() { for entity in old_query.iter_mut() {

View file

@ -58,6 +58,29 @@ pub struct Quantity {
pub bones: u32, pub bones: u32,
} }
impl Quantity {
pub fn to_string(&self) -> String {
let souls_text = if self.souls > 0 {
format!("{} souls", self.souls)
} else {
"".to_string()
};
let divider_text = if self.souls > 0 && self.bones > 0 {
", "
} else if self.souls == 0 && self.bones == 0 {
"FREE!!!"
} else {
""
};
let bones_text = if self.bones > 0 {
format!("{} bones", self.bones)
} else {
"".to_string()
};
format!("{}{}{}", souls_text, divider_text, bones_text)
}
}
impl std::ops::Mul<u32> for Quantity { impl std::ops::Mul<u32> for Quantity {
type Output = Quantity; type Output = Quantity;

View file

@ -12,6 +12,7 @@ resources = { path = "../resources" }
building = { path = "../building" } building = { path = "../building" }
input = { path = "../input" } input = { path = "../input" }
building_placement = { path = "../building_placement" } building_placement = { path = "../building_placement" }
upgrade = { path = "../upgrade" }
[lints] [lints]
workspace = true workspace = true

View file

@ -12,6 +12,7 @@ use building_placement::SelectBuildingPreview;
use input::{SelectEntity, Selected}; use input::{SelectEntity, Selected};
use resources::{AvailableWorkers, Cost, ResourceDeposit, Resources, WorkedResourceDeposit}; use resources::{AvailableWorkers, Cost, ResourceDeposit, Resources, WorkedResourceDeposit};
use ui_state::GameUIState; use ui_state::GameUIState;
use upgrade::{UnlockUpgrade, Upgradable, Upgrade};
pub struct UiIngamePlugin; pub struct UiIngamePlugin;
@ -31,6 +32,8 @@ fn resource_ui(
mut available_workers: ResMut<AvailableWorkers>, mut available_workers: ResMut<AvailableWorkers>,
buildings: Query<(&BuildingInfo, &Cost, &Name)>, buildings: Query<(&BuildingInfo, &Cost, &Name)>,
selected: Query<(Entity, &Name), With<Selected>>, selected: Query<(Entity, &Name), With<Selected>>,
upgradable: Query<&Upgradable>,
upgrades: Query<(&Upgrade, &Name)>,
mut selected_resource_deposit: Query<(&ResourceDeposit, Option<&mut WorkedResourceDeposit>)>, mut selected_resource_deposit: Query<(&ResourceDeposit, Option<&mut WorkedResourceDeposit>)>,
mut selected_preview_writer: EventWriter<SelectBuildingPreview>, mut selected_preview_writer: EventWriter<SelectBuildingPreview>,
mut select_writer: EventWriter<SelectEntity>, mut select_writer: EventWriter<SelectEntity>,
@ -50,6 +53,7 @@ fn resource_ui(
} }
ui.heading(selected_name.as_str()); ui.heading(selected_name.as_str());
// resource deposit management
if let Ok((deposit, mut opt_worked)) = selected_resource_deposit.get_mut(selected) { if let Ok((deposit, mut opt_worked)) = selected_resource_deposit.get_mut(selected) {
ui.label( ui.label(
RichText::new(format!("Level {} deposit", deposit.level)).size(font_size), RichText::new(format!("Level {} deposit", deposit.level)).size(font_size),
@ -98,6 +102,49 @@ fn resource_ui(
RichText::new(format!("Bones: {}", deposit.bounty.bones)).size(font_size), RichText::new(format!("Bones: {}", deposit.bounty.bones)).size(font_size),
); );
} }
//upgrades
if let Ok(Upgradable {
active_upgrades,
available_upgrades,
..
}) = upgradable.get(selected)
{
if !active_upgrades.is_empty() && !available_upgrades.is_empty() {
ui.heading(RichText::new("Upgrades").underline());
}
for (upgrade_entity, upgrade, upgrade_name) in available_upgrades
.iter()
.filter_map(|u| upgrades.get(*u).map(|(up, n)| (*u, up, n)).ok())
{
if ui
.button(RichText::new(upgrade_name.as_str()).size(large_font_size))
.clicked()
{
commands.trigger_targets(
UnlockUpgrade { building: selected },
upgrade_entity,
);
}
ui.label(RichText::new(upgrade.description.as_str()).size(font_size));
ui.label(RichText::new(upgrade.cost.to_string()).size(font_size));
}
if !active_upgrades.is_empty() {
ui.collapsing("Active Upgrades", |ui| {
for (upgrade, upgrade_name) in
active_upgrades.iter().filter_map(|u| upgrades.get(*u).ok())
{
ui.label(
RichText::new(upgrade_name.as_str()).size(large_font_size),
);
ui.label(
RichText::new(upgrade.description.as_str()).size(font_size),
);
ui.label(RichText::new(upgrade.cost.to_string()).size(font_size));
}
});
}
}
return; return;
} }
ui.label(RichText::new(format!("Souls: {}", resources.souls)).size(large_font_size)); ui.label(RichText::new(format!("Souls: {}", resources.souls)).size(large_font_size));
@ -107,30 +154,10 @@ fn resource_ui(
if !info.unlocked { if !info.unlocked {
continue; continue;
} }
let souls_text = if cost.souls > 0 {
format!("{} souls", cost.souls)
} else {
"".to_string()
};
let divider_text = if cost.souls > 0 && cost.bones > 0 {
", "
} else if cost.souls == 0 && cost.bones == 0 {
"FREE!!!"
} else {
""
};
let bones_text = if cost.bones > 0 {
format!("{} bones", cost.bones)
} else {
"".to_string()
};
if ui if ui
.button( .button(
RichText::new(format!( RichText::new(format!("{} - {}", name, cost.0.to_string())).size(font_size),
"{} - {}{}{}",
name, souls_text, divider_text, bones_text
))
.size(font_size),
) )
.clicked() .clicked()
{ {

14
crates/upgrade/Cargo.toml Normal file
View file

@ -0,0 +1,14 @@
[package]
name = "upgrade"
version = "0.1.0"
edition = "2024"
[dependencies]
bevy = { workspace = true }
state = { path = "../state" }
resources = { path = "../resources" }
input = { path = "../input" }
[lints]
workspace = true

118
crates/upgrade/src/lib.rs Normal file
View file

@ -0,0 +1,118 @@
//bevy system signatures often violate these rules
#![allow(clippy::type_complexity)]
#![allow(clippy::too_many_arguments)]
use bevy::{
ecs::{component::HookContext, world::DeferredWorld},
platform::collections::HashSet,
prelude::*,
};
use input::Selectable;
use resources::Quantity;
pub struct UpgradePlugin;
impl Plugin for UpgradePlugin {
fn build(&self, app: &mut App) {
app.add_observer(activate_upgrade);
}
}
#[derive(Component)]
#[require(Selectable)]
#[component(on_add=populate_initial_upgrades)]
pub struct Upgradable {
pub tree: Entity,
pub active_upgrades: HashSet<Entity>,
pub available_upgrades: HashSet<Entity>,
}
impl Upgradable {
pub fn new(tree: Entity) -> Self {
Self {
tree,
active_upgrades: default(),
available_upgrades: default(),
}
}
}
#[derive(Component, Default)]
pub struct UpgradeTree {
pub upgrades: Vec<Entity>,
}
#[derive(Component)]
#[require(Name)]
pub struct Upgrade {
pub description: String,
pub unlocks: Vec<Entity>,
pub cost: Quantity,
}
// triggered on the upgrade. do not add upgrade effects here
#[derive(Event)]
pub struct UnlockUpgrade {
pub building: Entity,
}
// triggered on the upgrade. add upgrade effects here
#[derive(Event)]
pub struct UpgradeApplied {
pub building: Entity,
}
fn populate_initial_upgrades(mut world: DeferredWorld, context: HookContext) {
let tree = world
.get_entity(context.entity)
.unwrap()
.components::<&Upgradable>()
.tree;
let Ok([tree_entity, mut upgradable_entity]) = world.get_entity_mut([tree, context.entity])
else {
error!("couldn't get tree entity");
return;
};
let mut upgradable = upgradable_entity.get_mut::<Upgradable>().unwrap();
let Some(tree) = tree_entity.get::<UpgradeTree>() else {
error!("couldn't get tree component");
return;
};
info!("adding some upgrades...");
for upgrade in tree.upgrades.iter() {
info!("tree upgrade");
if !upgradable.active_upgrades.contains(upgrade) {
upgradable.available_upgrades.insert(*upgrade);
info!("added upgrade!");
}
}
}
fn activate_upgrade(
trigger: Trigger<UnlockUpgrade>,
upgrade_query: Query<&Upgrade>,
mut building_query: Query<&mut Upgradable>,
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 {
error!("applying upgrade to non-upgradable thing");
return;
};
building.available_upgrades.remove(&trigger.target());
building.active_upgrades.insert(trigger.target());
for unlock in upgrade.unlocks.iter() {
if !building.active_upgrades.contains(unlock) {
building.available_upgrades.insert(*unlock);
}
}
commands.trigger_targets(
UpgradeApplied {
building: trigger.event().building,
},
trigger.target(),
);
}

View file

@ -36,6 +36,7 @@ fn main() {
resources::ResourcesPlugin, resources::ResourcesPlugin,
building_barrager::BuildingBarragerPlugin, building_barrager::BuildingBarragerPlugin,
resource_graveyard::ResourceGraveyardPlugin, resource_graveyard::ResourceGraveyardPlugin,
upgrade::UpgradePlugin,
// new internal crates go here // new internal crates go here
)); ));