From 1ae38aa5abfa086c87a0e54fbcb89aefced4fe61 Mon Sep 17 00:00:00 2001
From: jesusalva <cpntb1@ymail.com>
Date: Mon, 26 Feb 2018 17:05:12 -0300
Subject: Improve client-version kicking

---
 npc/000-0/sailors.txt           | 2 +-
 npc/003-3/malindou.txt          | 1 +
 npc/functions/clientversion.txt | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'npc')

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 1f13684e4..c537ed128 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -11,7 +11,7 @@
 000-0,23,20,0	script	Sailors	NPC_SAILORS,6,6,{
 
 OnTouch:
-    checkclientversion;
+    //checkclientversion;
     .@lang = requestlang();
     if (.@lang >= 0 && .@lang <= 9) Lang = .@lang;
 
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 58d75b010..5a90619c8 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -145,6 +145,7 @@ OnInit:
     end;
 
 OnPCLoginEvent:
+    checkclientversion;
     if (#MerchantBank)
     {
         BankVault += max(0, #MerchantBank);
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 5286a9cf3..ba74c082b 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -8,13 +8,13 @@ function	script	checkclientversion	{
     if (ClientVersion > 20) return;
 
     mesn "Narrator";
-    mes col("Warning.", 9);
-    mes col("Warning.", 9);
+    mes col("Warning.", 1);
+    mes col("Warning.", 1);
     mes col("Warning: You are using an old client.", 9);
     next;
-    mes col("Not all features will work.", 9);
+    mes col("Please install the new client from [@@https://manaplus.org/|https://manaplus.org/@@]", 9);
     next;
-    mes col("Please install the new client from [@@https://manaplus.org/|https://manaplus.org/]", 9);
+    mes col("You won't be allowed to play this game until you have a valid client.", 9);
     next;
     // Force user to disconnect
     atcommand "@kick "+strcharinfo(0);
-- 
cgit v1.2.3-60-g2f50