core upgrades

This commit is contained in:
Jim 2025-09-02 10:17:39 -04:00
parent 2d4dc3c708
commit e2d0d553e9
Signed by: jim
GPG key ID: 3D7D94BA53088BF4
7 changed files with 71 additions and 14 deletions

2
Cargo.lock generated
View file

@ -1655,8 +1655,10 @@ dependencies = [
"bevy",
"building",
"combat",
"resources",
"state",
"ui_range_indicator",
"upgrade",
]
[[package]]

View file

@ -3,20 +3,20 @@
KeyCode(ShiftLeft): [
MultiPlaceTower,
],
MouseButton(Right): [
PlaceTower,
],
MouseButton(Left): [
CameraPanEnable,
],
MouseButton(Middle): [
CameraOrbitEnable,
],
KeyCode(F1): [
ToggleDebugUI,
],
MouseButton(Right): [
PlaceTower,
],
MouseScroll: [
CameraZoom,
],
KeyCode(F1): [
ToggleDebugUI,
MouseButton(Left): [
CameraPanEnable,
],
MouseMovementX: [
CameraYaw,

View file

@ -61,7 +61,8 @@ fn register(
});
let info = commands.spawn_empty().id();
let test_unlocks = vec![
let test_unlocks =
vec![
commands
.spawn((
Name::new("ROCKET BARRAGE"),
@ -69,7 +70,7 @@ fn register(
description: "bangbangbangbangbangbangbangbang".to_string(),
cost: Quantity {
souls: 10,
bones: 10,
bones: 20,
},
unlocks: vec![],
},
@ -88,7 +89,7 @@ fn register(
Name::new("Party Mode"),
Upgrade {
description: "I'm in the house tonight.".to_string(),
cost: Quantity { souls: 0, bones: 0 },
cost: Quantity { souls: 20, bones: 10 },
unlocks: vec![],
},
))

View file

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

View file

@ -5,8 +5,10 @@
use bevy::prelude::*;
use building::{BuildingInfo, BuildingPreview, Core, PREVIEW_ALPHA, PopulatePlacedBuilding};
use combat::{Defense, Died, Health, Range};
use resources::{AvailableWorkers, Quantity};
use state::{CoreState, GameState};
use ui_range_indicator::CustomRangeIndicator;
use upgrade::{Upgrade, UpgradeApplied, UpgradeTree};
pub struct BuildingCorePlugin;
@ -57,16 +59,18 @@ fn register(
CorePreview,
))
.id();
let upgrades = get_upgrades(&mut commands);
commands.entity(info).insert((
BuildingInfo {
preview,
size: SIZE,
unlocked: false,
},
UpgradeTree { upgrades },
Name::new("Core"),
Health::new(100.0),
Defense::new(5.0),
Range(25.0),
Range(15.0),
));
commands.insert_resource(CoreResources {
mesh: mesh,
@ -75,6 +79,54 @@ fn register(
});
}
fn get_upgrades(commands: &mut Commands) -> Vec<Entity> {
fn create_worker_upgrade(
commands: &mut Commands,
name: String,
desc: &'static str,
cost: Quantity,
unlocks: Vec<Entity>,
) -> Entity {
commands
.spawn((
Name::new(name),
Upgrade {
description: desc.to_string(),
cost,
unlocks,
},
))
.observe(
|_trigger: Trigger<UpgradeApplied>,
mut workers: ResMut<AvailableWorkers>,
mut range: Single<&mut Range, With<Core>>| {
workers.0 += 1;
range.0 += 5.0;
},
)
.id()
}
let mut worker_upgrade = None;
for i in (1..=5).rev() {
let unlocks = if let Some(up) = worker_upgrade {
vec![up]
} else {
Vec::new()
};
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.",
Quantity {
souls: 25 * 2_u32.pow(i - 1),
bones: 20 * 2_u32.pow(i - 1),
},
unlocks,
));
}
vec![worker_upgrade.unwrap()]
}
fn populate(
trigger: Trigger<PopulatePlacedBuilding>,
mut commands: Commands,

View file

@ -13,7 +13,7 @@ impl Plugin for ResourcesPlugin {
fn build(&self, app: &mut App) {
app.add_systems(OnEnter(AppState::Game), setup)
.add_systems(FixedUpdate, tick_harvest.in_set(GameSystemSet::Execute))
.insert_resource(AvailableWorkers(5))
.insert_resource(AvailableWorkers(1))
.add_observer(on_harvest);
}
}

View file

@ -15,4 +15,4 @@ x limit workers per resource deposit
--- STILL PRETTY IMPORTANT ---
- Building repair
- core upgrade
x core upgrade (yeah I'm just adding more workers and range)