From 48f7c8e533a12c345fc28ad5cbc47281ead9b039 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 10 Dec 2022 20:31:29 -0300
Subject: Nerf Tycoon

---
 npc/007-1/tycoon.txt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt
index 0400e5482..7df3f4d3f 100644
--- a/npc/007-1/tycoon.txt
+++ b/npc/007-1/tycoon.txt
@@ -30,11 +30,11 @@
 //  8:  Completed Cave Snake Quest - 1000 EXP 350 GP
 //  9:  Awaiting next quest
 //
-// 10:  Took Red Scorpion Quest 100 kills (lvl 29)
+// 10:  Took Red Scorpion Quest 75 kills (lvl 29)
 // 11:  Completed  Red Scorpion Quest - Miner Hat
 // 12:  Awaiting next quest
 //
-// 13:  Took  Black Scorpion Quest 200 kills (lvl 34)
+// 13:  Took  Black Scorpion Quest 150 kills (lvl 34)
 // 14:  Completed Black Scorpion Quest - 12 000 EXP 5 000 GP
 // 15:  Finished all trainment
 
@@ -109,7 +109,7 @@ L_Purge:
     } else if (.@q == 6 && BaseLevel < 24) {
         mesq l("You are too weak for my task, please come back later with some levels.");
     } else if (.@q == 7) {
-        mesq l("You are killing @@/50 @@ at the cave.", .@k, getmonsterlink(CaveSnake));
+        mesq l("You are killing %d/%d %s at the cave.", .@k, 50, getmonsterlink(CaveSnake));
     } else if (.@q == 8) {
         mesq l("I hope you got a Jean Shorts, but that depends on luck. Anyway, here is your reward.");
         getexp 1150, 0; // (r7.5 1050 → 1150)
@@ -118,12 +118,12 @@ L_Purge:
     } else if (.@q == 9 && BaseLevel >= 29) {
         mesq l("If you want to be a real miner friend, do this hard task for me. I will reward you with a @@.", getitemlink(MinerHat));
         next;
-        mesq l("I'll ask you to kill 100 @@. This will prove your worth. Good luck.", getmonsterlink(RedScorpion));
+        mesq l("I'll ask you to kill %d %s. This will prove your worth. Good luck.", 75, getmonsterlink(RedScorpion));
         setq MineQuest_Tycoon, 10, 0;
     } else if (.@q == 9 && BaseLevel < 29) {
         mesq l("You are too weak for my task, please come back later with some levels.");
     } else if (.@q == 10) {
-        mesq l("You are killing @@/100 @@. It's still in progress.", .@k, getmonsterlink(RedScorpion));
+        mesq l("You are killing %d/%d %s. It's still in progress.", .@k, 75, getmonsterlink(RedScorpion));
     } else if (.@q == 11) {
         mesq l("Congratulations! Here is your reward, a @@!", getitemlink(MinerHat));
         mesq l("Mining opearations advance steadly day by day with your help, thanks! Maybe one day, we find a Mana Stone here!");
@@ -132,7 +132,7 @@ L_Purge:
         getexp 3800, 0; // r7.5 1365→3800
         setq MineQuest_Tycoon, 12, 0;
     } else if (.@q == 12 && BaseLevel >= 40) {
-        mesq l("The last task I could give you is to exterminate 200 @@. They actually stop miners progress on the mine.", getmonsterlink(BlackScorpion));
+        mesq l("The last task I could give you is to exterminate %d %s. They actually stop miners progress on the mine.", 150, getmonsterlink(BlackScorpion));
         if (BaseLevel < 45)
             mesc l("WARNING: This is a level 45 quest!"), 1;
         setq MineQuest_Tycoon, 13, 0;
@@ -142,7 +142,7 @@ L_Purge:
     } else if (.@q == 12 && BaseLevel < 40) {
         mesq l("You are too weak for my last task, please come back later with some levels.");
     } else if (.@q == 13) {
-        mesq l("You are killing @@/200 @@ at the cave.", .@k, getmonsterlink(BlackScorpion));
+        mesq l("You are killing %d/%d %s at the cave.", .@k, 150, getmonsterlink(BlackScorpion));
         if (BaseLevel < 45)
             mesc l("WARNING: This is a level 45 quest!"), 1;
     } else if (.@q == 14) {
@@ -344,12 +344,12 @@ OnKillRedScorpion:
     .@q=getq(MineQuest_Tycoon);
     .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 10) {
-        if (.@k+1 >= 100) {
+        if (.@k+1 >= 75) {
             tycoon_max_kills();
             message strcharinfo(0), l("All red scorpions are dead! Go back to Tycoon.");
         } else {
             tycoon_add_kills();
-            message strcharinfo(0), l("@@/100 Red Scorpions", .@k+1);
+            message strcharinfo(0), l("%d/%d Red Scorpions", .@k+1, 75);
         }
     }
     fix_mobkill(RedScorpion);
@@ -358,12 +358,12 @@ OnKillBlackScorpion:
     .@q=getq(MineQuest_Tycoon);
     .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 13) {
-        if (.@k+1 >= 200) {
+        if (.@k+1 >= 150) {
             tycoon_max_kills();
             message strcharinfo(0), l("All black scorpions are dead! Go back to Tycoon.");
         } else {
             tycoon_add_kills();
-            message strcharinfo(0), l("@@/200 Black Scorpions", .@k+1);
+            message strcharinfo(0), l("%d/%d Black Scorpions", .@k+1, 150);
         }
     }
     fix_mobkill(BlackScorpion);
-- 
cgit v1.2.3-60-g2f50