Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vidal committed 2026-02-02 03:03:39 -03:00
commit f127a2fa7c
9 files changed
+2288 -7

No files matched your search

@@ -61,6 +61,8 @@ public class AbilityCutter extends Ability implements IAbilityCutter {
this.telegraphType = TelegraphType.CONE;
this.windUpSound = "random.bow";
this.activeSound = "random.break";
this.windUpAnimationName = "Ability_Cutter_Windup";
this.activeAnimationName = "Ability_Cutter_Active";
}
@Override
@@ -49,7 +49,7 @@ public class AbilityDiscDual extends Ability {
};
private EnergyLifespanData lifespanData = new EnergyLifespanData(35.0f, 200);
private EnergyAnchorData[] anchorData = new EnergyAnchorData[]{
new EnergyAnchorData(AnchorPoint.RIGHT_HAND), new EnergyAnchorData(AnchorPoint.LEFT_HAND)
new EnergyAnchorData(AnchorPoint.LEFT_HAND), new EnergyAnchorData(AnchorPoint.RIGHT_HAND)
};
// Transient state for disc entity (used during windup charging)
@@ -68,8 +68,8 @@ public class AbilityDiscDual extends Ability {
this.telegraphType = TelegraphType.CIRCLE;
this.showTelegraph = true;
// Default built-in animations
this.windUpAnimationName = "Ability_BeamDual_Windup";
this.activeAnimationName = "Ability_BeamDual_Active";
this.windUpAnimationName = "Ability_DiscDual_Windup";
this.activeAnimationName = "Ability_DiscDual_Active";
}
@Override
@@ -37,6 +37,8 @@ public class AbilityHeavyHit extends Ability implements IAbilityHeavyHit {
this.showTelegraph = false;
this.windUpSound = "random.anvil_use";
this.activeSound = "random.anvil_land";
this.windUpAnimationName = "Ability_HeavyHit_Windup";
this.activeAnimationName = "Ability_HeavyHit_Active";
}
@Override
@@ -75,14 +77,13 @@ public class AbilityHeavyHit extends Ability implements IAbilityHeavyHit {
if (wasHit) {
applyEffects(target);
}
// Heavy Hit is instant
signalCompletion();
}
@Override
public void onActiveTick(EntityLivingBase caster, EntityLivingBase target, World world, int tick) {
// Heavy Hit is instant, no active tick needed
// Just enough delay to see the active animation
if (tick == 10)
signalCompletion();
}
@Override
@@ -0,0 +1,86 @@
{
"Loop": 0,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": 2.0f,
"Part": "LEFT_ARM",
"Rotation1": 18.0f,
"Rotation0": 88.0f,
"Pivot0": -10.0f,
"Pivot1": 0.0f,
"Rotation2": 90.0f
},
{
"Pivot2": 0.0f,
"Part": "HEAD",
"Rotation1": 107.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "BODY",
"Rotation1": 107.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 6.0f,
"Rotation0": 82.0f,
"Pivot0": 3.0f,
"Pivot1": 3.0f,
"Rotation2": 88.0f
},
{
"Pivot2": 5.0f,
"Part": "RIGHT_LEG",
"Rotation1": 107.0f,
"Rotation0": 6.0f,
"Pivot0": -2.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "LEFT_LEG",
"Rotation1": 56.0f,
"Rotation0": 0.0f,
"Pivot0": -6.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 20
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 14,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Cutter_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,156 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"FrameParts": [
{
"Pivot2": 1.0f,
"Part": "LEFT_ARM",
"Rotation1": -31.0f,
"Rotation0": -94.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 90.0f
},
{
"Pivot2": -3.0f,
"Part": "HEAD",
"Rotation1": -31.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "BODY",
"Rotation1": -31.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": -75.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -5.0f,
"Part": "RIGHT_ARM",
"Rotation1": -50.0f,
"Rotation0": -145.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 88.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 18.0f,
"Rotation0": 12.0f,
"Pivot0": -3.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -25.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Duration": 20
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": 2.0f,
"Part": "LEFT_ARM",
"Rotation1": 18.0f,
"Rotation0": 88.0f,
"Pivot0": -10.0f,
"Pivot1": 0.0f,
"Rotation2": 90.0f
},
{
"Pivot2": 0.0f,
"Part": "HEAD",
"Rotation1": 107.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "BODY",
"Rotation1": 107.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 6.0f,
"Rotation0": 82.0f,
"Pivot0": 3.0f,
"Pivot1": 3.0f,
"Rotation2": 88.0f
},
{
"Pivot2": 5.0f,
"Part": "RIGHT_LEG",
"Rotation1": 107.0f,
"Rotation0": 6.0f,
"Pivot0": -2.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "LEFT_LEG",
"Rotation1": 56.0f,
"Rotation0": 0.0f,
"Pivot0": -6.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 13,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Cutter_Windup",
"WhileStanding": 1b
}
@@ -0,0 +1,392 @@
{
"Loop": 5,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": -5.0f,
"Part": "BODY",
"Rotation1": -37.0f,
"Rotation0": 37.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 56.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -37.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -25.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": 120.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 12.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 1.5f,
"FrameParts": [
{
"Pivot2": -5.0f,
"Part": "BODY",
"Rotation1": -37.0f,
"Rotation0": 37.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 56.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -37.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -25.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": 120.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 12.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 4
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": -5.0f,
"Part": "BODY",
"Rotation1": -37.0f,
"Rotation0": 37.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 56.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -37.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -25.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": 120.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 12.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 4
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": 2.0f,
"Part": "BODY",
"Rotation1": -25.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -145.0f,
"Pivot0": 2.0f,
"Pivot1": 0.0f,
"Rotation2": 75.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -25.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 2.0f,
"Part": "LEFT_ARM",
"Rotation1": 37.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -12.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 6.0f
},
{
"Pivot2": 2.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 1.0f,
"FrameParts": [
{
"Pivot2": 2.0f,
"Part": "BODY",
"Rotation1": -25.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -145.0f,
"Pivot0": 2.0f,
"Pivot1": 0.0f,
"Rotation2": 75.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -25.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 2.0f,
"Part": "LEFT_ARM",
"Rotation1": 37.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -12.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 6.0f
},
{
"Pivot2": 2.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 4
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": 2.0f,
"Part": "BODY",
"Rotation1": -25.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -145.0f,
"Pivot0": 2.0f,
"Pivot1": 0.0f,
"Rotation2": 75.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -25.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 2.0f,
"Part": "LEFT_ARM",
"Rotation1": 37.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -12.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 6.0f
},
{
"Pivot2": 2.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -12.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 4
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 18,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_DiscDual_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,293 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": -8.0f,
"Part": "BODY",
"Rotation1": 25.0f,
"Rotation0": 31.0f,
"Pivot0": -2.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -5.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 50.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "LEFT_LEG",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -31.0f
},
{
"Pivot2": -8.0f,
"Part": "LEFT_ARM",
"Rotation1": 31.0f,
"Rotation0": -56.0f,
"Pivot0": -2.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_LEG",
"Rotation1": 25.0f,
"Rotation0": 18.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": 360.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -8.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": -2.0f,
"Pivot1": 2.0f,
"Rotation2": -12.0f
}
],
"Smooth": 0b,
"Duration": 10
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.35f,
"FrameParts": [
{
"Pivot2": 0.0f,
"Part": "BODY",
"Rotation1": 50.0f,
"Rotation0": -6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 5.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 50.0f,
"Pivot0": 2.0f,
"Pivot1": 0.0f,
"Rotation2": 170.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 75.0f,
"Rotation0": -107.0f,
"Pivot0": -6.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -4.0f,
"Part": "LEFT_LEG",
"Rotation1": -6.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 50.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": -4.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": 360.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 46
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 1.0f,
"FrameParts": [
{
"Pivot2": 0.0f,
"Part": "BODY",
"Rotation1": 50.0f,
"Rotation0": -6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 5.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 50.0f,
"Pivot0": 2.0f,
"Pivot1": 0.0f,
"Rotation2": 170.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 75.0f,
"Rotation0": -107.0f,
"Pivot0": -6.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -4.0f,
"Part": "LEFT_LEG",
"Rotation1": -6.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 50.0f,
"Rotation0": 18.0f,
"Pivot0": -3.0f,
"Pivot1": -4.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "FULL_MODEL",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Smooth": 2b,
"Duration": 1
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": -5.0f,
"Part": "BODY",
"Rotation1": -37.0f,
"Rotation0": 37.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 56.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -37.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -25.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": 120.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 12.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 18.0f,
"Pivot0": 3.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 3
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 1,
"Smooth": 0b,
"ID": 17,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_DiscDual_Windup",
"WhileStanding": 1b
}
@@ -0,0 +1,77 @@
{
"Loop": 0,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": -5.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 90.0f
},
{
"Pivot2": 2.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 31.0f,
"Pivot0": 1.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": 0.0f,
"Part": "HEAD",
"Rotation1": -25.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -2.0f,
"Part": "RIGHT_LEG",
"Rotation1": 6.0f,
"Rotation0": 12.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "BODY",
"Rotation1": -25.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -63.0f,
"Rotation0": -31.0f,
"Pivot0": -2.0f,
"Pivot1": 1.0f,
"Rotation2": -6.0f
}
],
"Smooth": 0b,
"Duration": 20
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 19,
"Smooth": 0b,
"ID": 16,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_HeavyHit_Active",
"WhileStanding": 1b
}
File diff suppressed because it is too large. Load diff