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

Conflicts:
	world/map/db/mob_db.txt

2 files changed, 11 insertions, 9 deletions

diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index c0f03028..b56c1f58 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -13,7 +13,8 @@
 016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000,7000,Mob016-1::On1035
 
 
-016-1.gat,0,0,0|script|Mob016-1|-1,{
+016-1.gat,0,0,0|script|Mob016-1|-1,
+{
 On1003:
     set @mobID, 1003;
     callfunc "MobPoints";
diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index f3ae3f7e..30521be5 100644
--- a/world/map/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
@@ -21,7 +21,8 @@
 // 5, state5: you are ready to do the targeting minigame
 // 6, state6: you did the minigame
 
-016-1.gat,33,45,0|script|Gwendolyn|182,{
+016-1.gat,33,45,0|script|Gwendolyn|182,
+{
     // schoolfee in gp
     set @SCHOOLFEE, 25000;
     // how many eggs do you need of each kind?
@@ -79,7 +80,7 @@ L_fee:
 
     set Zeny, Zeny - @SCHOOLFEE;
     set @Q_hawkseye, 2;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
 
     mes "[Gwendolyn Bowmaker]";
     mes "\"The first thing you need is, obviously, a bow. You should not use any you come across, but a high quality one. I think it would be best to go to Alan in Hurnscald. He is my cousin, and knows how to make Forest Bows of exquisite quality. \"";
@@ -101,7 +102,7 @@ L_state2:
         goto L_bow_bought;
 
     set @Q_hawkseye, 3;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     mes "[Gwendolyn Bowmaker]";
     mes "\"Very well, this looks fine. It is time for your first lesson. \"";
     next;
@@ -142,7 +143,7 @@ L_state3:
     getexp @QUEST_EGG_EXP, 0;
 
     set @Q_hawkseye, 4;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
 
     mes "[Gwendolyn Bowmaker]";
     mes "\"Very well. That will make a great meal.\"";
@@ -157,7 +158,7 @@ L_state4:
     next;
 
     set @Q_hawkseye, 5;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     mes "[Gwendolyn Bowmaker]";
     mes "\"Ok. You have made great progress. I think you are ready for further tasks.\"";
     next;
@@ -432,7 +433,7 @@ L_target_hit:
     if( rand(500) > (2*readparam(bDex) + readparam(bAgi)))
         goto L_target_nohit;
     set @Q_hawkseye, 6;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
 
     setskill SKILL_MALLARDS_EYE, 1;
     getexp @QUEST_HAWK_EXP, 0;
@@ -465,13 +466,13 @@ L_state1:
 L_no_student:
     mes "\"That's a pity. Well, if you change your mind, come back any time.\"";
     set @Q_hawkseye, 1;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     goto L_Close;
 
 L_no_money:
     mes "\"I am sorry, but it seems that you don't have enough money. Come back when you have reorganized your finances.\"";
     set @Q_hawkseye, 1;
-        callsub S_Update_Var;
+    callsub S_Update_Var;
     goto L_Close;
 
 L_no_bow: