CrizGames/bevy-santa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more difficult
All checks were successful
Build Bevy Game (Linux + Windows) / build-windows (push) Successful in 17m56s
Details
Build Bevy Game (Linux + Windows) / build-linux (push) Successful in 18m37s
Details

Browse source
This commit is contained in:
Crizomb 2026-01-04 19:30:35 +01:00
parent 9532911b00
commit d168e48759
2 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/core/wave.rs
View file

@ -10,7 +10,7 @@ use crate::{
kirby::Kirby, kirby::Kirby,
life::Life, life::Life,
}, },
map::map::{BOTTOM, LEFT, RIGHT, TOP}, map::map::{BOTTOM, LEFT, RIGHT, RIGHT_DIR, TOP, UP_DIR},
}; };
#[derive(Event)] #[derive(Event)]
@ -44,8 +44,8 @@ impl BubbleSplash {
} }
} }
const BASE_MOVE_FORCE: f32 = 4000.0; const BASE_MOVE_FORCE: f32 = 6000.0;
const BASE_LIFE: f32 = 10.0; const BASE_LIFE: f32 = 20.0;
const NORMAL_BUBBLE: BubbleType = BubbleType { const NORMAL_BUBBLE: BubbleType = BubbleType {
color: Color::linear_rgb(1.0, 1.0, 1.0), color: Color::linear_rgb(1.0, 1.0, 1.0),
@ -60,7 +60,7 @@ const RED_BUBBLE: BubbleType = BubbleType {
}; };
const GREEN_BUBBLE: BubbleType = BubbleType { const GREEN_BUBBLE: BubbleType = BubbleType {
color: Color::linear_rgb(1.0, 0.0, 0.0), color: Color::linear_rgb(0.0, 1.0, 0.0),
move_force: BASE_MOVE_FORCE * 0.5, move_force: BASE_MOVE_FORCE * 0.5,
max_life: BASE_LIFE * 2.0, max_life: BASE_LIFE * 2.0,
}; };
@ -84,16 +84,41 @@ fn get_bubble_waves() -> BubbleWaves {
BubbleSplash::new(RED_BUBBLE, BOTTOM, 10.0, 20), BubbleSplash::new(RED_BUBBLE, BOTTOM, 10.0, 20),
], ],
vec![ vec![
BubbleSplash::new(NORMAL_BUBBLE, RIGHT, 100.0, 200), BubbleSplash::new(NORMAL_BUBBLE, RIGHT - UP_DIR * 20.0, 100.0, 200),
BubbleSplash::new(RED_BUBBLE, RIGHT, 100.0, 100), BubbleSplash::new(RED_BUBBLE, RIGHT + UP_DIR * 20.0, 100.0, 100),
BubbleSplash::new(RED_BUBBLE, LEFT, 100.0, 100), BubbleSplash::new(RED_BUBBLE, LEFT, 100.0, 100),
], ],
vec![
BubbleSplash::new(NORMAL_BUBBLE, RIGHT, 100.0, 200),
BubbleSplash::new(RED_BUBBLE, RIGHT + UP_DIR * 40.0, 100.0, 100),
BubbleSplash::new(GREEN_BUBBLE, RIGHT - UP_DIR * 40.0, 100.0, 100),
],
vec![BubbleSplash::new(GREEN_BUBBLE, Vec2::ZERO, 300.0, 1000)],
vec![
BubbleSplash::new(RED_BUBBLE, Vec2::ZERO, 300.0, 1000),
BubbleSplash::new(GREEN_BUBBLE, Vec2::ZERO, 300.0, 1000),
],
], ],
collectables: vec![ collectables: vec![
vec![], vec![],
vec![(CollectableType::NewKirby, LEFT)], vec![(CollectableType::NewKirby, LEFT)],
vec![(CollectableType::SpeedBoost, BOTTOM)], vec![(CollectableType::SpeedBoost, BOTTOM)],
vec![(CollectableType::ShieldBoost, BOTTOM)], vec![(CollectableType::ShieldBoost, BOTTOM)],
vec![
(CollectableType::ShieldBoost, TOP),
(CollectableType::ShieldBoost, TOP + RIGHT_DIR * 40.0),
(CollectableType::NewKirby, BOTTOM),
],
vec![(CollectableType::NewKirby, LEFT + UP_DIR * 40.0), (CollectableType::NewKirby, LEFT - UP_DIR * 40.0)],
vec![
(CollectableType::SpeedBoost, TOP),
(CollectableType::SpeedBoost, BOTTOM),
(CollectableType::SpeedBoost, TOP + RIGHT_DIR * 40.0),
(CollectableType::SpeedBoost, BOTTOM + RIGHT_DIR * 40.0),
(CollectableType::SpeedBoost, TOP - RIGHT_DIR * 40.0),
(CollectableType::SpeedBoost, BOTTOM - RIGHT_DIR * 40.0),
(CollectableType::NewKirby, RIGHT),
],
vec![], vec![],
], ],
current_wave: 0, current_wave: 0,

3
src/map/map.rs
View file

@ -10,6 +10,9 @@ pub const LEFT: Vec2 = Vec2::new(-NEAR_LIMIT, 0.0);
pub const TOP: Vec2 = Vec2::new(0.0, NEAR_LIMIT); pub const TOP: Vec2 = Vec2::new(0.0, NEAR_LIMIT);
pub const BOTTOM: Vec2 = Vec2::new(0.0, -NEAR_LIMIT); pub const BOTTOM: Vec2 = Vec2::new(0.0, -NEAR_LIMIT);
pub const UP_DIR: Vec2 = Vec2::new(0.0, 1.0);
pub const RIGHT_DIR: Vec2 = Vec2::new(1.0, 0.0);
#[derive(Resource)] #[derive(Resource)]
pub struct MapBounds { pub struct MapBounds {
pub min: Vec2, pub min: Vec2,