Either fix or break stuff - some debug text included

3 files changed, 8 insertions, 4 deletions

diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index d605e6690..fcabc7362 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -172,7 +172,7 @@ function do_init {
     rm -rf server-code
     gitclone https://gitlab.com/evol hercules.git server-code
     check_error $?
-    cd server-code/src ; git checkout master # 2018-09-24
+    cd server-code/src ; git checkout v2018.09.23 #master # 2018-09-24 # s20180713?
     check_error $?
     gitclone https://gitlab.com/TMW2 evol-hercules.git evol ; cd evol ; git checkout tmw2 ; cd ..
     check_error $?
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index db721d896..a208b371b 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -178,7 +178,7 @@ OnPCLoginEvent:
     end;
 
 OnClock0000:
-    .login_ref=gettime(5); // Day of moth
+    .login_ref=gettime(5); // Day of month
     end;
 
 OnInit:
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index cc289e4ca..9c1dc1665 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -16,13 +16,15 @@ function	script	daily_login_bonus_handler	{
     //      Number of monthly connections
     //  #LOGIN_ALLTIME
     //      Number of times you claimed the top prize (27 days streak)
+    debugmes "DLBH";
 
-    if (#LOGIN_DAY != .login_ref) {
+    if (#LOGIN_DAY != gettime(5)) {
         // demure check: Are you on a start area?
         getmapxy(.@m$,.@x,.@y,0);
         if (.@m$ ~= "000")
             return;
 
+        debugmes "[DLBH] Mapcheck ok";
         // Is it a new month?
         if (#LOGIN_TABLE == gettime(6)) {
             #LOGIN_STREAK=#LOGIN_STREAK+1;
@@ -32,7 +34,8 @@ function	script	daily_login_bonus_handler	{
         }
 
         // Update last day you've claimed a reward
-        #LOGIN_DAY = .login_ref;
+        #LOGIN_DAY = gettime(5);
+        debugmes "[DLBH] month checks ok";
 
         // Handle rewards: Streaks first, daily later. Streak reward prevail over daily reward.
         if (#LOGIN_STREAK > 27) {
@@ -96,6 +99,7 @@ function	script	daily_login_bonus_handler	{
             dispbottom l("##2Daily login bonus: ##B@@ Job Exp.##b", .@value);
         }
     }
+    debugmes "[DLBH] Finished: "+#LOGIN_DAY+" ok";
     return;
 }