NPC Improvements

2 files changed, 20 insertions, 20 deletions

diff --git a/npc/functions/captcha.txt b/npc/functions/captcha.txt
index 9b69ad422..30e8b3c7a 100644
--- a/npc/functions/captcha.txt
+++ b/npc/functions/captcha.txt
@@ -79,7 +79,7 @@ function	script	CaptchVal	{
 
 function	script	CaptchExample	{
     if (!CAPTCHA_TIME || getarg(0, false)) {
-        dispbottom("##1TO REPLY TO CAPTCHAS: @capcha <numeric answer>##1");
+        dispbottom("##1TO REPLY TO CAPTCHAS: @captcha <numeric answer>##1");
         dispbottom l("Example: Give the answer for the following: one+1");
         dispbottom l("Reply: %s", b("@captcha 2"));
         dispbottom b(l("This example will not be shown again."));
@@ -105,19 +105,19 @@ OnCall:
         dispbottom l("CAPTCHA: An error happened, try again."); end;}
 
     // Verify answer
-	.@ans$ = implode(.@atcmd_parameters$, " ");
+    .@ans$ = implode(.@atcmd_parameters$, " ");
     .@ans=atoi(.@ans$);
     if (.@ans == CAPTCHA_ANSWER) {
         CAPTCHA_OK=gettimetick(2)+.cooldown;
         $@BOTCHECK_TARGET=0;
         dispbottom any(
-                        l("captcha successful"),
-                        l("captcha ok"),
-                        l("correct"),
-                        l("understood"),
-                        l("not bad"),
-                        l("hmpf. That'll do."),
-                        l("a bit longer and I would have jailed you %%\\ "),
+                        l("Captcha successful"),
+                        l("Captcha ok"),
+                        l("Correct"),
+                        l("Understood"),
+                        l("Not bad"),
+                        l("Hmpf. That'll do."),
+                        l("A bit longer and I would have jailed you %%\\ "),
                         l("%%\\ that'll do."),
                         l("%%N"));
         dispbottom l("Remember: Players can also help enforcing no-AFK-bot rule!");
@@ -168,7 +168,7 @@ OnTimer5000:
             // 2. Player must be jailed, and we continue
             if (CAPTCHA_TIME < CAPTCHA_OK) {
                 atcommand("@jailfor 40mn "+strcharinfo(0));
-                dispbottom l("You failed to reply captcha in time and was arrested for AFK Botting. You can use @jailtime to keep track of time left.");
+                dispbottom l("You failed to reply to the captcha in time and were arrested for AFK Botting. You can use @jailtime to keep track of time left.");
                 CAPTCHA_OK=CAPTCHA_TIME;
                 detachrid();
                 continue;
@@ -231,7 +231,7 @@ function captchaProbe {
     // Timer expired? Ban hammer
     if (CAPTCHA_TIME+.thr > gettimetick(2) && CAPTCHA_OK <= CAPTCHA_TIME) {
         atcommand("@jailfor 30mn "+strcharinfo(0));
-        dispbottom l("You failed to reply captcha in time and was arrested for AFK Botting. You can use @jailtime to keep track of time left.");
+        dispbottom l("You failed to reply to the captcha in time and were arrested for AFK Botting. You can use @jailtime to keep track of time left.");
         CaptchExample(true);
         $@BOTCHECK_TARGET=false;
         CAPTCHA_OK=CAPTCHA_TIME;
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index 5b75c801f..522d14a07 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -56,7 +56,7 @@ function	script	daily_login_bonus_handler	{
         } else if (#LOGIN_STREAK > 27) {
             getitem StrangeCoin, 2;
             getitem CasinoCoins, 1;
-            dispbottom l("##2 @@ Days login bonus: ##B2x @@, 1x @@##b", #LOGIN_STREAK, getitemlink(StrangeCoin), getitemlink(CasinoCoins));
+            dispbottom l("##2 %d Days login bonus: ##B2x %s, 1x %s##b", #LOGIN_STREAK, getitemlink(StrangeCoin), getitemlink(CasinoCoins));
         } else if (#LOGIN_STREAK == 27) {
             #LOGIN_ALLTIME+=1;
             .@am=1;
@@ -102,37 +102,37 @@ function	script	daily_login_bonus_handler	{
 
             if (.@am)
                 getitem .@prize, .@am;
-            dispbottom l("##2 27 Days login bonus: ##B1x @@##b", getitemlink(.@prize));
+            dispbottom l("##2 27 Days login bonus: ##B1x %s##b", getitemlink(.@prize));
         } else if (#LOGIN_STREAK == 21) {
             getitem BronzeGift, 1;
-            dispbottom l("##2 21 Days login bonus: ##B1x @@##b", getitemlink(BronzeGift));
+            dispbottom l("##2 21 Days login bonus: ##B1x %s##b", getitemlink(BronzeGift));
         } else if (#LOGIN_STREAK == 14) {
             getitem BronzeGift, 1;
-            dispbottom l("##2 14 Days login bonus: ##B1x @@##b", getitemlink(BronzeGift));
+            dispbottom l("##2 14 Days login bonus: ##B1x %s##b", getitemlink(BronzeGift));
         } else if (#LOGIN_STREAK == 7) {
             getitem StrangeCoin, 3;
-            dispbottom l("##2 7 Days login bonus: ##B3x @@##b", getitemlink(StrangeCoin));
+            dispbottom l("##2 7 Days login bonus: ##B3x %s##b", getitemlink(StrangeCoin));
         } else if (#LOGIN_STREAK == 3) {
             getitem StrangeCoin, 1;
-            dispbottom l("##2 3 Days login bonus: ##B1x @@##b", getitemlink(StrangeCoin));
+            dispbottom l("##2 3 Days login bonus: ##B1x %s##b", getitemlink(StrangeCoin));
         } else if (#LOGIN_STREAK % 3 == 0) {
             .@value=max(20, rand2(#LOGIN_STREAK, #LOGIN_STREAK*2));
             .@value+=(BaseLevel*5/2)+rand2(JobLevel, JobLevel*7/20);
             .@value=.@value * 5 / 4; // Bonus 25%
             Zeny=Zeny+.@value;
-            dispbottom l("##2Daily login bonus: ##B@@ GP##b", .@value);
+            dispbottom l("##2Daily login bonus: ##B%d GP##b", .@value);
         } else if (#LOGIN_STREAK % 3 == 2) {
             .@value=max(5, rand2(0, (#LOGIN_STREAK/4)));
             .@value+=(BaseLevel**2);
             .@value=(.@value*3/4)+#LOGIN_STREAK; // 50% → 75%
             getexp .@value, 0;
-            dispbottom l("##2Daily login bonus: ##B@@ EXP##b", .@value);
+            dispbottom l("##2Daily login bonus: ##B%d EXP##b", .@value);
         } else {
             .@value=max(5, rand2(0, (#LOGIN_STREAK/4)));
             .@value+=(JobLevel**2);
             .@value=(.@value/2)+#LOGIN_STREAK; // 33% → 50%
             getexp 0, .@value;
-            dispbottom l("##2Daily login bonus: ##B@@ Job Exp.##b", .@value);
+            dispbottom l("##2Daily login bonus: ##B%d Job Exp.##b", .@value);
         }
 
         // Handle event login bonus