Fixing Nicholas script and increasing odds of coal drops from Mogguns

Nicholas now tell his customers that he charges coal.
The odds of coal drops from Mogguns are increased from 6% to 10%.

1 files changed, 7 insertions, 18 deletions

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;