Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 60 insertions, 30 deletions

diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt
index a1aa8a69..787e99ad 100644
--- a/world/map/npc/034-1/ambushs.txt
+++ b/world/map/npc/034-1/ambushs.txt
@@ -1,7 +1,8 @@
 // This file belongs to the wolvern hunting quest given by 033-1/birrod.txt
 // Author: Jenalya, cody, PjotrOrial
 
-034-1.gat,118,59,0|script|#Ambush0Trigger|32767,2,2,{
+034-1.gat,118,59,0|script|#Ambush0Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -20,7 +21,8 @@
     end;
 }
 
-034-1.gat,118,59,0|script|#Ambush0|32767,{
+034-1.gat,118,59,0|script|#Ambush0|32767,
+{
 end;
 
 OnAmbush:
@@ -57,7 +59,8 @@ L_Count:
 }
 
 
-034-1.gat,94,91,0|script|#Ambush1Trigger|32767,2,2,{
+034-1.gat,94,91,0|script|#Ambush1Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -76,7 +79,8 @@ L_Count:
     end;
 }
 
-034-1.gat,94,91,0|script|#Ambush1|32767,{
+034-1.gat,94,91,0|script|#Ambush1|32767,
+{
 end;
 
 OnAmbush:
@@ -113,7 +117,8 @@ L_Count:
 }
 
 
-034-1.gat,122,35,0|script|#Ambush2Trigger|32767,2,2,{
+034-1.gat,122,35,0|script|#Ambush2Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -132,7 +137,8 @@ L_Count:
     end;
 }
 
-034-1.gat,122,35,0|script|#Ambush2|32767,{
+034-1.gat,122,35,0|script|#Ambush2|32767,
+{
 end;
 
 OnAmbush:
@@ -169,7 +175,8 @@ L_Count:
 }
 
 
-034-1.gat,83,44,0|script|#Ambush3Trigger|32767,2,2,{
+034-1.gat,83,44,0|script|#Ambush3Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -188,7 +195,8 @@ L_Count:
     end;
 }
 
-034-1.gat,83,44,0|script|#Ambush3|32767,{
+034-1.gat,83,44,0|script|#Ambush3|32767,
+{
 end;
 
 OnAmbush:
@@ -225,7 +233,8 @@ L_Count:
 }
 
 
-034-1.gat,74,28,0|script|#Ambush4Trigger|32767,2,2,{
+034-1.gat,74,28,0|script|#Ambush4Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -244,7 +253,8 @@ L_Count:
     end;
 }
 
-034-1.gat,74,28,0|script|#Ambush4|32767,{
+034-1.gat,74,28,0|script|#Ambush4|32767,
+{
 end;
 
 OnAmbush:
@@ -281,7 +291,8 @@ L_Count:
 }
 
 
-034-1.gat,26,44,0|script|#Ambush5Trigger|32767,2,2,{
+034-1.gat,26,44,0|script|#Ambush5Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -300,7 +311,8 @@ L_Count:
     end;
 }
 
-034-1.gat,26,44,0|script|#Ambush5|32767,{
+034-1.gat,26,44,0|script|#Ambush5|32767,
+{
 end;
 
 OnAmbush:
@@ -337,7 +349,8 @@ L_Count:
 }
 
 
-034-1.gat,50,47,0|script|#Ambush6Trigger|32767,2,2,{
+034-1.gat,50,47,0|script|#Ambush6Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -356,7 +369,8 @@ L_Count:
     end;
 }
 
-034-1.gat,50,47,0|script|#Ambush6|32767,{
+034-1.gat,50,47,0|script|#Ambush6|32767,
+{
 end;
 
 OnAmbush:
@@ -393,7 +407,8 @@ L_Count:
 }
 
 
-034-1.gat,36,62,0|script|#Ambush7Trigger|32767,2,2,{
+034-1.gat,36,62,0|script|#Ambush7Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -412,7 +427,8 @@ L_Count:
     end;
 }
 
-034-1.gat,36,62,0|script|#Ambush7|32767,{
+034-1.gat,36,62,0|script|#Ambush7|32767,
+{
 end;
 
 OnAmbush:
@@ -449,7 +465,8 @@ L_Count:
 }
 
 
-034-1.gat,26,95,0|script|#Ambush8Trigger|32767,2,2,{
+034-1.gat,26,95,0|script|#Ambush8Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -468,7 +485,8 @@ L_Count:
     end;
 }
 
-034-1.gat,26,95,0|script|#Ambush8|32767,{
+034-1.gat,26,95,0|script|#Ambush8|32767,
+{
 end;
 
 OnAmbush:
@@ -505,7 +523,8 @@ L_Count:
 }
 
 
-034-1.gat,56,91,0|script|#Ambush9Trigger|32767,2,2,{
+034-1.gat,56,91,0|script|#Ambush9Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -524,7 +543,8 @@ L_Count:
     end;
 }
 
-034-1.gat,56,91,0|script|#Ambush9|32767,{
+034-1.gat,56,91,0|script|#Ambush9|32767,
+{
 end;
 
 OnAmbush:
@@ -561,7 +581,8 @@ L_Count:
 }
 
 
-034-1.gat,65,66,0|script|#Ambush10Trigger|32767,2,2,{
+034-1.gat,65,66,0|script|#Ambush10Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -580,7 +601,8 @@ L_Count:
     end;
 }
 
-034-1.gat,65,66,0|script|#Ambush10|32767,{
+034-1.gat,65,66,0|script|#Ambush10|32767,
+{
 end;
 
 OnAmbush:
@@ -617,7 +639,8 @@ L_Count:
 }
 
 
-034-1.gat,86,68,0|script|#Ambush11Trigger|32767,2,2,{
+034-1.gat,86,68,0|script|#Ambush11Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -636,7 +659,8 @@ L_Count:
     end;
 }
 
-034-1.gat,86,68,0|script|#Ambush11|32767,{
+034-1.gat,86,68,0|script|#Ambush11|32767,
+{
 end;
 
 OnAmbush:
@@ -673,7 +697,8 @@ L_Count:
 }
 
 
-034-1.gat,101,79,0|script|#Ambush12Trigger|32767,2,2,{
+034-1.gat,101,79,0|script|#Ambush12Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -692,7 +717,8 @@ L_Count:
     end;
 }
 
-034-1.gat,101,79,0|script|#Ambush12|32767,{
+034-1.gat,101,79,0|script|#Ambush12|32767,
+{
 end;
 
 OnAmbush:
@@ -729,7 +755,8 @@ L_Count:
 }
 
 
-034-1.gat,124,88,0|script|#Ambush13Trigger|32767,2,2,{
+034-1.gat,124,88,0|script|#Ambush13Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -748,7 +775,8 @@ L_Count:
     end;
 }
 
-034-1.gat,124,88,0|script|#Ambush13|32767,{
+034-1.gat,124,88,0|script|#Ambush13|32767,
+{
 end;
 
 OnAmbush:
@@ -785,7 +813,8 @@ L_Count:
 }
 
 
-034-1.gat,117,103,0|script|#Ambush14Trigger|32767,2,2,{
+034-1.gat,117,103,0|script|#Ambush14Trigger|32767,2,2,
+{
     set @state, ((QUEST_Barbarians & $@Q_Barbarians_MASK) >> $@Q_Barbarians_SHIFT);
     if (@state != 4)
         end;
@@ -804,7 +833,8 @@ L_Count:
     end;
 }
 
-034-1.gat,117,103,0|script|#Ambush14|32767,{
+034-1.gat,117,103,0|script|#Ambush14|32767,
+{
 end;
 
 OnAmbush: