Add more action meta, fix animate meta

DenizenScript · Oct 23, 2013 · 0567a46 · 0567a46
1 parent 0041651
commit 0567a46
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -194,6 +194,21 @@ public void onDeath(EntityDeathEvent event) {
         event.getDrops().clear();
     }
 
+    // <--[action]
+    // @Actions
+    // death
+    // death by entity
+    // death by <entity>
+    // death by block
+    // death by <cause>
+    //
+    // @Triggers when the NPC dies.
+    //
+    // @Context
+    // <context.killer> returns the entity that killed the NPC (if any)
+    // <context.shooter> returns the shooter of the killing projectile (if any)
+    //
+    // -->
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onDamage(EntityDamageEvent event) {
         // Don't use NPCDamageEvent because it doesn't work well

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
@@ -184,7 +184,7 @@ public void registerCoreMembers() {
         // <--[command]
         // @Name Animate
         // @Usage animate [<entity>|...] [animation:<name>]
-        // @Required 1
+        // @Required 2
         // @Stable stable
         // @Short Makes a list of entities perform a certain animation.
         // @Author David Cernat
@@ -194,7 +194,7 @@ public void registerCoreMembers() {
         // specify an entity and an animation.
 
         // Player animations require a Player-type entity or NPC. Available player animations include:
-        // ARM_SWING, CRIT, HURT, and MAGIC_CRIT
+        // ARM_SWING, CRIT, HURT, and MAGIC_CRIT, SIT, SLEEP, SNEAK, STOP_SITTING, STOP_SLEEPING, STOP_SNEAKING
 
         // All entities, regardless of type, can utilize the 'hurt' animation. Additionally, wolf entities
         // and NPCs can also use: WOLF_SMOKE, WOLF_HEARTS, and WOLF_SHAKE. Sheep entities and NPCs also have
@@ -213,7 +213,7 @@ public void registerCoreMembers() {
 
         // -->
         registerCoreMember(AnimateCommand.class,
-                "ANIMATE", "animate [<entity>|...] [animation:<name>]", 1);
+                "ANIMATE", "animate [<entity>|...] [animation:<name>]", 2);
 
 
         // <--[command]