From 1dab71476e7fa493966b8e389e3a8c9f3a3616ee Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 14 Jan 2019 16:00:01 -0200 Subject: Introduce a new helper for main storyline: msObjective(). --- npc/003-2/lua.txt | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'npc/003-2/lua.txt') diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt index 86185c17b..10657b5b6 100644 --- a/npc/003-2/lua.txt +++ b/npc/003-2/lua.txt @@ -173,35 +173,17 @@ L_Info: L_Task: mesc b(l(".:: Main Quest 2-1 ::.")), 3; - if (BaseLevel >= 20) - mesc l("* @@/@@ Base Level", BaseLevel, 20), 2; - else - mesc l("* @@/@@ Base Level", BaseLevel, 20), 9; + msObjective(BaseLevel >= 20, l("* @@/@@ Base Level", BaseLevel, 20)); - if (JobLevel >= 6) - mesc l("* @@/@@ Job Level", JobLevel, 6), 2; - else - mesc l("* @@/@@ Job Level", JobLevel, 6), 9; + msObjective(JobLevel >= 6, l("* @@/@@ Job Level", JobLevel, 6)); - if (Zeny >= 1000) - mesc l("* @@/@@ GP", Zeny, 1000), 2; - else - mesc l("* @@/@@ GP", Zeny, 1000), 9; + msObjective(Zeny >= 1000, l("* @@/@@ GP", Zeny, 1000)); - if (countitem(TulimsharGuardCard)) - mesc l("* @@/@@ @@", countitem(TulimsharGuardCard), 1, getitemlink(TulimsharGuardCard)), 2; - else - mesc l("* @@/@@ @@", countitem(TulimsharGuardCard), 1, getitemlink(TulimsharGuardCard)), 9; + msObjective(countitem(TulimsharGuardCard), l("* @@/@@ @@", countitem(TulimsharGuardCard), 1, getitemlink(TulimsharGuardCard))); - if (countitem(FishingRod)) - mesc l("* @@/@@ @@", countitem(FishingRod), 1, getitemlink(FishingRod)), 2; - else - mesc l("* @@/@@ @@", countitem(FishingRod), 1, getitemlink(FishingRod)), 9; + msObjective(countitem(FishingRod), l("* @@/@@ @@", countitem(FishingRod), 1, getitemlink(FishingRod))); - if (countitem(LifestonePendant)) - mesc l("* @@/@@ @@", countitem(LifestonePendant), 1, getitemlink(LifestonePendant)), 2; - else - mesc l("* @@/@@ @@", countitem(LifestonePendant), 1, getitemlink(LifestonePendant)), 9; + msObjective(countitem(LifestonePendant), l("* @@/@@ @@", countitem(LifestonePendant), 1, getitemlink(LifestonePendant))); next; if (BaseLevel >= 20 && -- cgit v1.2.3-60-g2f50