Remove dummy

As I'm planning on making changes to the builders, it would be best to
not waste effort with the dummy

client/characters/src/actions/action.rs

@@ -60,9 +60,8 @@ macro_rules! throw_target {
                 if situation.on_frame(0) {
                     vec![
                         AnimationRequest {
-                            animation: $animation.into(),
                             invert: true,
-                            ..default()
+                            ..AnimationRequest::from(Animation::from($animation))
                         }
                         .into(),
                         ActionEvent::ModifyResource(ResourceType::Health, -$damage),

client/characters/src/actions/action_event.rs

@@ -1,8 +1,8 @@
 use bevy::prelude::*;
 
 use wag_core::{
-    ActionId, Animation, Area, CancelWindow, DummyAnimation, SamuraiAnimation, SoundEffect,
-    StatusCondition, StatusFlag, VfxRequest, VoiceLine,
+    ActionId, Animation, Area, CancelWindow, SamuraiAnimation, SoundEffect, StatusCondition,
+    StatusFlag, VfxRequest, VoiceLine,
 };
 
 use crate::{FlashRequest, Movement, ResourceType};
@@ -70,12 +70,7 @@ impl From<VfxRequest> for ActionEvent {
         ActionEvent::RelativeVisualEffect(value)
     }
 }
-// This isn't a great way to do this, but it's the best I can think of for now
-impl From<DummyAnimation> for ActionEvent {
-    fn from(value: DummyAnimation) -> Self {
-        ActionEvent::Animation(Animation::from(value).into())
-    }
-}
+
 impl From<SamuraiAnimation> for ActionEvent {
     fn from(value: SamuraiAnimation) -> Self {
         ActionEvent::Animation(Animation::from(value).into())

client/characters/src/actions/animation_request.rs

@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use wag_core::Animation;
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Reflect)]
+#[derive(Debug, Clone, Copy, PartialEq, Reflect)]
 pub struct AnimationRequest {
     pub animation: Animation,
     pub position_offset: Vec2,
@@ -13,7 +13,10 @@ impl From<Animation> for AnimationRequest {
     fn from(animation: Animation) -> Self {
         Self {
             animation,
-            ..default()
+            position_offset: Vec2::ZERO,
+            invert: false,
+            looping: false,
+            ignore_action_speed: false,
         }
     }
 }

client/characters/src/actions/attack_builder.rs

@@ -98,7 +98,7 @@ pub struct AttackBuilder {
     open_cancel: Option<CancelWindow>,
     air_move: bool,
     category: ActionCategory,
-    animation: Animation,
+    animation: Option<Animation>,
     audio: SoundEffect,
     extra_initial_events: Vec<ActionEvent>,
     dynamic_initial_events: OptionalDynamic,
@@ -255,7 +255,7 @@ impl AttackBuilder {
 
     pub fn with_animation(self, animation: impl Into<Animation>) -> Self {
         Self {
-            animation: animation.into(),
+            animation: Some(animation.into()),
             ..self
         }
     }
@@ -548,7 +548,8 @@ impl AttackBuilder {
         let startup = self.startup;
         let duration = self.startup + self.recovery;
 
-        let mut initial_events: Vec<ActionEvent> = vec![self.animation.into(), self.audio.into()];
+        let mut initial_events: Vec<ActionEvent> =
+            vec![self.animation.unwrap().into(), self.audio.into()];
         if !self.extra_initial_events.is_empty() {
             initial_events.extend(self.extra_initial_events.clone());
         }

client/characters/src/characters/character.rs

@@ -66,15 +66,13 @@ impl Character {
 mod test {
     use wag_core::SamuraiAction;
 
-    use crate::{
-        characters::samurai, dummy, ActionEvent, ActionRequirement, ActionTracker, Situation,
-    };
+    use crate::{characters::samurai, ActionEvent, ActionRequirement, ActionTracker, Situation};
 
     use super::*;
 
     #[test]
     fn all_moves_end() {
-        for char in [samurai(), dummy()] {
+        for char in [samurai()] {
             for (id, mov) in char.moves.iter() {
                 // There is a list of exceptions
                 if matches!(id, ActionId::Samurai(SamuraiAction::FootDiveHold)) {
@@ -103,7 +101,7 @@ mod test {
 
     #[test]
     fn moves_with_inputs_have_starter_requirement() {
-        for char in [samurai(), dummy()] {
+        for char in [samurai()] {
             for (id, mov) in char.moves.iter() {
                 dbg!(id);