From 328adfad074abebd419591039c14f6f1fce115f5 Mon Sep 17 00:00:00 2001 From: NetSysFire <59517351+NetSysFire@users.noreply.github.com> Date: Sat, 17 Sep 2022 21:44:45 +0200 Subject: some fixes for the last commit --- npc/003-10/kreist.txt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/npc/003-10/kreist.txt b/npc/003-10/kreist.txt index 5f5a26ffb..2c02c901a 100644 --- a/npc/003-10/kreist.txt +++ b/npc/003-10/kreist.txt @@ -73,9 +73,9 @@ L_QuestMaster: } // Maybe you finished the quest? - if (!.q3 == 0 && get_byte(.@q3, 1) >= get_byte(.@q3, 0)) { + if (!.@q3 == 0 && get_byte(.@q3, 1) >= get_byte(.@q3, 0)) { mesn l("Kreist, Taskmaster"); - mesq l("Good job, you've killed the @@ @@ and reported back in time!", .@killamount, getmonsterlink(.@q2)); + mesq l("Good job, you've killed the %d %s and reported back in time!", get_byte(.@q3, 0), getmonsterlink(.@q2)); next; inventoryplace MercBoxA, 1; if (MERCENARY_DAILYQUEST == 100) { @@ -103,9 +103,8 @@ L_QuestMaster: set_byte(.@q3, 0, 15); // amount already killed // Explanation why the city needs that - // FIXME: plural if (.@q2 == Maggot ) { - mesq l("%s have infested the store houses, spilling onto the streets. Stop them from destroying even more food.", getmonsterlink(.@q2)); + mesq l("%ss have infested the store houses, spilling onto the streets. Stop them from destroying even more food.", getmonsterlink(.@q2)); .@killamount=30; set_byte(.@q3, 0, 30); } else if (.@q2 == GiantMaggot) { @@ -171,7 +170,7 @@ function script Guardhouse_RandQuestCheck { if (getq(General_MobHunting1) == .@d && getq2(General_MobHunting1) == .@mobId) { .@q3=getq3(General_MobHunting1); - .@killamount=get_byte(.@q3, 1) + .@killamount=get_byte(.@q3, 1); setq3 General_MobHunting1, set_byte(.@q3, 1, .@killamount+1); if (!(.@killamount % 5)) dispbottom l("%d/%d %s killed", .@killamount, get_byte(.@q3, 0), getmonsterlink(.@mobId)); @@ -201,7 +200,7 @@ function script Guardhouse_RandQuestCheck { .@q3=getq3(General_MobHunting4)+1; setq3 General_MobHunting4, .@q3; if (!(.@q3 % 10)) - dispbottom l("@@/@@ @@ killed", .@q3, .@killamount, getmonsterlink(.@mobId)); + dispbottom l("@@/@@ @@ killed", .@q3, 50, getmonsterlink(.@mobId)); } @@ -211,7 +210,7 @@ function script Guardhouse_RandQuestCheck { .@q3=getq3(General_MobHunting5)+1; setq3 General_MobHunting5, .@q3; if (!(.@q3 % 10)) - dispbottom l("@@/@@ @@ killed", .@q3, .@killamount, getmonsterlink(.@mobId)); + dispbottom l("@@/@@ @@ killed", .@q3, 50, getmonsterlink(.@mobId)); } // Frostia - Hard Task @@ -220,7 +219,7 @@ function script Guardhouse_RandQuestCheck { .@q3=getq3(General_MobHunting6)+1; setq3 General_MobHunting6, .@q3; if (!(.@q3 % 10)) - dispbottom l("@@/@@ @@ killed", .@q3, .@killamount, getmonsterlink(.@mobId)); + dispbottom l("@@/@@ @@ killed", .@q3, 50, getmonsterlink(.@mobId)); } // Frostia - Nightmare Task @@ -229,7 +228,7 @@ function script Guardhouse_RandQuestCheck { .@q3=getq3(General_MobHunting7)+1; setq3 General_MobHunting7, .@q3; if (!(.@q3 % 10)) - dispbottom l("@@/@@ @@ killed", .@q3, .@killamount, getmonsterlink(.@mobId)); + dispbottom l("@@/@@ @@ killed", .@q3, 50, getmonsterlink(.@mobId)); } // Frostia - Boss Task -- cgit v1.2.3-60-g2f50