summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/mob_db.txt2
-rw-r--r--npc/009-2_Hurnscald/nicholas.txt25
2 files changed, 8 insertions, 19 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt
index dc2b439c..5362b67c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -58,5 +58,5 @@
1058, IceGoblin, Ice Goblin, 25, 330, 0, 0, 2, 1, 20, 25, 0, 5, 5, 5, 1, 0, 6, 30, 1, 1, 1, 3, 23, 133, 700, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
1059, GCMaggot, Giant Cave Maggot, 90, 2000, 0, 0, 16, 2, 60, 80, 2, 7, 10, 10, 2, 1, 22, 1, 2, 2, 1, 0, 41, 133, 1000, 1872, 672, 480, 727, 10000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 25
1060, Archant, Archant, 30, 400, 0, 0, 200, 1, 20, 30, 4, 6, 10, 5, 1, 0, 12, 10, 1, 1, 1, 0, 25, 133, 1000, 1500, 672, 480, 537, 300, 535, 100, 640, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
-1061, Moggun, Moggun, 60, 800, 0, 0, 100, 1, 70, 90, 20, 10, 50, 40, 10, 10, 10, 10, 1, 1, 1, 0, 25, 137, 600, 1500, 672, 480, 611, 600, 4001, 600, 4002, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
+1061, Moggun, Moggun, 60, 800, 0, 0, 100, 1, 70, 90, 20, 10, 50, 40, 10, 10, 10, 10, 1, 1, 1, 0, 25, 137, 600, 1500, 672, 480, 611, 600, 4001, 1000, 4002, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 40
1062, Terranite, Terranite, 110, 6000, 0, 0, 1000, 1, 200, 300, 20, 40, 60, 40, 40, 30, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 4001, 600, 4004, 20, 4005, 20, 4007, 20, 763, 500, 640, 500, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 3241cc97..fccafbce 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -47,7 +47,6 @@ L_Check:
mes "[Nicholas]";
mes "\"Let me take a look at how much you have...\"";
next;
- if ( (countitem("IngotIron")>5) && (countitem("Coal") < 6) ) goto L_StageShield;
if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem;
if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_StageA;
if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_StageB;
@@ -66,16 +65,9 @@ L_Pass:
mes "\"Oh, okay. Come back any time.\"";
close;
-L_StageShield:
- mes "[Nicholas]";
- mes "\"That's just enough for me to make you a [Steel Shield], but it'll cost you 20,000 GP and 6 [Iron Ingot]s.\"";
- next;
- goto L_main_menu;
-
L_StageA:
mes "[Nicholas]";
- mes "\"That's enough for me to make you a winged [Knight's Helmet], but it'll cost you 10,000GP, 6 [Coal] and 3 [Iron Ingot]s.\"";
- if ( (countitem("IngotIron")>5) ) mes "\"I can also make you a [Steel Shield] for 20,000 GP and 6 [Iron Ingot]s.\"";
+ mes "\"That's just enough for me to make you a winged [Knight's Helmet], but it'll cost you 10,000GP, 6 [Coal] and 3 [Iron Ingot]s.\"";
next;
goto L_main_menu;
@@ -122,23 +114,20 @@ L_main_menu_post_setzer:
if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_no_more_helmets;
- set @choice$[@choices_nr], "Crusade Helmet. (6 Iron Ingots & 12 Coal)";
+ set @choice$[@choices_nr], "Crusade Helmet (6 Iron Ingots & 12 Coal).";
set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
set @choices_nr, 1 + @choices_nr;
+ set @choice$[@choices_nr], "Steel Shield (6 Iron Ingots & 12 Coal).";
+ set @choice_idx[@choices_nr], @CHOICE_SHIELD;
+ set @choices_nr, 1 + @choices_nr;
+
if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_no_more_helmets;
- set @choice$[@choices_nr], "Warlord Helmet. (9 Iron Ingots & 18 Coal)";
+ set @choice$[@choices_nr], "Warlord Helmet (9 Iron Ingots & 18 Coal).";
set @choice_idx[@choices_nr], @CHOICE_WARLORD;
set @choices_nr, 1 + @choices_nr;
-
L_no_more_helmets:
- if ( (countitem("IngotIron")<6) ) goto L_no_more_items;
- set @choice$[@choices_nr], "Steel Shield. (6 Iron Ingots)";
- set @choice_idx[@choices_nr], @CHOICE_SHIELD;
- set @choices_nr, 1 + @choices_nr;
-
-L_no_more_items:
set @choice$[@choices_nr], "No thanks.";
set @choice_idx[@choices_nr], @CHOICE_CANCEL;
set @choices_nr, 1 + @choices_nr;