From 920f3912de8f49ad47da466044726d5dc5e31973 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Tue, 6 Aug 2024 13:27:44 -0400
Subject: [PATCH] attack animation sounds

---
 assets/Audio/weapons/swoosh-03.ogg            | Bin 0 -> 15355 bytes
 assets/Data/creatures/human.json              | 103 +++++++----
 docs/src/progress/currenttarget.md            |   9 +
 docs/src/progress/renderertodo.md             |   1 +
 .../java/electrosphere/engine/Globals.java    |   3 +-
 .../entity/btree/StateTransitionUtil.java     |   3 +-
 .../entity/state/attack/ClientAttackTree.java | 134 +++++++++-----
 .../entity/state/attack/ServerAttackTree.java | 172 ++++++++++++------
 .../creature/type/CreatureDataValidator.java  |  15 +-
 .../data/creature/type/attack/AttackMove.java |  41 +++--
 10 files changed, 319 insertions(+), 162 deletions(-)
 create mode 100644 assets/Audio/weapons/swoosh-03.ogg

diff --git a/assets/Audio/weapons/swoosh-03.ogg b/assets/Audio/weapons/swoosh-03.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..f4f0d70f183113f53b8a670fdfddffb3d3a28a2d
GIT binary patch
literal 15355
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

literal 0
HcmV?d00001

diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json
index 9ef5beee..84d8e6ae 100644
--- a/assets/Data/creatures/human.json
+++ b/assets/Data/creatures/human.json
@@ -375,20 +375,26 @@
                     "driftFrameStart" : 7,
                     "driftFrameEnd" : 15,
                     "initialMove" : true,
-                    "animationWindup" : {
-                        "nameFirstPerson" : "Sword1HSlash1",
-                        "nameThirdPerson" : "Sword1HSlash1",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "windupState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Sword1HSlash1",
+                            "nameThirdPerson" : "Sword1HSlash1",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationHold" : {
-                        "nameFirstPerson" : "Sword1HSlash1",
-                        "nameThirdPerson" : "Sword1HSlash1",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "holdState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Sword1HSlash1",
+                            "nameThirdPerson" : "Sword1HSlash1",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationAttack" : {
-                        "nameFirstPerson" : "Sword1HSlash1",
-                        "nameThirdPerson" : "Sword1HSlash1",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "attackState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Sword1HSlash1",
+                            "nameThirdPerson" : "Sword1HSlash1",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     }
                 },
                 {
@@ -405,20 +411,26 @@
                     "driftFrameStart" : 1,
                     "driftFrameEnd" : 10,
                     "initialMove" : false,
-                    "animationWindup" : {
-                        "nameFirstPerson" : "Jump",
-                        "nameThirdPerson" : "Jump",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "windupState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Jump",
+                            "nameThirdPerson" : "Jump",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationHold" : {
-                        "nameFirstPerson" : "Jump",
-                        "nameThirdPerson" : "Jump",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "holdState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Jump",
+                            "nameThirdPerson" : "Jump",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationAttack" : {
-                        "nameFirstPerson" : "Sword1HSlash2",
-                        "nameThirdPerson" : "Sword1HSlash2",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "attackState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Sword1HSlash2",
+                            "nameThirdPerson" : "Sword1HSlash2",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     }
                 },
                 {
@@ -434,10 +446,15 @@
                     "driftFrameStart" : 1,
                     "driftFrameEnd" : 10,
                     "initialMove" : true,
-                    "animationAttack" : {
-                        "nameFirstPerson" : "SwordR2HSlash",
-                        "nameThirdPerson" : "SwordR2HSlash",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "attackState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "SwordR2HSlash",
+                            "nameThirdPerson" : "SwordR2HSlash",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        },
+                        "audioData" : {
+                            "audioPath" : "Audio/weapons/swoosh-03.ogg"
+                        }
                     }
                 },
                 {
@@ -453,20 +470,26 @@
                     "movementEnd" : 0,
                     "movementGoal" : 0,
                     "initialMove" : true,
-                    "animationWindup" : {
-                        "nameFirstPerson" : "Jump",
-                        "nameThirdPerson" : "HoldBowString",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "windupState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Jump",
+                            "nameThirdPerson" : "HoldBowString",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationHold" : {
-                        "nameFirstPerson" : "Jump",
-                        "nameThirdPerson" : "HoldBow",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "holdState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Jump",
+                            "nameThirdPerson" : "HoldBow",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     },
-                    "animationAttack" : {
-                        "nameFirstPerson" : "Jump",
-                        "nameThirdPerson" : "HoldBowString",
-                        "priorityCategory"  : "MOVEMENT_MODIFIER"
+                    "attackState" : {
+                        "animation" : {
+                            "nameFirstPerson" : "Sword1HSlash2",
+                            "nameThirdPerson" : "HoldBowString",
+                            "priorityCategory"  : "MOVEMENT_MODIFIER"
+                        }
                     }
                 }
             ],
diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md
index ee8a39c7..bd8675a2 100644
--- a/docs/src/progress/currenttarget.md
+++ b/docs/src/progress/currenttarget.md
@@ -16,3 +16,12 @@ Things that feel bad:
   No audio
   Short movement bursts feel jittery
     Part of this may be cylinder collidable instead of capsule
+
+
+Sound effect on hit
+Sound effect on walk
+Sound effect on jump
+Sound effect on land
+Sound effect on block
+Allow block hotboxes to block damage
+Server packet on damage collision
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index bd3f962f..37d48061 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -508,6 +508,7 @@ Audio on block state transitions
 
 (08/04/2024)
 Strafe/backpedal movement speed multipliers
+Properly equipping/unequipping 2hand items
 
 # TODO
 
diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java
index 6bde6a20..177de5d3 100644
--- a/src/main/java/electrosphere/engine/Globals.java
+++ b/src/main/java/electrosphere/engine/Globals.java
@@ -135,7 +135,7 @@ public class Globals {
     public static boolean RUN_DEMO = false;
     public static boolean RUN_CLIENT = true;
     public static boolean RUN_HIDDEN = false; //glfw session will be created with hidden window
-    public static boolean RUN_AUDIO = false;
+    public static boolean RUN_AUDIO = true;
     public static int clientCharacterID;
     
     //
@@ -469,6 +469,7 @@ public class Globals {
             "/Audio/closeMenu.ogg",
             "/Audio/ambienceWind1SeamlessMono.ogg",
             "/Audio/weapons/swordUnsheath1.ogg",
+            "/Audio/weapons/swoosh-03.ogg",
         };
         LoggerInterface.loggerStartup.INFO("Loading default audio resources");
         for(String path : audioToInit){
diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
index e5e6ae6c..f5d9931f 100644
--- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
+++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
@@ -6,7 +6,6 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.state.AnimationPriorities;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.game.data.common.TreeDataAnimation;
 import electrosphere.game.data.common.TreeDataAudio;
@@ -181,7 +180,7 @@ public class StateTransitionUtil {
                 if(state.onComplete != null){
                     state.onComplete.run();
                 }
-            } else if(!poseActor.isPlayingAnimation() && state.onComplete != null && state.startedAnimation == true){
+            } else if(!poseActor.isPlayingAnimation(animation) && state.onComplete != null && state.startedAnimation == true){
                 //state transition if this isn't set to loop
                 state.onComplete.run();
                 state.startedAnimation = false;
diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
index 8a56056a..094b82e4 100644
--- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
+++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java
@@ -8,7 +8,8 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
-import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
+import electrosphere.entity.btree.StateTransitionUtil;
+import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
@@ -17,12 +18,12 @@ import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
+import electrosphere.game.data.common.TreeDataState;
 import electrosphere.game.data.creature.type.attack.AttackMove;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizableEnum;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
-import electrosphere.renderer.actor.Actor;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -93,11 +94,96 @@ public class ClientAttackTree implements BehaviorTree {
     boolean firesProjectile = false;
     String projectileToFire = null;
     String attackingPoint = null;
+
+    //The state transition util
+    StateTransitionUtil stateTransitionUtil;
     
     private ClientAttackTree(Entity e, Object ... params){
         setState(AttackTreeState.IDLE);
         setDriftState(AttackTreeDriftState.NO_DRIFT);
         parent = e;
+        this.stateTransitionUtil = StateTransitionUtil.create(parent, false, new StateTransitionUtilItem[]{
+            StateTransitionUtilItem.create(
+                AttackTreeState.WINDUP,
+                () -> {
+                    TreeDataState state = currentMove.getWindupState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getWindupState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                null
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.HOLD,
+                () -> {
+                    TreeDataState state = currentMove.getHoldState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getHoldState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                null
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.ATTACK,
+                () -> {
+                    TreeDataState state = currentMove.getAttackState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getAttackState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                null
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.COOLDOWN,
+                () -> {
+                    TreeDataState state = currentMove.getCooldownState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getCooldownState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                null
+            ),
+        });
     }
     
     /**
@@ -148,7 +234,6 @@ public class ClientAttackTree implements BehaviorTree {
     @Override
     public void simulate(float deltaTime){
         frameCurrent = frameCurrent + (float)Globals.timekeeper.getDeltaFrames();
-        Actor entityActor = EntityUtils.getActor(parent);
         Vector3d movementVector = CreatureUtils.getFacingVector(parent);
 
         //
@@ -237,49 +322,13 @@ public class ClientAttackTree implements BehaviorTree {
                 if(parent.containsKey(EntityDataStrings.CLIENT_ROTATOR_TREE)){
                     RotatorTree.getClientRotatorTree(parent).setActive(true);
                 }
-                if(currentMove != null && entityActor != null && currentMove.getAnimationWindup() != null){
-                    if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(currentMove.getAnimationWindup())){
-                        entityActor.playAnimation(
-                            currentMove.getAnimationWindup(),
-                            true
-                        );
-                        entityActor.incrementAnimationTime(0.0001);
-                    }
-                    FirstPersonTree.conditionallyPlayAnimation(
-                        parent,
-                        currentMove.getAnimationWindup()
-                    );
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.WINDUP);
             } break;
             case HOLD: {
-                if(entityActor != null && currentMove.getAnimationHold() != null){
-                    if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(currentMove.getAnimationHold())){
-                        entityActor.playAnimation(
-                            currentMove.getAnimationHold(),
-                            true
-                        );
-                        entityActor.incrementAnimationTime(0.0001);
-                    }
-                    FirstPersonTree.conditionallyPlayAnimation(
-                        parent,
-                        currentMove.getAnimationHold()
-                    );
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.HOLD);
             } break;
             case ATTACK: {
-                if(entityActor != null && currentMove != null){
-                    if(!entityActor.isPlayingAnimation() || !entityActor.isPlayingAnimation(currentMove.getAnimationAttack())){
-                        entityActor.playAnimation(
-                            currentMove.getAnimationAttack(),
-                            true
-                        );
-                        entityActor.incrementAnimationTime(0.0001);
-                    }
-                    FirstPersonTree.conditionallyPlayAnimation(
-                        parent,
-                        currentMove.getAnimationAttack()
-                    );
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.ATTACK);
                 //activate hitboxes
                 List<Entity> attachedEntities = AttachUtils.getChildrenList(parent);
                 if(attachedEntities != null){
@@ -292,6 +341,7 @@ public class ClientAttackTree implements BehaviorTree {
                 }
             } break;
             case COOLDOWN: {
+                this.stateTransitionUtil.simulate(AttackTreeState.COOLDOWN);
                 //deactive hitboxes
                 List<Entity> attachedEntities = AttachUtils.getChildrenList(parent);
                 if(attachedEntities != null){
diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
index 8fbeb784..73a578b7 100644
--- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
+++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java
@@ -12,7 +12,8 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
-import electrosphere.entity.state.AnimationPriorities;
+import electrosphere.entity.btree.StateTransitionUtil;
+import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeDriftState;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
 import electrosphere.entity.state.collidable.Impulse;
@@ -25,14 +26,15 @@ import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.projectile.ProjectileUtils;
+import electrosphere.game.data.common.TreeDataState;
 import electrosphere.game.data.creature.type.attack.AttackMove;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
+import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.net.synchronization.annotation.SyncedField;
 import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.server.datacell.Realm;
-import electrosphere.server.poseactor.PoseActor;
 import electrosphere.util.math.MathUtils;
 
 import java.util.List;
@@ -79,11 +81,92 @@ public class ServerAttackTree implements BehaviorTree {
     boolean firesProjectile = false;
     String projectileToFire = null;
     String attackingPoint = null;
+
+    //The state transition util
+    StateTransitionUtil stateTransitionUtil;
     
     private ServerAttackTree(Entity e, Object ... params){
         state = AttackTreeState.IDLE;
         driftState = AttackTreeDriftState.NO_DRIFT;
         parent = e;
+        this.stateTransitionUtil = StateTransitionUtil.create(parent, true, new StateTransitionUtilItem[]{
+            StateTransitionUtilItem.create(
+                AttackTreeState.WINDUP,
+                () -> {
+                    TreeDataState state = currentMove.getWindupState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getWindupState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                () -> {
+                    if(currentMoveCanHold && stillHold){
+                        setState(AttackTreeState.HOLD);
+                    } else {
+                        setState(AttackTreeState.ATTACK);
+                    }
+                    this.stateTransitionUtil.interrupt(AttackTreeState.WINDUP);
+                }
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.HOLD,
+                () -> {
+                    TreeDataState state = currentMove.getHoldState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                () -> {
+                    TreeDataState state = currentMove.getHoldState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAudioData();
+                    }
+                },
+                null
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.ATTACK,
+                () -> {
+                    TreeDataState state = currentMove.getAttackState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                null,
+                () -> {
+                    this.setState(AttackTreeState.COOLDOWN);
+                    this.stateTransitionUtil.interrupt(AttackTreeState.ATTACK);
+                }
+            ),
+            StateTransitionUtilItem.create(
+                AttackTreeState.COOLDOWN,
+                () -> {
+                    TreeDataState state = currentMove.getCooldownState();
+                    if(state == null){
+                        return null;
+                    } else {
+                        return state.getAnimation();
+                    }
+                },
+                null,
+                null
+            ),
+        });
     }
     
     /**
@@ -122,14 +205,19 @@ public class ServerAttackTree implements BehaviorTree {
                         projectileToFire = ItemUtils.getWeaponDataRaw(currentWeapon).getProjectileModel();
                     }
 
-                    animationName = currentMove.getAnimationAttack().getNameThirdPerson();
-                    //intuit windup from presence of windup anim
-                    currentMoveHasWindup = currentMove.getAnimationWindup() != null;
-                    if(currentMoveHasWindup){
-                        animationName = currentMove.getAnimationWindup().getNameThirdPerson();
+                    //set initial stuff (this alerts the client as well)
+                    setCurrentMoveId(currentMove.getAttackMoveId());
+
+                    //start tree
+                    if(currentMove.getWindupState() != null){
+                        setState(AttackTreeState.WINDUP);
+                    } else if(currentMove.getAttackState() != null){
+                        setState(AttackTreeState.ATTACK);
+                    } else {
+                        LoggerInterface.loggerEngine.ERROR(new IllegalStateException("Trying to start attacking tree, but current move does not have windup or attack states defined!"));
                     }
                     //intuit can hold from presence of windup anim
-                    currentMoveCanHold = currentMove.getAnimationHold() != null;
+                    currentMoveCanHold = currentMove.getHoldState() != null;
                     //stop movement tree
                     if(parent.containsKey(EntityDataStrings.SERVER_MOVEMENT_BT)){
                         BehaviorTree movementTree = CreatureUtils.serverGetEntityMovementTree(parent);
@@ -139,9 +227,6 @@ public class ServerAttackTree implements BehaviorTree {
                     }
                     Vector3d movementVector = CreatureUtils.getFacingVector(parent);
                     EntityUtils.getRotation(parent).rotationTo(MathUtils.getOriginVector(), new Vector3d(movementVector.x,movementVector.y,movementVector.z));
-                    //set initial stuff (this alerts the client as well)
-                    setCurrentMoveId(currentMove.getAttackMoveId());
-                    setState(AttackTreeState.WINDUP);
                     frameCurrent = 0;
                 } else {
                     setState(AttackTreeState.IDLE);
@@ -166,7 +251,6 @@ public class ServerAttackTree implements BehaviorTree {
     public void simulate(float deltaTime){
         frameCurrent = frameCurrent + (float)Globals.timekeeper.getDeltaFrames();
         float velocity = CreatureUtils.getVelocity(parent);
-        PoseActor entityPoseActor = EntityUtils.getPoseActor(parent);
         Vector3d position = EntityUtils.getPosition(parent);
         Vector3d movementVector = CreatureUtils.getFacingVector(parent);
         
@@ -216,58 +300,31 @@ public class ServerAttackTree implements BehaviorTree {
                 if(parent.containsKey(EntityDataStrings.SERVER_ROTATOR_TREE)){
                     ServerRotatorTree.getServerRotatorTree(parent).setActive(true);
                 }
-                if(entityPoseActor != null){
-                    if(!entityPoseActor.isPlayingAnimation() || !entityPoseActor.isPlayingAnimation(animationName)){
-                        entityPoseActor.playAnimation(
-                            animationName,
-                            AnimationPriorities.getValue(AnimationPriorities.MOVEMENT_MODIFIER)
-                        );
-                        entityPoseActor.incrementAnimationTime(0.0001);
-                    }
-                }
-                if(frameCurrent > currentMove.getWindupFrames()){
-                    if(currentMoveCanHold && stillHold){
-                        setState(AttackTreeState.HOLD);
-                    } else {
-                        setState(AttackTreeState.ATTACK);
-                    }
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.WINDUP);
                 Globals.server.broadcastMessage(
-                        EntityMessage.constructattackUpdateMessage(
-                                parent.getId(),
-                                System.currentTimeMillis(),
-                                (float)position.x,
-                                (float)position.y,
-                                (float)position.z,
-                                movementVector.x,
-                                movementVector.y,
-                                movementVector.z,
-                                velocity,
-                                0
-                        )
+                    EntityMessage.constructattackUpdateMessage(
+                        parent.getId(),
+                        System.currentTimeMillis(),
+                        (float)position.x,
+                        (float)position.y,
+                        (float)position.z,
+                        movementVector.x,
+                        movementVector.y,
+                        movementVector.z,
+                        velocity,
+                        0
+                    )
                 );
             } break;
             case HOLD: {
-                if(entityPoseActor != null){
-                    if(!entityPoseActor.isPlayingAnimation() || !entityPoseActor.isPlayingAnimation(animationName)){
-                        entityPoseActor.playAnimation(
-                            animationName,
-                            AnimationPriorities.getValue(AnimationPriorities.MOVEMENT_MODIFIER)
-                        );
-                        entityPoseActor.incrementAnimationTime(0.0001);
-                    }
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.HOLD);
                 if(!stillHold){
                     setState(AttackTreeState.ATTACK);
+                    this.stateTransitionUtil.interrupt(AttackTreeState.HOLD);
                 }
             } break;
             case ATTACK: {
-                if(entityPoseActor != null && currentMove != null){
-                    if(!entityPoseActor.isPlayingAnimation() || !entityPoseActor.isPlayingAnimation(currentMove.getAnimationAttack())){
-                        entityPoseActor.playAnimation(currentMove.getAnimationAttack());
-                        entityPoseActor.incrementAnimationTime(0.0001);
-                    }
-                }
+                this.stateTransitionUtil.simulate(AttackTreeState.ATTACK);
                 //activate hitboxes
                 List<Entity> attachedEntities = AttachUtils.getChildrenList(parent);
                 for(Entity currentAttached : attachedEntities){
@@ -310,9 +367,6 @@ public class ServerAttackTree implements BehaviorTree {
                     ProjectileUtils.serverSpawnBasicProjectile(parentRealm, projectileToFire, spawnPosition, arrowRotation, 750, initialVector, 0.03f);
                     projectileToFire = null;
                 }
-                if(frameCurrent > currentMove.getWindupFrames() + currentMove.getAttackFrames()){
-                    setState(AttackTreeState.COOLDOWN);
-                }
                 Globals.server.broadcastMessage(
                         EntityMessage.constructattackUpdateMessage(
                                 parent.getId(),
@@ -329,6 +383,7 @@ public class ServerAttackTree implements BehaviorTree {
                 );
             } break;
             case COOLDOWN: {
+                this.stateTransitionUtil.simulate(AttackTreeState.COOLDOWN);
                 //deactive hitboxes
                 List<Entity> attachedEntities = AttachUtils.getChildrenList(parent);
                 for(Entity currentAttached : attachedEntities){
@@ -339,6 +394,7 @@ public class ServerAttackTree implements BehaviorTree {
                 }
                 if(frameCurrent > currentMove.getWindupFrames() + currentMove.getAttackFrames() + currentMove.getCooldownFrames()){
                     setState(AttackTreeState.IDLE);
+                    this.stateTransitionUtil.interrupt(AttackTreeState.COOLDOWN);
                     frameCurrent = 0;
                     if(parent.containsKey(EntityDataStrings.SERVER_ROTATOR_TREE)){
                         ServerRotatorTree.getServerRotatorTree(parent).setActive(false);
diff --git a/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java b/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java
index 9b4c5ffe..ed26f9f6 100644
--- a/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java
+++ b/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java
@@ -84,9 +84,18 @@ public class CreatureDataValidator {
         List<TreeDataAnimation> animations = new LinkedList<TreeDataAnimation>();
         if(data.getAttackMoves() != null){
             for(AttackMove move : data.getAttackMoves()){
-                animations.add(move.getAnimationAttack());
-                animations.add(move.getAnimationHold());
-                animations.add(move.getAnimationWindup());
+                if(move.getWindupState() != null){
+                    animations.add(move.getWindupState().getAnimation());
+                }
+                if(move.getHoldState() != null){
+                    animations.add(move.getHoldState().getAnimation());
+                }
+                if(move.getAttackState() != null){
+                    animations.add(move.getAttackState().getAnimation());
+                }
+                if(move.getCooldownState() != null){
+                    animations.add(move.getCooldownState().getAnimation());
+                }
             }
         }
         if(data.getEquipPoints() != null){
diff --git a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java b/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java
index 1c461bd8..c12f3349 100644
--- a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java
+++ b/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java
@@ -1,6 +1,6 @@
 package electrosphere.game.data.creature.type.attack;
 
-import electrosphere.game.data.common.TreeDataAnimation;
+import electrosphere.game.data.common.TreeDataState;
 
 /**
  * Data about a single attack move this creature is capable of
@@ -16,9 +16,10 @@ public class AttackMove {
     /*
     Animation stuff
     */
-    TreeDataAnimation animationWindup;
-    TreeDataAnimation animationHold;
-    TreeDataAnimation animationAttack;
+    TreeDataState windupState;
+    TreeDataState holdState;
+    TreeDataState attackState;
+    TreeDataState cooldownState;
 
     /*
     Damage stuff
@@ -61,27 +62,35 @@ public class AttackMove {
     }
 
     /**
-     * Gets the animation to play for the windup
-     * @return the animation
+     * Gets the state to play for the windup
+     * @return the state data
      */
-    public TreeDataAnimation getAnimationWindup() {
-        return animationWindup;
+    public TreeDataState getWindupState() {
+        return windupState;
     }
 
     /**
-     * Gets the name of the animation to play for the hold
-     * @return the animation
+     * Gets the state to play for the hold
+     * @return the state data
      */
-    public TreeDataAnimation getAnimationHold() {
-        return animationHold;
+    public TreeDataState getHoldState() {
+        return holdState;
     }
 
     /**
-     * Gets the animation to play for the attack
-     * @return the animation
+     * Gets the state to play for the attack
+     * @return the state data
      */
-    public TreeDataAnimation getAnimationAttack() {
-        return animationAttack;
+    public TreeDataState getAttackState() {
+        return attackState;
+    }
+
+    /**
+     * Gets the state to play for the cooldown
+     * @return the state data
+     */
+    public TreeDataState getCooldownState() {
+        return cooldownState;
     }
 
     /**