5 files changed, 26 insertions, 17 deletions
diff --git a/world/map/news.d/49-v2015.05.18.txt b/world/map/news.d/49-v2015.05.18.txt
new file mode 100644
index 00000000..776e1be0
--- /dev/null
+++ b/world/map/news.d/49-v2015.05.18.txt
@@ -0,0 +1,21 @@
+{title:Candor is open}
+{date:2015-05-18}
+
+This update mainly includes bug fixes. 
+
+Release Notes v15.5.18
+{ul}
+{li}Candor is fixed{/li}
+{li}Quest log entries for some quests in Kaizei.{/li}
+{li}The GM Lounge is now more cozy{/li}
+{li}Fixed typo in constable bob's dialog{/li}
+{li}Some syntactical modifications to the game rules{/li}
+{li}Chinese, Russian and French translation updates to game rules{/li}
+{li}Fixed the bug that displayed @@ in some npcs{/li}
+{li}Deprecate the debug npcs in favor of the #debug spell{/li}
+{li}The MOTD is now sent to the General chat tab{/li}
+{/ul}
+
+Read More: {link:http://ow.ly/N7fps}
+
+{author:TMW Development Team}
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index aaba3afb..46ccafac 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -34,7 +34,7 @@ L_Except:
         "No thank you.", L_Close;
 
 L_Teach:
-    if (Zeny < 5) goto L_NotEnoughMoney;
+    if (Zeny < 2) goto L_NotEnoughMoney;
     set Zeny, Zeny - 2;
     mes "[Trader]";
     mes "\"You can initiate trade with someone by right-clicking on them and choosing trade.";
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index 63bce759..02704447 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -26,7 +26,7 @@
 
     if ($@BRODOMIR_PVP_STATUS == 2)
         goto L_Alreadystarted;
-    if ($@BRODOMIR_PVP_STATUS == 1)
+    if ($@BRODOMIR_PVP_STATUS == 1 && $@BRODOMIR_START_TIME > gettimetick(2))
         goto L_Wait;
     mes "[Brodomir]";
     mes "\"Hi Warrior.\"";
@@ -132,6 +132,7 @@ L_Go:
     set $@BRODOMIR_ITEM_AMOUNT, @brodomir_item_amount;
     set $@BRODOMIR_MONEY, @brodomir_money;
     set $@brodomir_delay_seconds, 600;
+    set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds;
     set $@BRODOMIR_PVP_STATUS, 1;
     announce "Brodomir : In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
     if ($@BRODOMIR_ITEM_AMOUNT > 0)
@@ -140,13 +141,12 @@ L_Go:
         announce "Brodomir : The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
     mes "[Brodomir]";
     mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\"";
-    set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds;
     set $@brodomir_delay_seconds, 0;
     initnpctimer;
     goto L_Close;
 
 L_Wait:
-    set @ms, ($@BRODOMIR_START_TIME - gettimetick(2)) * 1000;
+    set @seconds, $@BRODOMIR_START_TIME - gettimetick(2);
     callfunc "HumanTime";
     mes "[Brodomir]";
     mes "\"Just a little longer. I will bring you there in " + @time$ + ".\"";
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 181a2589..f083396c 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -255,9 +255,6 @@ OnTouch:
 
 029-2,33,27,0|script|#Carpet|32767,1,1
 {
-    end;
-
-OnTouch:
     if (QL_BEGIN != 1)
         end;
     mes "[Sorfina]";
@@ -309,9 +306,6 @@ L_CloseDis:
 
 029-2,44,31,0|script|#DoorOutTut1|45,0,0
 {
-    end;
-
-OnTouch:
     if (QL_BEGIN < 4)
         goto L_Block;
     warp "029-2", 112, 85;
@@ -323,9 +317,6 @@ L_Block:
 }
 029-2,23,24,0|script|#GameRules1|32767,0,1
 {
-    end;
-
-OnTouch:
     if (TUT_var > 0)
         end;
     mes "[Server/Client Notice]";
@@ -336,9 +327,6 @@ OnTouch:
 }
 029-2,21,24,0|script|#GameRules2|32767,0,1
 {
-    end;
-
-OnTouch:
     if (TUT_var > 0)
         end;
     callfunc "GameRules";
diff --git a/world/map/npc/functions/time.txt b/world/map/npc/functions/time.txt
index bd80a1b1..e1daf974 100644
--- a/world/map/npc/functions/time.txt
+++ b/world/map/npc/functions/time.txt
@@ -92,7 +92,7 @@ function|script|HumanTime
     goto L_Clean;
 
 L_TooShort:
-    debugmes "HumanTime: negative value: "+@ms;
+    debugmes "HumanTime: negative value: "+@ms+" @ "+ strnpcinfo(0);
     mapexit;
 
 L_Millis: