mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 07:39:41 +00:00
Added animation to shockwave
This commit is contained in:
1 parent
c5822023a0
commit
4889c8b881
3 files changed
+285
-5
No files matched your search
@@ -40,8 +40,10 @@ public class AbilityShockwave extends Ability implements IAbilityShockwave {
|
||||
this.cooldownTicks = 0;
|
||||
this.windUpTicks = 25;
|
||||
this.telegraphType = TelegraphType.CIRCLE;
|
||||
this.windUpSound = "random.explode";
|
||||
this.windUpSound = "game.tnt.primed";
|
||||
this.activeSound = "random.explode";
|
||||
this.windUpAnimationName = "Ability_Shockwave_Windup";
|
||||
this.activeAnimationName = "Ability_Shockwave_Active";
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -105,14 +107,12 @@ public class AbilityShockwave extends Ability implements IAbilityShockwave {
|
||||
applyEffects(entity);
|
||||
}
|
||||
}
|
||||
|
||||
// Shockwave completes instantly
|
||||
signalCompletion();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onActiveTick(EntityLivingBase caster, EntityLivingBase target, World world, int tick) {
|
||||
// Shockwave is instant - nothing to do per-tick
|
||||
if (tick == 10)
|
||||
signalCompletion();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
{
|
||||
"Loop": 0,
|
||||
"Speed": 1.0f,
|
||||
"Frames": [
|
||||
{
|
||||
"ColorMarker": 16777215,
|
||||
"Comment": "",
|
||||
"Speed": 1.0f,
|
||||
"FrameParts": [
|
||||
{
|
||||
"Pivot2": -7.0f,
|
||||
"Part": "LEFT_ARM",
|
||||
"Rotation1": -12.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": -1.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": -63.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -9.0f,
|
||||
"Part": "HEAD",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 69.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -7.0f,
|
||||
"Part": "RIGHT_ARM",
|
||||
"Rotation1": 12.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": 1.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 63.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -4.0f,
|
||||
"Part": "RIGHT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 56.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 4.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -6.0f,
|
||||
"Part": "LEFT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 0.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 0.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -9.0f,
|
||||
"Part": "BODY",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 50.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 0.0f
|
||||
}
|
||||
],
|
||||
"Smooth": 0b,
|
||||
"Duration": 2
|
||||
}
|
||||
],
|
||||
"CurrentFrameTime": 0,
|
||||
"CurrentFrame": 0,
|
||||
"Smooth": 0b,
|
||||
"ID": 20,
|
||||
"WhileAttacking": 1b,
|
||||
"WhileWalking": 1b,
|
||||
"Name": "Ability_Shockwave_Active",
|
||||
"WhileStanding": 1b
|
||||
}
|
||||
@@ -0,0 +1,203 @@
|
||||
{
|
||||
"Loop": -1,
|
||||
"Speed": 1.0f,
|
||||
"Frames": [
|
||||
{
|
||||
"ColorMarker": 16777215,
|
||||
"Comment": "",
|
||||
"Speed": 2.0f,
|
||||
"FrameParts": [
|
||||
{
|
||||
"Pivot2": 4.0f,
|
||||
"Part": "LEFT_ARM",
|
||||
"Rotation1": -12.0f,
|
||||
"Rotation0": -183.0f,
|
||||
"Pivot0": -1.0f,
|
||||
"Pivot1": -2.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": "RIGHT_ARM",
|
||||
"Rotation1": 12.0f,
|
||||
"Rotation0": -183.0f,
|
||||
"Pivot0": 1.0f,
|
||||
"Pivot1": -2.0f,
|
||||
"Rotation2": 12.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -1.0f,
|
||||
"Part": "RIGHT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 0.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -2.0f,
|
||||
"Part": "LEFT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": -25.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": -5.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": 3.0f,
|
||||
"Part": "BODY",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": -18.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 1.0f,
|
||||
"Rotation2": 0.0f
|
||||
}
|
||||
],
|
||||
"Smooth": 0b,
|
||||
"Duration": 5
|
||||
},
|
||||
{
|
||||
"ColorMarker": 16777215,
|
||||
"Comment": "",
|
||||
"Speed": 0.5f,
|
||||
"FrameParts": [
|
||||
{
|
||||
"Pivot2": 4.0f,
|
||||
"Part": "LEFT_ARM",
|
||||
"Rotation1": -12.0f,
|
||||
"Rotation0": -183.0f,
|
||||
"Pivot0": -1.0f,
|
||||
"Pivot1": -2.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": "RIGHT_ARM",
|
||||
"Rotation1": 12.0f,
|
||||
"Rotation0": -183.0f,
|
||||
"Pivot0": 1.0f,
|
||||
"Pivot1": -2.0f,
|
||||
"Rotation2": 12.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -1.0f,
|
||||
"Part": "RIGHT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 0.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -2.0f,
|
||||
"Part": "LEFT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": -25.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": -5.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": 3.0f,
|
||||
"Part": "BODY",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": -18.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 1.0f,
|
||||
"Rotation2": 0.0f
|
||||
}
|
||||
],
|
||||
"Smooth": 0b,
|
||||
"Duration": 18
|
||||
},
|
||||
{
|
||||
"ColorMarker": 16777215,
|
||||
"Comment": "",
|
||||
"Speed": 3.0f,
|
||||
"FrameParts": [
|
||||
{
|
||||
"Pivot2": -7.0f,
|
||||
"Part": "LEFT_ARM",
|
||||
"Rotation1": -12.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": -1.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": -63.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -9.0f,
|
||||
"Part": "HEAD",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 69.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -7.0f,
|
||||
"Part": "RIGHT_ARM",
|
||||
"Rotation1": 12.0f,
|
||||
"Rotation0": 12.0f,
|
||||
"Pivot0": 1.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 63.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -4.0f,
|
||||
"Part": "RIGHT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 56.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 4.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -6.0f,
|
||||
"Part": "LEFT_LEG",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 0.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 0.0f,
|
||||
"Rotation2": 0.0f
|
||||
},
|
||||
{
|
||||
"Pivot2": -9.0f,
|
||||
"Part": "BODY",
|
||||
"Rotation1": 0.0f,
|
||||
"Rotation0": 50.0f,
|
||||
"Pivot0": 0.0f,
|
||||
"Pivot1": 7.0f,
|
||||
"Rotation2": 0.0f
|
||||
}
|
||||
],
|
||||
"Smooth": 0b,
|
||||
"Duration": 2
|
||||
}
|
||||
],
|
||||
"CurrentFrameTime": 0,
|
||||
"CurrentFrame": 1,
|
||||
"Smooth": 0b,
|
||||
"ID": 19,
|
||||
"WhileAttacking": 1b,
|
||||
"WhileWalking": 1b,
|
||||
"Name": "Ability_Shockwave_Windup",
|
||||
"WhileStanding": 1b
|
||||
}
|
||||
Reference in new issue
Block a user