Reimplement Runs, Levels, and Phases #89

cdsupina · 2023-08-21T01:16:02Z

Runs are made up of levels, levels are made up of phases
- Phases determine specific things that happen at a given point in the level of a run (Boss Fight, Mobs Spawning, Break, etc)
- Levels group phases and have an ongoing objective that persists through its phases (Defense)
- Runs are made up of levels, completing all the levels in a run results in a victory
Added a premade run defined in a run file with 3 identical levels
Created event for playing sounds effects
Created event for changing background music
Created event for ending a run

varoonp123 · 2023-08-21T21:34:25Z

src/ui/game.rs

@@ -493,7 +493,7 @@ pub fn update_player1_ui(
    }

    for mut style_component in player1_ui_queries.p6().iter_mut() {
-        if let Some(level) = &run_resource.level {
+        if let Some(level) = &run_resource.current_level {


I hope you used an IDE/right-click->refactor->rename for this :)

varoonp123 · 2023-08-21T21:41:11Z

src/run/level.rs

-    pub phase_timer: Option<Timer>,
-    /// Tracks time between spawns
-    pub spawn_timer: Option<Timer>,
+    pub completed_phases: VecDeque<LevelPhase>,


Maybe pub type LevelPhases = VecDeque<LevelPhase>; to save some typing and ease changing the implementation (atleast as much as others parts of the code base rely on common traits/interfaces).

I have seen rustc compile these type aliases away on godbolt, so there's probably not a runtime cost.

…onflict/betterLevels

varoonp123 · 2023-08-22T13:17:33Z

I resolved the merge conflicts. You know, you can do

mob_query.contains(*mob_entity)

and avoid this for loop.

varoonp123 · 2023-08-22T13:39:17Z

Step on up, fam, 'cause we're breakin' free from that old colonial code grind. A new dawn's risin', and this era? It's shackled to nothin' but top-tier code. Listen up, 'fore we ride that CI wave, there's a game-changer in town. I'm talkin' 'bout rustlin' that Rust project, givin' them warnings a new name: compile errors. You best believe, it's like breakin' chains 'fore they lock up – cargo rustc --all-features -- -D warnings – that's the spell we're castin', turnin' 'em warnings into errors right out the gate.

Hold tight, 'cause here's the deal: I'm only pullin' up a chair for code that ain't just talkin' the talk. It's gotta strut through that CI gauntlet without so much as a hiccup, and when it comes to mixin' up that Rust stew, them warnings best be as quiet as a hush-hush revolution. We ain't got time for noise, we're on the hunt for the real deal, like uncoverin' hidden treasures buried deep. So, remember this, partners: if it ain't passin' that CI litmus test and ain't ridin' the compile trail without raisin' no warnings ruckus, it ain't gettin' the spotlight in my code rodeo – 'cause we're breakin' chains, not just rebrandin' 'em.

    Compiling thetawave v0.1.1 (/home/runner/work/thetawave/thetawave)
error: method `generate_random` is never used
  --> src/run/mod.rs:99:12
   |
98 | impl RunResource {
   | ---------------- method in this implementation
99 |     pub fn generate_random(&mut self) {}
   |            ^^^^^^^^^^^^^^^
   |
   = note: `-D dead-code` implied by `-D warnings`

error: function `run_reset_system` is never used
   --> src/run/mod.rs:252:4
    |
252 | fn run_reset_system(mut run_resource: ResMut<RunResource>) {
    |    ^^^^^^^^^^^^^^^^

error: could not compile `thetawave` (bin "thetawave") due to 2 previous errors
Error: Process completed with exit code 101.

… and damaging defense

varoonp123 · 2023-08-27T06:06:43Z

src/assets/audio.rs

@@ -12,6 +12,25 @@ pub enum BGMusicType {
    Main,
 }

+#[derive(Deserialize, Debug, Hash, PartialEq, Eq, Clone, Display)]


Move this and PlaySoundEffectEvent to thetawave_interface::audio. Now there is a clear way for other plugins to play sound and allow this 1 module/compilation unit to deal with all audio assets, platform-specific audio libs/crap, etc.

…module in interface for events

varoonp123 · 2023-08-29T16:39:44Z

src/run/mod.rs

-    PlayersDestroyed,
-    DefenseDestroyed,
+#[derive(Resource, Default, Debug)]
+pub struct RunResource {


rename to CurrentRunProgress or CurrentRunState just to emphasize that this thing is a state-machine/game-level mutable global of sorts.

I'm renaming it to CurrentRunProgressResource because I want it to still be marked as a Resource.

varoonp123 · 2023-08-30T15:00:09Z

The fire rate gets a bit wack.

varoonp123 · 2023-08-30T16:58:07Z

crates/thetawave_interface/src/audio.rs

+    /// Loop from a specific time in the track, None will not loop the track
+    pub loop_from: Option<f64>,
+    /// Fade in the music cycling in (bg_music_type)
+    pub fade_in_tween: Option<AudioTween>,


If we only use this linear tween, then use a Duration so that we dont need to pull in kira/audio stuff just for the interface. Nice for testing, but not required.

varoonp123

Ill help write a test on the state transitions on RunResource (which seems like the meat of this PR) before we merge.

varoonp123 · 2023-08-31T06:44:29Z

Looks good and plays fine. Ill try getting this test to work. And if I cant get it by tomorrow evening, lets just merge. Norway won't invade.

…onstruction and make a test

…ctive

varoonp123

It's fine for now and plays well. I added a couple of (regression) tests of the core defense health objective and will sprinkle in more over time. I was about to add more but idk how much I like SortedCollisionEvent enough to hoist it to the interface (IOW idk how stable that enum is)...

cdsupina added 5 commits August 17, 2023 14:01

change levels to VecDeque

de62bcd

remove systems and fuctions for handling the run and level

95d793e

resolve merge with main conflicts

9242452

reimplement runs, levels and phases

ed0ac3f

implment run end system

ff2ff3d

varoonp123 reviewed Aug 21, 2023

View reviewed changes

cdsupina and others added 3 commits August 22, 2023 01:00

create sound effect audio event

bb54b4a

Merge branch 'main' of github.com:thetawavegame/thetawave into mergeC…

d1a880f

…onflict/betterLevels

Run cargo fix to clean up carlo's crap

9ad524e

varoonp123 closed this Aug 22, 2023

varoonp123 reopened this Aug 22, 2023

cdsupina added 6 commits August 22, 2023 11:51

change DefenseAffect to DefenseInteraction and add sounds for healing…

6ecce22

… and damaging defense

resolve conflicts

fd1b1ea

reset run and add enter main menu system

97fb8f6

add and call reset players system

26028da

implement spawn boss phase

1f8019a

cycle and initialize next level on completion

e201aec

varoonp123 reviewed Aug 27, 2023

View reviewed changes

cdsupina added 6 commits August 28, 2023 11:09

added event and system for playing background music

284effe

add music transition event and system

a3702a5

fix ci errors

889b145

create audio module in thetawave_interface

9a182dc

remove unwrap for getting random formation, create objective and run …

49267d2

…module in interface for events

fix ci error

363fd67

cdsupina marked this pull request as ready for review August 29, 2023 15:31

cdsupina requested a review from varoonp123 August 29, 2023 15:31

fix ci errors

d37ed4a

varoonp123 reviewed Aug 29, 2023

View reviewed changes

varoonp123 reviewed Aug 30, 2023

View reviewed changes

cdsupina added 3 commits August 30, 2023 20:38

rename RunResource to CurrentRunProgressResource

33e0de3

changed tween to duration for change background music events

5183d81

remove unused imports

2d9463d

varoonp123 added 2 commits August 31, 2023 11:30

Make two thetawave::run::DefenseData struct members public to allow c…

54cea14

…onstruction and make a test

First test of the run objective system

858fdd8

varoonp123 force-pushed the features/BetterLevels branch from 30e75d5 to 279d434 Compare September 1, 2023 03:52

Use rstest to parametrize a couple of tests for the gate defense obje…

88c3918

…ctive

varoonp123 force-pushed the features/BetterLevels branch from 279d434 to 88c3918 Compare September 1, 2023 04:47

varoonp123 approved these changes Sep 1, 2023

View reviewed changes

varoonp123 merged commit d6c025d into thetawavegame:main Sep 1, 2023
5 checks passed

cdsupina deleted the features/BetterLevels branch September 3, 2023 22:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reimplement Runs, Levels, and Phases #89

Reimplement Runs, Levels, and Phases #89

cdsupina commented Aug 21, 2023 •

edited

Loading

varoonp123 Aug 21, 2023

varoonp123 Aug 21, 2023 •

edited

Loading

varoonp123 commented Aug 22, 2023

varoonp123 commented Aug 22, 2023 •

edited

Loading

varoonp123 Aug 27, 2023

varoonp123 Aug 29, 2023 •

edited

Loading

cdsupina Aug 31, 2023

varoonp123 commented Aug 30, 2023

varoonp123 Aug 30, 2023

varoonp123 left a comment

varoonp123 commented Aug 31, 2023

varoonp123 left a comment

Reimplement Runs, Levels, and Phases #89

Reimplement Runs, Levels, and Phases #89

Conversation

cdsupina commented Aug 21, 2023 • edited Loading

varoonp123 Aug 21, 2023

Choose a reason for hiding this comment

varoonp123 Aug 21, 2023 • edited Loading

Choose a reason for hiding this comment

varoonp123 commented Aug 22, 2023

varoonp123 commented Aug 22, 2023 • edited Loading

varoonp123 Aug 27, 2023

Choose a reason for hiding this comment

varoonp123 Aug 29, 2023 • edited Loading

Choose a reason for hiding this comment

cdsupina Aug 31, 2023

Choose a reason for hiding this comment

varoonp123 commented Aug 30, 2023

varoonp123 Aug 30, 2023

Choose a reason for hiding this comment

varoonp123 left a comment

Choose a reason for hiding this comment

varoonp123 commented Aug 31, 2023

varoonp123 left a comment

Choose a reason for hiding this comment

cdsupina commented Aug 21, 2023 •

edited

Loading

varoonp123 Aug 21, 2023 •

edited

Loading

varoonp123 commented Aug 22, 2023 •

edited

Loading

varoonp123 Aug 29, 2023 •

edited

Loading