summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-01-01 21:16:15 -0300
committerJesusaves <cpntb1@ymail.com>2020-01-01 21:16:15 -0300
commit05d6f078e3ae27e8ed03123ab13584610e37c0c4 (patch)
tree555358027524a9dedcbc8f592de01133576c72dd /npc
parent1b20e2026bfbb7c72a6ce530bf0ca15005e2c3a0 (diff)
downloadserverdata-05d6f078e3ae27e8ed03123ab13584610e37c0c4.tar.gz
serverdata-05d6f078e3ae27e8ed03123ab13584610e37c0c4.tar.bz2
serverdata-05d6f078e3ae27e8ed03123ab13584610e37c0c4.tar.xz
serverdata-05d6f078e3ae27e8ed03123ab13584610e37c0c4.zip
Fix mercenary hiring system
Diffstat (limited to 'npc')
-rw-r--r--npc/020-1/trainer.txt9
-rw-r--r--npc/items/mercenary.txt1
2 files changed, 3 insertions, 7 deletions
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 ★