Bugfixesr08.1_20190202

1 files changed, 9 insertions, 5 deletions

diff --git a/npc/020-4/gambler.txt b/npc/020-4/gambler.txt
index 865ee9f37..17f66cbc8 100644
--- a/npc/020-4/gambler.txt
+++ b/npc/020-4/gambler.txt
@@ -19,7 +19,7 @@
         case 13:
             return l("Joker"); break;
         default:
-            return getarg(0);
+            return atoi(getarg(0)+1);
         }
     }
 
@@ -41,7 +41,7 @@ L_Info:
     mes "";
     mesc l("Rules:");
     mesc l("A card will be flipped, you'll need to decide if next flip will be HIGHER or LOWER.");
-    mesc l("Cards are ranked on this priority: @@", "A - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - J - Q - K - Joker");
+    mesc l("Cards are ranked on this priority: A - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - J - Q - K - Joker");
     next;
     mesc l("Prizes:");
     mesc l("If you're right, you'll get 80 GP!");
@@ -69,8 +69,8 @@ L_Spin:
     mesn;
     mesc l("It's a @@!", cardname(.@card1));
     mesc l("Will next draw be HIGHER or LOWER?!");
-    mesc l("Cards are ranked on this priority: @@", "A - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - J - Q - K - Joker");
     next;
+    mesc l("Cards are ranked on this priority: A - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - J - Q - K - Joker");
     select
         l("HIGHER!"),
         l("LOWER!");
@@ -86,11 +86,11 @@ L_Spin:
         mesc l("It's a tie!");
         getitem CasinoCoins, 1;
         .@bypass=1;
-    } else if (.@card1 < .@card2 && @menu == 2) {
+    } else if (.@card2 < .@card1 && @menu == 2) {
         mesc l("It's lower! That's right!");
         Zeny=Zeny+80;
         @gambler_winstreak=@gambler_winstreak+1;
-    } else if (.@card1 > .@card2 && @menu == 1) {
+    } else if (.@card2 > .@card1 && @menu == 1) {
         mesc l("It's higher! That's right!");
         Zeny=Zeny+80;
         @gambler_winstreak=@gambler_winstreak+1;
@@ -139,6 +139,10 @@ OnInit:
     close;
 
 OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+
     .sex = G_MALE;
     .distance = 4;
     npcsit;