New Fighter State Design and Gameplay Refactor

Cargo.toml

@@ -18,7 +18,8 @@ default-features = false
 features = [
     "x11",
     "png",
-    "filesystem_watcher"
+    "filesystem_watcher",
+    "bevy_gilrs"
 ]
 
 [dependencies]
@@ -38,7 +39,7 @@ structopt = "0.3.26"
 rand = "0.8.5"
 getrandom = { version = "0.2", features = ["js"] }
 
-leafwing_input_manager = { git = "https://github.com/Leafwing-Studios/leafwing-input-manager.git", default-features = false, branch = "dev" }
+leafwing-input-manager = { version = "0.5", default-features = false }
 unic-langid = "0.9.0"
 bevy_fluent = { git = "https://github.com/kgv/bevy_fluent.git" }
 sys-locale = "0.2.1"
@@ -48,17 +49,17 @@ async-channel = "1.6.1"
 once_cell = "1.13.0"
 
 # Waiting for updates to Bevy 0.8
-# bevy_mod_debugdump = { version = "0.4", optional = true }
-# bevy-inspector-egui = { version = "0.11", optional = true }
-# bevy-inspector-egui-rapier = { version = "0.4", optional = true, features = ["rapier2d"] }
+bevy_mod_debugdump = { version = "0.5.0", optional = true }
+bevy-inspector-egui = { version = "0.12.1", optional = true }
+bevy-inspector-egui-rapier = { version = "0.5.0", optional = true, features = ["rapier2d"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3", features = ["Window","Location","Storage"] }
 
 [features]
 default = []
-# Waiting for update to Bevy 0.8
-# schedule_graph = ["bevy_mod_debugdump"]
+debug = ["bevy_mod_debugdump", "bevy-inspector-egui", "bevy-inspector-egui-rapier"]
+schedule_graph = ["bevy_mod_debugdump"]
 
 # Enable optimizations for dependencies but not for our code
 [profile.dev.package."*"]

assets/fighters/bandit/bandit.fighter.yaml

@@ -1,8 +1,8 @@
 name: Bandit
 
 stats:
-  health: 150
-  damage: 20
+  max_health: 150
+  damage: 4
   movement_speed: 150
 
 hud:

assets/fighters/brute/brute.fighter.yaml

@@ -1,8 +1,8 @@
 name: Brute
 
 stats:
-  health: 200
-  damage: 50
+  max_health: 200
+  damage: 10
   movement_speed: 50
 
 hud:

assets/fighters/fishy/fishy.fighter.yaml

@@ -1,7 +1,7 @@
 name: Fishy The Fearsome
 
 stats:
-  health: 100
+  max_health: 600
   damage: 35
   movement_speed: 150
 

assets/fighters/sharky/sharky.fighter.yaml

@@ -1,7 +1,7 @@
 name: Scrumptious Sharky
 
 stats:
-  health: 100
+  max_health: 600
   damage: 35
   movement_speed: 150
 

assets/fighters/slinger/slinger.fighter.yaml

@@ -1,8 +1,8 @@
 name: Slinger
 
 stats:
-  health: 100
-  damage: 35
+  max_health: 100
+  damage: 7
   movement_speed: 150
 
 hud:

assets/items/bottle/bottle.item.yaml

@@ -3,3 +3,6 @@ name: Bottle
 image:
     image: bottle.png
     image_size: [11, 31]
+
+kind: !Throwable
+    damage: 10

assets/items/health/health.item.yaml

@@ -1,5 +1,8 @@
 name: Health
 
 image:
-    image: health.png
-    image_size: [22, 20]
+  image: health.png
+  image_size: [22, 20]
+
+kind: !Health
+  health: 1000000 # Refill all of it

src/animation.rs

@@ -1,8 +1,8 @@
 use std::ops::Range;
 
-use crate::{state::State, GameStage, GameState};
+use crate::GameState;
 use bevy::{
-    prelude::{App, Changed, Component, Plugin, Query, Res},
+    prelude::*,
     sprite::TextureAtlasSprite,
     time::{Time, Timer},
     utils::HashMap,
@@ -15,17 +15,24 @@ pub struct AnimationPlugin;
 impl Plugin for AnimationPlugin {
     fn build(&self, app: &mut App) {
         app.add_system_set_to_stage(
-            GameStage::Animation,
+            CoreStage::Last,
             ConditionSet::new()
                 .run_in_state(GameState::InGame)
-                .with_system(animate_on_state_changed)
                 .with_system(animation_flipping)
                 .with_system(animation_cycling)
                 .into(),
         );
     }
 }
 
+/// Bundle for animated sprite sheets
+#[derive(Bundle)]
+pub struct AnimatedSpriteSheetBundle {
+    #[bundle]
+    pub sprite_sheet: SpriteSheetBundle,
+    pub animation: Animation,
+}
+
 #[cfg_attr(feature = "debug", derive(bevy_inspector_egui::Inspectable))]
 #[derive(Component, PartialEq, Eq, Clone)]
 pub enum Facing {
@@ -37,10 +44,6 @@ impl Facing {
     pub fn is_left(&self) -> bool {
         self == &Facing::Left
     }
-
-    pub fn set(&mut self, facing: Facing) {
-        *self = facing;
-    }
 }
 
 #[derive(serde::Deserialize, Clone, Debug)]
@@ -95,31 +98,41 @@ impl<'de> serde::de::Visitor<'de> for RangeVisitor {
 
 #[derive(Component)]
 pub struct Animation {
-    pub animations: HashMap<State, Clip>,
+    pub animations: HashMap<String, Clip>,
     pub current_frame: usize,
-    current_state: Option<State>,
+    pub current_animation: Option<String>,
     pub timer: Timer,
     pub played_once: bool,
 }
 
 impl Animation {
-    pub fn new(fps: f32, animations: HashMap<State, Clip>) -> Self {
+    pub fn new(fps: f32, animations: HashMap<String, Clip>) -> Self {
         Self {
             animations,
             current_frame: 0,
-            current_state: None,
+            current_animation: None,
             timer: Timer::from_seconds(fps, false),
             played_once: false,
         }
     }
 
+    /// Start playing a new animation
+    pub fn play(&mut self, name: &str, repeating: bool) {
+        self.current_animation = Some(name.to_owned());
+        self.current_frame = 0;
+        self.timer.reset();
+        self.timer.unpause();
+        self.timer.set_repeating(repeating);
+        self.played_once = false;
+    }
+
     pub fn is_finished(&self) -> bool {
         self.played_once
     }
 
     pub fn is_repeating(&self) -> bool {
-        if let Some(state) = self.current_state {
-            if let Some(clip) = self.animations.get(&state) {
+        if let Some(animation) = &self.current_animation {
+            if let Some(clip) = self.animations.get(animation) {
                 return clip.repeat;
             }
         }
@@ -138,8 +151,8 @@ impl Animation {
     }
 
     pub fn get_current_indices(&self) -> Option<&Range<usize>> {
-        if let Some(state) = self.current_state {
-            match self.animations.get(&state) {
+        if let Some(animation) = &self.current_animation {
+            match self.animations.get(animation) {
                 Some(clip) => return Some(&clip.frames),
                 None => return None,
             }
@@ -157,22 +170,11 @@ impl Animation {
     }
 }
 
-fn animate_on_state_changed(mut query: Query<(&mut Animation, &State), Changed<State>>) {
-    for (mut animation, state) in query.iter_mut() {
-        if animation.current_state != Some(*state) {
-            animation.played_once = false;
-            animation.current_frame = 0;
-            animation.current_state = Some(*state);
-            animation.timer.reset();
-        }
-    }
-}
-
 fn animation_cycling(mut query: Query<(&mut TextureAtlasSprite, &mut Animation)>, time: Res<Time>) {
     //TODO: Add a tick method on Animation
     for (mut texture_atlas_sprite, mut animation) in query.iter_mut() {
         if animation.is_finished() && !animation.is_repeating() {
-            return;
+            continue;
         }
 
         animation.timer.tick(time.delta());

src/assets.rs

@@ -262,7 +262,7 @@ impl AssetLoader for FighterLoader {
                     let frame_audio_handles = meta
                         .audio
                         .effect_handles
-                        .entry(*state)
+                        .entry(state.clone())
                         .or_insert_with(HashMap::new);
 
                     frame_audio_handles.insert(*animation_i, effect_handle);