Fix match state remaining mutable after and of match and implement initial work on aerials (#77)
Reviewed-on: #77 Co-authored-by: Álex Román Núñez <eirexe@eirteam.moe>
This commit was merged in pull request #77.
This commit is contained in:
+7
-1
@@ -9,6 +9,8 @@
|
||||
use bevy::prelude::*;
|
||||
use bevy_ggrs::prelude::*;
|
||||
|
||||
use crate::match_runtime::match_is_ongoing;
|
||||
|
||||
#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
|
||||
pub enum GameplaySet {
|
||||
/// Turn this frame's netcode inputs into per-fighter input state.
|
||||
@@ -25,6 +27,8 @@ pub enum GameplaySet {
|
||||
Animation,
|
||||
/// Resolve attacks
|
||||
Attacks,
|
||||
/// Advance match rules and detect the end of the match.
|
||||
MatchRules,
|
||||
}
|
||||
|
||||
/// Declares the order of [`GameplaySet`] inside [`GgrsSchedule`]. Added by
|
||||
@@ -43,8 +47,10 @@ impl Plugin for GameplaySchedulePlugin {
|
||||
GameplaySet::Animation,
|
||||
GameplaySet::Collision,
|
||||
GameplaySet::Attacks,
|
||||
GameplaySet::MatchRules,
|
||||
)
|
||||
.chain(),
|
||||
.chain()
|
||||
.run_if(match_is_ongoing),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user