Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reimplement Runs, Levels, and Phases #89

Merged
merged 27 commits into from
Sep 1, 2023
Merged

Reimplement Runs, Levels, and Phases #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
de62bcd
change levels to VecDeque
cdsupina Aug 17, 2023
95d793e
remove systems and fuctions for handling the run and level
cdsupina Aug 19, 2023
9242452
resolve merge with main conflicts
cdsupina Aug 19, 2023
ed0ac3f
reimplement runs, levels and phases
cdsupina Aug 21, 2023
ff2ff3d
implment run end system
cdsupina Aug 21, 2023
bb54b4a
create sound effect audio event
cdsupina Aug 22, 2023
d1a880f
Merge branch 'main' of github.com:thetawavegame/thetawave into mergeC…
varoonp123 Aug 22, 2023
9ad524e
Run cargo fix to clean up carlo's crap
varoonp123 Aug 22, 2023
6ecce22
change DefenseAffect to DefenseInteraction and add sounds for healing…
cdsupina Aug 22, 2023
fd1b1ea
resolve conflicts
cdsupina Aug 22, 2023
97fb8f6
reset run and add enter main menu system
cdsupina Aug 23, 2023
26028da
add and call reset players system
cdsupina Aug 23, 2023
1f8019a
implement spawn boss phase
cdsupina Aug 24, 2023
e201aec
cycle and initialize next level on completion
cdsupina Aug 26, 2023
284effe
added event and system for playing background music
cdsupina Aug 28, 2023
a3702a5
add music transition event and system
cdsupina Aug 29, 2023
889b145
fix ci errors
cdsupina Aug 29, 2023
9a182dc
create audio module in thetawave_interface
cdsupina Aug 29, 2023
49267d2
remove unwrap for getting random formation, create objective and run …
cdsupina Aug 29, 2023
363fd67
fix ci error
cdsupina Aug 29, 2023
d37ed4a
fix ci errors
cdsupina Aug 29, 2023
33e0de3
rename RunResource to CurrentRunProgressResource
cdsupina Aug 31, 2023
5183d81
changed tween to duration for change background music events
cdsupina Aug 31, 2023
2d9463d
remove unused imports
cdsupina Aug 31, 2023
54cea14
Make two thetawave::run::DefenseData struct members public to allow c…
varoonp123 Aug 31, 2023
858fdd8
First test of the run objective system
varoonp123 Aug 31, 2023
88c3918
Use rstest to parametrize a couple of tests for the gate defense obje…
varoonp123 Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@ strum = "0.25.0"
strum_macros = "0.25.1"
bevy = { version = "0.11.2", features = ["serialize"] }
thiserror = "1.0"
derive_more = "0.99.17"
derive_more = "0.99.17"
bevy_ecs_macros = "0.11.2"
bevy_ecs = "0.11.2"
bevy_kira_audio = { version = "0.16.0", features = ["mp3", "wav"] }


[dev-dependencies]
rstest = "0.18.2"

[dependencies]
bevy = {workspace = true}
bevy = { workspace = true }
bevy_rapier2d = { version = "0.22.0", features = [
"simd-stable",
"debug-render-2d",
Expand All @@ -32,16 +37,16 @@ bevy_asset_loader = { version = "0.17.0", features = [
"3d",
"standard_dynamic_assets",
] }
serde = {workspace = true}
strum = {workspace = true}
strum_macros = {workspace = true}
serde = { workspace = true }
strum = { workspace = true }
strum_macros = { workspace = true }
ron = "0.8.0"
rand = "0.8.5"
console_error_panic_hook = "0.1.7"
bevy_kira_audio = { version = "0.16.0", features = ["mp3", "wav"] }
bevy_kira_audio = { workspace = true }
winit = "0.28.4"
image = "0.24.6"
thiserror = {workspace = true}
thiserror = { workspace = true }

thetawave_interface = { path = "crates/thetawave_interface" }

Expand Down
76 changes: 0 additions & 76 deletions assets/data/levels.ron
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions assets/data/mob_segments.ron
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
)
],
collision_damage: 6,
defense_affect: Heal(10),
defense_interaction: Some(Heal(10)),
health: 60,
consumable_drops: Standard,
z_level: 5.0,
Expand All @@ -35,7 +35,7 @@
)
],
collision_damage: 6,
defense_affect: Heal(10),
defense_interaction: Some(Heal(10)),
health: 60,
consumable_drops: Standard,
z_level: 5.0,
Expand Down
16 changes: 8 additions & 8 deletions assets/data/mobs.ron
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
deceleration: (2.0, 2.0),
speed: (80.0, 45.0),
collision_damage: 20,
defense_affect: Damage(15),
defense_interaction: Some(Damage(15)),
colliders: [
(
dimensions: (12.0, 2.0),
Expand Down Expand Up @@ -282,7 +282,7 @@
deceleration: (2.0, 2.0),
speed: (80.0, 45.0),
collision_damage: 20,
defense_affect: Damage(15),
defense_interaction: Some(Damage(15)),
colliders: [
(
dimensions: (12.0, 2.0),
Expand Down Expand Up @@ -337,7 +337,7 @@
deceleration: (2.0, 1.0),
speed: (0.0, 100.0),
collision_damage: 12,
defense_affect: Damage(8),
defense_interaction: Some(Damage(8)),
colliders: [
(
dimensions: (6.5, 6.5),
Expand Down Expand Up @@ -374,7 +374,7 @@
speed: (0.0, 85.0),
attack_damage: 10,
collision_damage: 8,
defense_affect: Damage(8),
defense_interaction: Some(Damage(8)),
colliders: [
(
dimensions: (6.5, 6.5),
Expand Down Expand Up @@ -437,7 +437,7 @@
speed: (0.0, 75.0),
attack_damage: 10,
collision_damage: 8,
defense_affect: Damage(8),
defense_interaction: Some(Damage(8)),
colliders: [
(
dimensions: (7.0, 7.5),
Expand Down Expand Up @@ -558,7 +558,7 @@
deceleration: (2.0, 1.0),
speed: (0.0, 75.0),
collision_damage: 6,
defense_affect: Damage(15),
defense_interaction: Some(Damage(15)),
colliders: [
(
dimensions: (7.5, 10.5),
Expand Down Expand Up @@ -635,7 +635,7 @@
speed: (75.0, 75.0),
attack_damage: 8,
collision_damage: 10,
defense_affect: Damage(12),
defense_interaction: Some(Damage(12)),
colliders: [
(
dimensions: (10.5, 3.0),
Expand Down Expand Up @@ -686,7 +686,7 @@
speed: (75.0, 75.0),
attack_damage: 8,
collision_damage: 10,
defense_affect: Damage(12),
defense_interaction: Some(Damage(12)),
colliders: [
(
dimensions: (10.5, 3.0),
Expand Down
Loading