Upgrade & Fix what I just did on previous commits, it's 05:15 hey hey

1 files changed, 7 insertions, 19 deletions

diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 16c14e96e..35eeb9ddb 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -74,20 +74,14 @@ function	script	checkclientversion	{
     if (UPDATE < 1546926740) {
         UPDATE=1546926740;
         .@dg=0;
+        .@u$=strtolower(strcharinfo(0));
+        setarray .@apology$, "jesusalva", "mrhedx", "ziah", "soren xd", "warblade", "yuxin", "xtreem", "monking", "demure gm", "se francisc";
+        setarray .@gallery$, "jesusalva", "mishana", "bobr", "demure", "lawncable";
+
         // Users connected during nodrop incident (2018-12-29)
         // Jesusalva Mrhedx Ziah "Soren xd" WarBlade
         // yuxin Xtreem monking "demure GM" "Se Francisc"
-        switch (strtolower(strcharinfo(0))) {
-            case "jesusalva":
-            case "mrhedx":
-            case "ziah":
-            case "soren xd":
-            case "warblade":
-            case "yuxin":
-            case "xtreem":
-            case "monking":
-            case "demure gm":
-            case "se francisc":
+        if (array_exists(.@apology$, .@u$)) {
                 getitembound GoldenGift, 1, 1;
                 Zeny=Zeny+570;
                 .@dg=1;
@@ -98,16 +92,11 @@ function	script	checkclientversion	{
                 mesc l("Sorry, and enjoy the game! Your TMW2 Staff Team."), 3;
                 mesc l("Token Of Apology: 1x @@, 570 GP", getitemlink(GoldenGift));
                 next;
-                break;
         }
+
         // 1st Gallery Contest Participants
         // Mishana LawnCable bObr Jesusalva demure
-        switch (strtolower(strcharinfo(0))) {
-            case "jesusalva":
-            case "mishana":
-            case "bobr":
-            case "demure":
-            case "lawncable":
+        if (array_exists(.@gallery$, .@u$)) {
                 getitem StrangeCoin, 30;
                 .@dg=1;
                 showavatar NPC_LOF_RICH;
@@ -127,7 +116,6 @@ function	script	checkclientversion	{
                 mesc l("Hey, look, a tie happened!");
                 mesc l("How's that even possible? Well, 30 @@ for all contestants!", getitemlink(StrangeCoin));
                 next;
-                break;
         }
         if (.@dg)
             close;