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

This commit is contained in:
Vidal committed 2026-02-12 13:24:44 -03:00
commit 5b8e5ea338
14 files changed
+1317 -1131

No files matched your search

@@ -10,7 +10,8 @@ public enum AnchorPoint {
RIGHT_HAND("Right Hand"), // Right arm/hand position
LEFT_HAND("Left Hand"), // Left arm/hand position
ABOVE_HEAD("Above Head"), // Above the entity
CHEST("Chest"); // Chest level, centered
CHEST("Chest"), // Chest level, centered
EYE("Eye"); // Eye level, centered
private final String displayName;
@@ -55,6 +56,7 @@ public enum AnchorPoint {
case LEFT_HAND: return "ability.anchor.leftHand";
case ABOVE_HEAD: return "ability.anchor.aboveHead";
case CHEST: return "ability.anchor.chest";
case EYE: return "ability.anchor.eye";
default: return name();
}
}
@@ -56,6 +56,8 @@ public class AbilityCharge extends Ability implements IAbilityCharge {
this.showTelegraph = true;
this.windUpSound = "mob.zombie.wood";
this.activeSound = "mob.zombie.attack";
this.windUpAnimationName = "Ability_Charge_Windup";
this.activeAnimationName = "Ability_Active_Windup";
}
@Override
@@ -113,6 +113,8 @@ public class AbilityHazard extends Ability implements IAbilityHazard {
this.windUpTicks = 30;
this.telegraphType = TelegraphType.CIRCLE;
this.allowedBy = UserType.NPC_ONLY;
this.windUpAnimationName = "Ability_Hazard_Windup";
this.activeAnimationName = "Ability_Hazard_Active";
}
@Override
@@ -143,11 +143,11 @@ public class AbilityOrb extends Ability implements IAbilityOrb {
a.setMaxRange(75.0f);
a.setBurstEnabled(true);
a.setBurstAmount(15);
a.setBurstDelay(10);
a.setBurstDelay(5);
a.setBurstReplayAnimations(false);
a.setBurstOverlap(true);
a.setWindUpAnimationName("Ability_BeamDual_Windup");
a.setActiveAnimationName("Ability_BeamDual_Active");
a.setWindUpAnimationName("Ability_OrbBarrage_Windup");
a.setActiveAnimationName("Ability_OrbBarrage_Active");
})
);
}
@@ -37,6 +37,7 @@ public class AnchorPointHelper {
private static final float ARM_HEIGHT = 0.75f;
private static final float ABOVE_HEAD_HEIGHT = 1.2f;
private static final float CHEST_HEIGHT = 0.65f;
private static final float EYE_HEIGHT = 0.85f;
// Distance in front for FRONT anchor
private static final float DEFAULT_FRONT_DISTANCE = 1.0f;
@@ -98,6 +99,10 @@ public class AnchorPointHelper {
case CHEST:
y += height * CHEST_HEIGHT;
break;
case EYE:
y += entity.getEyeHeight();
break;
}
// Rotate offsets relative to entity's body yaw
@@ -347,6 +352,8 @@ public class AnchorPointHelper {
return ABOVE_HEAD_HEIGHT;
case CHEST:
return CHEST_HEIGHT;
case EYE:
return EYE_HEIGHT;
default:
return FRONT_HEIGHT;
}
@@ -69,7 +69,7 @@ public class Register<T> {
public void register() {
for (Map.Entry<String, Supplier<Ability>> entry : entries.entrySet()) {
AbilityController.Instance.registerType(entry.getValue().get().getTypeId(), entry.getValue());
AbilityController.Instance.registerAbility(entry.getKey(), entry.getValue().get());
}
}
@@ -0,0 +1,59 @@
{
"Loop": 0,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -6.0f,
"Part": "RIGHT_ARM",
"Rotation1": -50.0f,
"Rotation0": -75.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": -45.0f
},
{
"Pivot2": -6.0f,
"Part": "LEFT_ARM",
"Rotation1": 50.0f,
"Rotation0": -75.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": 45.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 28,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Charge_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,122 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.8f,
"FrameParts": [
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 0.0f,
"Rotation0": 69.0f,
"Pivot0": 0.0f,
"Pivot1": 5.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -8.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 18.0f
},
{
"Pivot2": -6.0f,
"Part": "RIGHT_LEG",
"Rotation1": 0.0f,
"Rotation0": 44.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -8.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -10.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 18.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -10.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 75.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 18
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -6.0f,
"Part": "RIGHT_ARM",
"Rotation1": -50.0f,
"Rotation0": -75.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": -45.0f
},
{
"Pivot2": -6.0f,
"Part": "LEFT_ARM",
"Rotation1": 50.0f,
"Rotation0": -75.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": 45.0f
},
{
"Pivot2": -6.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 2
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 27,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Charge_Windup",
"WhileStanding": 1b
}
@@ -0,0 +1,266 @@
{
"Loop": 3,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 1.0f,
"FrameParts": [
{
"Pivot2": -12.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 82.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 25.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": -12.0f
},
{
"Pivot2": -10.0f,
"Part": "LEFT_ARM",
"Rotation1": 6.0f,
"Rotation0": 0.0f,
"Pivot0": -1.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -11.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 101.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -25.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 12.0f
},
{
"Pivot2": -10.0f,
"Part": "RIGHT_ARM",
"Rotation1": -6.0f,
"Rotation0": 0.0f,
"Pivot0": 1.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 10
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 3
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 6
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": 1.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -6.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 1.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 3.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -37.0f,
"Pivot0": -2.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 3.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -37.0f,
"Pivot0": 2.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 5
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 24,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Hazard_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,392 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 2.0f,
"FrameParts": [
{
"Pivot2": -3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 12.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 12.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -6.0f
},
{
"Pivot2": -3.0f,
"Part": "LEFT_ARM",
"Rotation1": 37.0f,
"Rotation0": -37.0f,
"Pivot0": -1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 31.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -12.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 6.0f
},
{
"Pivot2": -3.0f,
"Part": "RIGHT_ARM",
"Rotation1": -37.0f,
"Rotation0": -37.0f,
"Pivot0": 1.0f,
"Pivot1": 0.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 6
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.25f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 6
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.5f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 6
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.75f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 6
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 1.0f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 4.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -132.0f,
"Pivot0": -2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -18.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 12.0f
},
{
"Pivot2": 4.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -132.0f,
"Pivot0": 2.0f,
"Pivot1": 3.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 3
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -12.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 82.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 25.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": -12.0f
},
{
"Pivot2": -10.0f,
"Part": "LEFT_ARM",
"Rotation1": 6.0f,
"Rotation0": 0.0f,
"Pivot0": -1.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -11.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 101.0f,
"Pivot0": 0.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -25.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 12.0f
},
{
"Pivot2": -10.0f,
"Part": "RIGHT_ARM",
"Rotation1": -6.0f,
"Rotation0": 0.0f,
"Pivot0": 1.0f,
"Pivot1": 12.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 3
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 5,
"Smooth": 0b,
"ID": 23,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_Hazard_Windup",
"WhileStanding": 1b
}
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,203 @@
{
"Loop": 1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -7.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_ARM",
"Rotation1": -25.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": -25.0f
}
],
"Smooth": 0b,
"Duration": 2
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -7.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": -1.0f,
"Part": "RIGHT_ARM",
"Rotation1": 25.0f,
"Rotation0": -90.0f,
"Pivot0": 1.0f,
"Pivot1": 1.0f,
"Rotation2": 25.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -7.0f,
"Part": "LEFT_ARM",
"Rotation1": 0.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
}
],
"Smooth": 0b,
"Duration": 5
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -7.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_ARM",
"Rotation1": -25.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": -25.0f
}
],
"Smooth": 0b,
"Duration": 5
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 0,
"Smooth": 0b,
"ID": 26,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_OrbBarrage_Active",
"WhileStanding": 1b
}
@@ -0,0 +1,201 @@
{
"Loop": -1,
"Speed": 1.0f,
"Frames": [
{
"ColorMarker": 16777215,
"Comment": "",
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": 3.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -126.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 3.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -126.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 12.0f
}
],
"Duration": 8
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 0.25f,
"FrameParts": [
{
"Pivot2": 3.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": -25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": 3.0f,
"Part": "RIGHT_ARM",
"Rotation1": 56.0f,
"Rotation0": -126.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": -12.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": 3.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": -18.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 3.0f,
"Part": "LEFT_ARM",
"Rotation1": -56.0f,
"Rotation0": -126.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 12.0f
}
],
"Smooth": 0b,
"Duration": 19
},
{
"ColorMarker": 16777215,
"Comment": "",
"Speed": 3.0f,
"FrameParts": [
{
"Pivot2": -7.0f,
"Part": "HEAD",
"Rotation1": 0.0f,
"Rotation0": 0.0f,
"Pivot0": 0.0f,
"Pivot1": 2.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "RIGHT_LEG",
"Rotation1": -31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": 18.0f
},
{
"Pivot2": -7.0f,
"Part": "RIGHT_ARM",
"Rotation1": 0.0f,
"Rotation0": -90.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": 0.0f,
"Part": "LEFT_LEG",
"Rotation1": 31.0f,
"Rotation0": 6.0f,
"Pivot0": 0.0f,
"Pivot1": 0.0f,
"Rotation2": -18.0f
},
{
"Pivot2": -6.0f,
"Part": "BODY",
"Rotation1": 0.0f,
"Rotation0": 25.0f,
"Pivot0": 0.0f,
"Pivot1": 1.0f,
"Rotation2": 0.0f
},
{
"Pivot2": -1.0f,
"Part": "LEFT_ARM",
"Rotation1": -25.0f,
"Rotation0": -90.0f,
"Pivot0": -1.0f,
"Pivot1": 1.0f,
"Rotation2": -25.0f
}
],
"Smooth": 0b,
"Duration": 3
}
],
"CurrentFrameTime": 0,
"CurrentFrame": 2,
"Smooth": 0b,
"ID": 25,
"WhileAttacking": 1b,
"WhileWalking": 1b,
"Name": "Ability_OrbBarrage_Windup",
"WhileStanding": 1b
}
@@ -1549,6 +1549,7 @@ ability.anchor.rightHand=Right Hand
ability.anchor.leftHand=Left Hand
ability.anchor.aboveHead=Above Head
ability.anchor.chest=Chest
ability.anchor.eye=Eye
# Sweep Mode
ability.sweep.swipe=Swipe