Skip to content

Commit

Permalink
Add Qty argument to Playeffect command. Fun example usage: - playeffe…
Browse files Browse the repository at this point in the history 
…ct location:<npc.location> effect:heart radius:7 qty:100
  • Loading branch information
@davidcernat
davidcernat committed Jul 11, 2013
1 parent 054299d commit 71ff78f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
View file
Expand Up @@ -218,7 +218,7 @@ public void registerCoreMembers() {
"OXYGEN", "oxygen (type:maximum|remaining) (mode:set|add|remove) [qty:<#>]", 1);

registerCoreMember(PlayEffectCommand.class,
"PLAYEFFECT", "playeffect [location:<x,y,z,world>] [effect:<name>] (data:<#>) (radius:<#>)", 2);
"PLAYEFFECT", "playeffect [location:<x,y,z,world>] [effect:<name>] (data:<#>) (radius:<#>) (qty:<#>)", 2);

registerCoreMember(PlaySoundCommand.class,
"PLAYSOUND", "playsound [location:<x,y,z,world>] [sound:<name>] (volume:<#>) (pitch:<#>)", 2);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AnimateCommand.java
View file
Expand Up @@ -36,7 +36,8 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
scriptEntry.addObject("entities", ((dList) arg.asType(dList.class)).filter(dEntity.class));
}

if (!scriptEntry.hasObject("animation")) {
if (!scriptEntry.hasObject("animation") &&
!scriptEntry.hasObject("effect")) {

if (arg.matchesEnum(PlayerAnimation.values())) {
scriptEntry.addObject("animation", PlayerAnimation.valueOf(arg.getValue().toUpperCase()));
Expand Down
49 changes: 36 additions & 13 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java
View file
Expand Up @@ -13,8 +13,6 @@
import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
import net.aufdemrand.denizen.utilities.ParticleEffect;

/* playeffect [location:<x,y,z,world>] [effect:<name>] (data:<#>) (radius:<#>)*/

/**
* Lets you play a Bukkit effect or a ParticleEffect from the
* ParticleEffect Library at a certain location.
Expand All @@ -24,10 +22,12 @@
* [effect:<name>] sets the name of effect to be played
* (data:<#>) sets the special data value of the effect
* (radius:<#>) adjusts the radius within which players will observe the effect
* (qty:<#>) sets the number of times the effect will be played
*
* Example Usage:
* playeffect location:123,65,765,world effect:record_play data:2259 radius:7
* playeffect location:<npc.location> e:smoke r:3
* playeffect location:<npc.location> effect:heart radius:7 qty:60
*
* @author David Cernat
*/
Expand All @@ -46,14 +46,16 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
scriptEntry.addObject("location", arg.asType(dLocation.class));
}

if (!scriptEntry.hasObject("effect")) {
else if (!scriptEntry.hasObject("effect") &&
!scriptEntry.hasObject("particleeffect")) {

// Add effect
if (arg.matchesEnum(Effect.values())) {
scriptEntry.addObject("effect", Effect.valueOf(arg.getValue().toUpperCase()));
}
else if (arg.matchesEnum(ParticleEffect.values())) {
scriptEntry.addObject("specialeffect", ParticleEffect.valueOf(arg.getValue().toUpperCase()));
scriptEntry.addObject("particleeffect",
ParticleEffect.valueOf(arg.getValue().toUpperCase()));
}
}

Expand All @@ -70,17 +72,25 @@ else if (!scriptEntry.hasObject("data")
// Add value
scriptEntry.addObject("data", arg.asElement());
}

else if (!scriptEntry.hasObject("qty")
&& arg.matchesPrimitive(aH.PrimitiveType.Integer)
&& arg.matchesPrefix("qty, q")) {
// Add value
scriptEntry.addObject("qty", arg.asElement());
}
}

// Check to make sure required arguments have been filled

if ((!scriptEntry.hasObject("location")))
throw new InvalidArgumentsException(Messages.ERROR_MISSING_OTHER, "LOCATION");

if (!scriptEntry.hasObject("effect") && !scriptEntry.hasObject("specialeffect"))
if (!scriptEntry.hasObject("effect") &&
!scriptEntry.hasObject("particleeffect"))
throw new InvalidArgumentsException(Messages.ERROR_MISSING_OTHER, "EFFECT");

// Use a default radius and data if necessary
// Use default radius, data and qty if necessary

if ((!scriptEntry.hasObject("radius"))) {
scriptEntry.addObject("radius", new Element(5));
Expand All @@ -89,6 +99,10 @@ else if (!scriptEntry.hasObject("data")
if ((!scriptEntry.hasObject("data"))) {
scriptEntry.addObject("data", new Element(0));
}

if ((!scriptEntry.hasObject("qty"))) {
scriptEntry.addObject("qty", new Element(1));
}
}

@Override
Expand All @@ -97,28 +111,37 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
// Extract objects from ScriptEntry
dLocation location = (dLocation) scriptEntry.getObject("location");
Effect effect = (Effect) scriptEntry.getObject("effect");
ParticleEffect particleEffect = (ParticleEffect) scriptEntry.getObject("specialeffect");
ParticleEffect particleEffect = (ParticleEffect) scriptEntry.getObject("particleeffect");
Element radius = (Element) scriptEntry.getObject("radius");
Element data = (Element) scriptEntry.getObject("data");
Element qty = (Element) scriptEntry.getObject("qty");

// Slightly increase the location's Y so effects don't seem
// to come out of the ground
location.add(0, 1, 0);

// Report to dB
dB.report(getName(),
(effect != null ?
aH.debugObj("effect", effect.name()) :
aH.debugObj("special effect", particleEffect.name())) +
aH.debugObj("location", location.toString() +
aH.debugObj("location", location.toString()) +
aH.debugObj("radius", radius) +
aH.debugObj("data", data)));
aH.debugObj("data", data) +
aH.debugObj("qty", qty));

// Play the Bukkit effect
// Play the Bukkit effect the number of times specified
if (effect != null) {
location.getWorld().playEffect(location, effect, data.asInt(), radius.asInt());

for (int n = 0; n < qty.asInt(); n++) {
location.getWorld().playEffect(location, effect, data.asInt(), radius.asInt());
}
}
// Play one of the special effects
// Play a ParticleEffect
else {
ParticleEffect.fromName(particleEffect.name())
.play(location, radius.asDouble(),
1.0F, 1.0F, 1.0F, 1.0F, 3);
0.5F, 0.5F, 0.5F, 1.0F, qty.asInt());
}
}
}

0 comments on commit 71ff78f

Please sign in to comment.