From 38dde8cb03f61cc08a8f34861d148d880dc061da Mon Sep 17 00:00:00 2001
From: Alex <KLS@peqtgc.com>
Date: Sat, 8 Jun 2013 19:04:24 -0700
Subject: [PATCH] Updated Lua Parser (markdown)

---
 Lua-Parser.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Lua-Parser.md b/Lua-Parser.md
index 6acfb93..76a9402 100644
--- a/Lua-Parser.md
+++ b/Lua-Parser.md
@@ -151,8 +151,18 @@ Note: Encounter scripts cannot properly catch EVENT_COMMAND or EVENT_TRADE unles
 > }
 > ```
 
-* event_attack
-> Triggered when the npc has been attacked after being out of combat for at least 12 seconds.
+* event_combat
+> Triggered when the the combat state of a npc changes
+> Passes an event table as an argument:
+> ```
+> {
+> 	NPC self;
+> 	bool joined;
+> }
+> ```
+
+* event_slay
+> Triggered when a npc slays a target
 > Passes an event table as an argument:
 > ```
 > {
@@ -161,10 +171,6 @@ Note: Encounter scripts cannot properly catch EVENT_COMMAND or EVENT_TRADE unles
 > }
 > ```
 
-* event_combat
-* event_aggro
-* event_slay
-* event_npc_slay
 * event_waypoint_arrive
 * event_waypoint_depart
 * event_timer