Xanthem added Chest and Pants Equipment Recipes

2 files changed, 153 insertions, 6 deletions

diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt
index 009998e46..cd78feaa6 100644
--- a/npc/017-5/nahrec.txt
+++ b/npc/017-5/nahrec.txt
@@ -58,11 +58,11 @@ function NahrecMain {
     mesn;
     mesq l("Yes, I can craft many things. In addition to plating and improving armor, I can craft smaller items made of gold and other metals.");
     select
-        rif(false && countitem(WarlordPlate) > 0, l("Can you improve my Warlord Plate for me?")),
-        rif(false && countitem(LightPlatemail) > 0, l("Can you improve my Light Platemail for me?")),
+        rif(!RECIPES_EQUIPMENT[CraftGoldenLightPlate], l("Can you improve my Light Platemail for me?")),
+        rif(!RECIPES_EQUIPMENT[CraftGoldenWarlord], l("Can you improve my Warlord Plate for me?")),
         l("Can you craft Chainmail?"),
         l("Can you craft Light Platemail?"),
-        rif(false, l("Can you craft Warlord Plate?")),
+        l("Can you craft Warlord Plate?"),
         l("Can you craft Savior Pants?"),
         l("Can you craft Chainmail Skirt?"),
         l("Do you know something about 'Mylarin Dust'?"),
@@ -70,10 +70,31 @@ function NahrecMain {
     mes "";
     switch (@menu) {
         case 1:
-            blacksmith_create(GoldIngot, 35, WarlordPlate, 1, GoldenWarlordPlate, 200000);
+            mesn;
+            mesq ("For %d GP I'll teach you, do we have a deal?", fnum(30000));
+            next;
+            if (askyesno() == ASK_YES && Zeny > 30000) {
+                mes "";
+                Zeny-=30000;
+                RECIPES_EQUIPMENT[CraftGoldenLightPlate]=true;
+                mesn;
+                mesc l("Nahrec discretly gives you a recipe.");
+                mesc l("\"*psst, just follow what is outlined here to make it golden.*\"");
+            }
             break;
         case 2:
-            blacksmith_create(GoldIngot, 10, LightPlatemail, 1, GoldenLightPlatemail, 30000);
+            mesn;
+            mesq ("For %d GP I'll teach you, do we have a deal?", fnum(200000));
+            next;
+            if (askyesno() == ASK_YES && Zeny > 200000) {
+                mes "";
+                Zeny-=200000;
+                RECIPES_EQUIPMENT[CraftGoldenWarlord]=true;
+                mesn;
+                mesc l("Nahrec discretly gives you a recipe.");
+                mesc l("\"*psst, just follow what is outlined here to make it golden.*\"");
+            }
+            break;
             break;
         case 3:
             blacksmith_create(IronIngot, 10, SilverIngot, 2, Chainmail, 20000);
@@ -148,7 +169,15 @@ function blacksmith_create {
         delitem .@base1, .@amon1;
         delitem .@base2, .@amon2;
 		POL_PlayerMoney(.@price);
-        getitem .@prize, 1;
+        if (.@prize == WarlordPlate) {
+            .@b=any(IOPT_SPLASHDAMAGE, VAR_ITEMDEFPOWER);
+            if (.@b == IOPT_SPLASHDAMAGE)
+                CsysNpcCraft(.@prize, .@b, 1);
+            else
+                CsysNpcCraft(.@prize, VAR_ITEMDEFPOWER, 50, VAR_MDEFPOWER, 30);
+        } else {
+            CsysNpcCraft(.@prize, IOPT_SCRESIST_POISON, 10, IOPT_SCRESIST_SILENCE, 10, IOPT_SCRESIST_BLIND, 10, IOPT_SCRESIST_CURSE, 10);
+        }
 
         mes "";
         mesn;
diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt
index 45bc940f7..8e2ba3731 100644
--- a/npc/craft/recipes.txt
+++ b/npc/craft/recipes.txt
@@ -364,6 +364,107 @@ function readCrafting {
                 40, Coal,
                  1, EverburnPowder);
     dnext;
+    // Chest Armors -> Primary Ore + Secondary Ore + Iron Powder + Earth Powder
+    mesc "----------"+l("Chest Armor Recipes")+"----------", 2;
+    showRecipe(CraftLeatherShirt, LeatherShirt,
+                35, LeatherPatch,
+                 2, IronIngot,
+                 8, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftLieutenantArmor, LieutenantArmor,
+                 4, CopperIngot,
+                 4, IronIngot,
+                12, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftChainmail, Chainmail,
+                10, IronIngot,
+                 2, SilverIngot,
+                18, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftCopperArmor, CopperArmor,
+                10, Copperngot,
+                 3, IronIngot,
+                22, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftLightPlatemail, LightPlatemail,
+                15, IronIngot,
+                 5, SilverIngot,
+                24, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftGoldenLightPlate, GoldenLightPlatemail,
+                15, GoldIngot,
+                 1, LightPlatemail,
+                26, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftWarlordPlate, WarlordPlate,
+                15, TitaniumIngot,
+                 5, SilverIngot,
+                28, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftGoldenWarlord, GoldenWarlordPlate,
+                45, GoldIngot,
+                 1, WarlordPlate,
+                30, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftBromenalChest, BromenalChest,
+                11, TitaniumIngot,
+                 5, SilverIngot,
+                11, IronPowder,
+                 1, EarthPowder);
+    showRecipe(CraftAsassinChest, AssassinChest,
+                 5, PlatinumIngot,
+                30, CottonCloth,
+                34, IronPowder,
+                 1, EarthPowder);
+    dnext;
+    // Pants -> Primary Item + Secondary Item + Leather Patch + Earth Powder
+    mesc "----------"+l("Pants Recipes")+"----------", 2;
+    showRecipe(CraftJeansShorts, JeansShorts,
+                10, CottonCloth,
+                 5, CaveSnakeSkin,
+                10, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftRaidTrousers, RaidTrousers,
+                30, CottonCloth,
+                25, WhiteFur,
+                14, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftLeatherTrousers, LeatherTrousers,
+                30, CottonCloth,
+                20, Coal,
+                19, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftJeansChaps, JeansChaps,
+                35, SnakeSkin,
+                20, CottonCloth,
+                22, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftSilkPants, SilkPants,
+                150,SilkCocoon,
+                 5, CottonCloth,
+                24, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftChainmailSkirt, ChainmailSkirt,
+                10, IronIngot,
+                15, SilverIngot,
+                26, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftBromenalPants, BromenalPants,
+                 5, TitaniumIngot,
+                 4, CopperIngot,
+                28, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftWarlordPants, WarlordPants,
+                 8, TitaniumIngot,
+                10, SilverIngot,
+                30, LeatherPatch,
+                 1, EarthPowder);
+    showRecipe(CraftAssassinPants, AssassinPants,
+                 3, IridiumIngot,
+                35, CottonCloth,
+                34, LeatherPatch,
+                 1, EarthPowder);
+    dnext;
     // Gloves: Gloves items
     mesc "----------"+l("Gloves Recipes")+"----------", 2;
     showRecipe(CraftSilkGloves, SilkGloves,
@@ -570,6 +671,8 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftShortBow);
                 array_push(.@recipes, CraftSilkGloves);
                 array_push(.@recipes, CraftInfantryHelmet);
+                array_push(.@recipes, CraftLeatherShirt);
+                array_push(.@recipes, CraftJeansShorts);
             }
             if (.@rarity & CRAFT_INTERMEDIARY) {
                 array_push(.@recipes, CraftBugSlayer);
@@ -581,6 +684,8 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftLeatherGloves);
                 array_push(.@recipes, CraftDesertHelmet);
                 array_push(.@recipes, CraftBromenalHelmet);
+                array_push(.@recipes, CraftLieutenantArmor);
+                array_push(.@recipes, CraftRaidTrousers);
             }
             if (.@rarity & CRAFT_ADVANCED) {
                 array_push(.@recipes, CraftBacksword);
@@ -599,6 +704,17 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftCrusadeHelmet);
                 array_push(.@recipes, CraftWarlordHelmet);
                 array_push(.@recipes, CraftVikingHelmet);
+                array_push(.@recipes, CraftChainmail);
+                array_push(.@recipes, CraftCopperArmor);
+                array_push(.@recipes, CraftLightPlatemail);
+                array_push(.@recipes, CraftWarlordPlate);
+                array_push(.@recipes, CraftBromenalArmor);
+                array_push(.@recipes, CraftLeatherTrousers);
+                array_push(.@recipes, CraftJeansChaps);
+                array_push(.@recipes, CraftSilkPants);
+                array_push(.@recipes, CraftChainmailSkirt);
+                array_push(.@recipes, CraftBromenalPants);
+                array_push(.@recipes, CraftWarlordPants);
             }
             if (.@rarity & CRAFT_EXPERT) {
                 array_push(.@recipes, CraftGoldenRing);
@@ -619,6 +735,8 @@ function	script	MakeBlueprint	{
                 array_push(.@recipes, CraftDarkHelm);
                 array_push(.@recipes, CraftTerraniteArmor);
                 array_push(.@recipes, CraftTerranitePants);
+                array_push(.@recipes, CraftAssassinChest);
+                array_push(.@recipes, CraftAssassinPants);
            }
             if (.@rarity & CRAFT_MASTER) {
                 array_push(.@recipes, CraftDivineSword);