From 05d6f078e3ae27e8ed03123ab13584610e37c0c4 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 1 Jan 2020 21:16:15 -0300
Subject: Fix mercenary hiring system

---
 npc/020-1/trainer.txt   | 9 +++------
 npc/items/mercenary.txt | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'npc')

diff --git a/npc/020-1/trainer.txt b/npc/020-1/trainer.txt
index 79f589ea7..df039743d 100644
--- a/npc/020-1/trainer.txt
+++ b/npc/020-1/trainer.txt
@@ -23,10 +23,6 @@ L_Main:
     switch (@menu) {
         // Hire Card
         case 1:
-            if (!is_staff()) {
-                mesc l("ERROR: Unknown error"), 1;
-                break;
-            }
             menuint
                 l("[%d GP] [Lv 1~25] Hire for one hour", 2500), 1,
                 l("[%d GP] [Lv 26~40] Hire for one hour", 7500), 2,
@@ -42,7 +38,7 @@ L_Main:
                         next;
                     } else {
                         .@mid=merc_randid(0, 0, 0, 0, 1000);
-                        mercenary_create .@mid, 3600000;
+                        mercenary_create(.@mid, 3600000);
                         POL_PlayerMoney(.@gp);
                     }
                     break;
@@ -53,8 +49,9 @@ L_Main:
                         next;
                     } else {
                         .@mid=merc_randid(0, 0, 0, 1000, 0);
-                        mercenary_create .@mid, 3600000;
+                        mercenary_create(.@mid, 3600000);
                         POL_PlayerMoney(.@gp);
+                        debugmes "New merc: %d", .@mid;
                     }
                     break;
                 case 3:
diff --git a/npc/items/mercenary.txt b/npc/items/mercenary.txt
index 65ffededd..87031e619 100644
--- a/npc/items/mercenary.txt
+++ b/npc/items/mercenary.txt
@@ -91,7 +91,6 @@ function	script	merc_randid	{
 		.@n=any_of(.@r);
 	// 2 ★
 	} else if (.@seed < .@s2) {
-        if (.@mode)
 		setarray .@r, 1200, 1201, 1199, 1207;
 		.@n=any_of(.@r);
 	// 1 ★
-- 
cgit v1.2.3-60-g2f50