Wooden Shield: The easy way out.

2 files changed, 34 insertions, 79 deletions

diff --git a/npc/012-1/jack.txt b/npc/012-1/jack.txt
index 3b7a9180b..96d2674ae 100644
--- a/npc/012-1/jack.txt
+++ b/npc/012-1/jack.txt
@@ -130,85 +130,6 @@ L_Loop:
 /* Copy-paste from TMW Org.
    I'll uncomment and rewrite when time comes.
 
-L_Shield_state_0:
-    mesn "Jack, the Lumberjack";
-    mes "\"I have an idea. What would you say about a new shield?\"";
-    next;
-    menu
-        "No thanks.", L_Close,
-        "Yes, please!", L_Yes;
-
-L_Yes:
-    mesn "Jack, the Lumberjack";
-    mes "\"All I need is " + @RAWLOGS_AMOUNT + " raw logs. This needn't be high quality wood; pretty much any log you can find should work. Oh, and I'll also need " + @SHIELD_COST + " GP for other materials.\"";
-    next;
-    @Q_Woodenshield = 2;
-    goto L_Close;
-
-L_Shield_state_2:
-    mesn "Jack, the Lumberjack";
-    mes "\"Do you have the " + @RAWLOGS_AMOUNT + " raw logs and " + @SHIELD_COST + " GP for the shield?\"";
-    menu
-        "Here it is.", L_Next10,
-        "I'll come back later.", L_Close;
-
-L_Next10:
-    if (countitem("RawLog") < @RAWLOGS_AMOUNT)
-        goto L_Not_enough_logs;
-    if (Zeny < @SHIELD_COST)
-        goto L_Not_enough_money;
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_TooMany;
-    delitem "RawLog", @RAWLOGS_AMOUNT;
-    Zeny = Zeny - @SHIELD_COST;
-    getexp @QUEST_SHIELD_EXP, 0;
-    getitem "WoodenShield", 1;
-    @Q_Woodenshield = 3;
-    mesn "Jack, the Lumberjack";
-    mes "\"Have a seat.\"";
-    mes "Jack saws the logs into pieces and then sands them until they are smooth to the touch.";
-    mes "Applying some strong-smelling liquid, he tans them to a darker hue.";
-    next;
-    mesn "Jack, the Lumberjack";
-    mes "Grabbing one of two leftover pieces, he begins to carve it into a round shape, then repeats this with the second piece – shield handles from what you can tell.";
-    next;
-    mesn "Jack, the Lumberjack";
-    mes "Meanwhile, the sun has dried the other pieces. Jack places them next to each other, adds a frame, and nails everything together.";
-    mes "The resulting shield looks usable already, but Jack applies another liquid to it and leaves it to dry for a few moments.";
-    next;
-    mesn "Jack, the Lumberjack";
-    mes "Finally, he hands the shield to you.";
-    mes "\"Enjoy your new shield!\"";
-    mes "[" + @QUEST_SHIELD_EXP + " experience points]";
-    next;
-    goto L_Close;
-
-L_Not_enough_logs:
-    mesn "Jack, the Lumberjack";
-    mes "\"You don't have enough wood for me to craft this shield; I need a total of " + @RAWLOGS_AMOUNT + " raw logs.\"";
-    goto L_Close;
-
-L_Not_enough_money:
-    mesn "Jack, the Lumberjack";
-    mes "\"I'm afraid that you don't have enough gold. I need " + @SHIELD_COST + " GP to finish your shield.\"";
-    goto L_Close;
-
-L_TooMany:
-    mesn "Jack, the Lumberjack";
-    mes "\"You don't have enough room to carry the shield. Come back when you do.\"";
-    goto L_Close;
-
-L_Shield_state_3:
-    mesn "Jack, the Lumberjack";
-    mes "\"I hope that my shield will serve you well!\"";
-    next;
-    if (@inspector != 1)
-        goto L_Made_Shield;
-    menu
-        "Me too.", L_Made_Shield,
-        "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
-
 L_NohMask_Ask:
     menu
         "I'll keep that in mind.", L_Close,
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index cdad6a122..a3a6c819b 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -67,6 +67,7 @@ L_Menu:
     select
         l("I just want to trade."),
         l("I want to forge Weapons!"),
+        l("I want to forge Shields!"),
         l("Nothing, thanks!");
 
     mes "";
@@ -78,10 +79,21 @@ L_Menu:
         break;
     case 2:
         goto L_Weapon;
+    case 3:
+        goto L_Shield;
 
     }
     close;
 
+
+
+
+
+
+
+
+
+
 L_Weapon:
     mesn;
     mesq l("Very well! We have seven class of items: Wood, Iron, Terranite, Bronze, Silver, Gold and Platinum.");
@@ -111,6 +123,28 @@ L_Weapon:
     }
     goto L_Weapon;
 
+
+
+
+
+
+L_Shield:
+    mesn;
+    mesq l("Very well! We have seven class of items: Wood, Iron, Terranite, Bronze, Silver, Gold and Platinum.");
+    mesq l("Each of them require different items, I'll sort from weakest to strongest, so choose wisely.");
+    select
+        l("Nothing, sorry!"),
+        l("Wooden Shield");
+
+    switch (@menu) {
+    case 1:
+        goto L_Menu;
+    case 2:
+        blacksmith_create(WoodenLog, 40, BootleOfTonoriWater, 1, WoodenShield, 5000);
+        break;
+    }
+    goto L_Weapon;
+
 OnInit:
 	tradertype(NST_MARKET);
     sellitem Dagger, 4000, 5;