PiouSlayer → BugSlayer

Also rewrite Coconut opening script

4 files changed, 29 insertions, 24 deletions

diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index 74084dd02..f1aee9263 100644
--- a/npc/001-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -245,7 +245,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, LightPlatemail); // Light armor
     setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants
     setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
+    setunitdata(.@npcId, UDT_WEAPON, BugSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
@@ -271,7 +271,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor); // Terranite armor
     setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants
     setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
+    setunitdata(.@npcId, UDT_WEAPON, BugSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 6aac9fc5d..e3e78e021 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -114,7 +114,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, GMRobe);
     setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins);
-    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
+    setunitdata(.@npcId, UDT_WEAPON, BugSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
 
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index b1c3cde7c..7a4d96529 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -18,21 +18,32 @@
 
 012-5,36,26,0	script	Nicholas	NPC_CHELIOS,{
     mesn;
-    mesq l("Hello there, I am @@, blacksmith of this fine city. What do you want to forge today?");
+    mesq l("Hello there, I am @@, blacksmith of this fine city. What do you want to forge today?", .name$);
     mes "";
     select
+        l("I just want to trade."),
         l("Nothing, thanks!");
+
+    switch (@menu) {
+    case 1:
+        openshop;
+        closedialog;
+        close;
+        break;
+    }
     close;
 
 OnInit:
 	tradertype(NST_MARKET);
     sellitem Dagger, 4000, 5;
+    sellitem WoodenSword, 10000, 1;
 
     .sex = G_MALE;
     .distance = 5;
     end;
 
 OnClock0009:
+    restoreshopitem WoodenSword, 10000, 1;
 OnClock0603:
 OnClock1207:
 OnClock1801:
diff --git a/npc/items/croconut.txt b/npc/items/croconut.txt
index d6a6026c1..aef6b1af9 100644
--- a/npc/items/croconut.txt
+++ b/npc/items/croconut.txt
@@ -2,12 +2,9 @@
 // Authors:
 //    4144
 //    Reid
+//    Jesusalva
 // Description:
 //    Allows to cut a Croconut in multiple parts.
-//
-// Possible choices for L_Weapon:
-//    rif(countitem(35xx), l(getitemname(xx))), L_Weak,
-//    rif(countitem(35yy), l(getitemname(yy))), L_Good,
 
 000-0,0,0,0	script	Croconut	NPC_HIDDEN,{
     close;
@@ -25,19 +22,17 @@ OnUse:
     close;
 
 L_Weapon:
-    mes "";
-    mesn "Narrator";
-    mes col(l("Which of your weapons do you want to use in order to cut this @@?", getitemlink(Croconut)), 9);
-    next;
-
-    // ToDo this must be replaced
-    menu
-        rif(countitem(Knife) > 0, l(getitemname(Knife))), L_Weak,
-        rif(countitem(PiouSlayer) > 0, l(getitemname(PiouSlayer))), L_Weak,
-        rif(countitem(TrainingGladius) > 0, l(getitemname(TrainingGladius))), L_Good,
-        rif(countitem(WoodenSword) > 0, l(getitemname(WoodenSword))), L_Weak,
-        rif(countitem(ArtisBacksword) > 0, l(getitemname(ArtisBacksword))), L_Good,
-        l("Bare Hands"), -;
+    .@r=rand(1,5);
+    switch (.@r) {
+        case 1:
+        case 2:
+        case 3:
+            goto L_TooWeak; break;
+        case 4:
+            goto L_Weak; break;
+        case 5:
+            goto L_Good; break;
+    }
 
 L_TooWeak:
     mes "";
@@ -57,12 +52,11 @@ L_TooWeak:
     if ( (.@q > 6) ) goto L_Good;
 
 L_TooWeakLost:
-    mes col(l("You hit too hard with your fist, you destroyed your @@.", getitemlink(Croconut)), 9);
-
+    mes col(l("Ops! You destroyed your @@.", getitemlink(Croconut)), 9);
     close;
 
 L_TooWeakFail:
-    mes col(l("Your hands are too weak, you did not succeed in opening this @@.", getitemlink(Croconut)), 9);
+    mes col(l("Well... you did not succeed in opening this @@.", getitemlink(Croconut)), 9);
 
     getitem Croconut, 1;
     close;