Several weapons and armors are now sold in shops! \o/

11 files changed, 210 insertions, 2 deletions

diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index c80fdaf79..fd461a47d 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -78,6 +78,8 @@ OnInit:
     sellitem EarthPowder, 12000, 1;
     sellitem ShortTankTop, 8000, 1;
     sellitem TrainingBow, 990, 2;
+    sellitem SilkGloves, -1, 1;
+    sellitem LeatherTrousers, -1, 1;
     sellitem CottonCloth, -1, 3;
     sellitem RoastedMaggot, -1, 2;
 	sellitem ArrowAmmoBox,-1,rand(5,10);
@@ -91,6 +93,8 @@ OnInit:
     end;
 
 OnClock1149:
+    restoreshopitem SilkGloves, -1, 1;
+    restoreshopitem LeatherTrousers, -1, 1;
 OnClock2359:
     restoreshopitem EarthPowder, 12000, 1;
     restoreshopitem ShortTankTop, 8000, 1;
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index f06af1f46..86ca29bc8 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -15,6 +15,9 @@ OnInit:
 	sellitem ArrowAmmoBox, -1, rand(2,4);
     sellitem Arrow, -1, 30000;
     sellitem TreasureMap, 600, 1;
+    sellitem DesertHelmet, -1, 1;
+    sellitem InfantryHelmet, -1, 1;
+    sellitem LeatherGloves, -1, 1;
     sellitem DesertHat, -1, 8;
     sellitem SilkRobe, -1, 1;
     sellitem CottonCloth, -1, 2;
@@ -28,6 +31,9 @@ OnInit:
     end;
 
 OnClock0621:
+    restoreshopitem DesertHelmet, 1;
+    restoreshopitem InfantryHelmet, 1;
+    restoreshopitem LeatherGloves, 1;
 OnClock1210:
 OnClock1757:
 OnClock0001:
diff --git a/npc/012-5/nicholas.txt b/npc/012-5/nicholas.txt
index 33241971a..706a84a2e 100644
--- a/npc/012-5/nicholas.txt
+++ b/npc/012-5/nicholas.txt
@@ -253,11 +253,18 @@ OnInit:
 
     sleep(SHOPWAIT);
 	tradertype(NST_MARKET);
+    sellitem Backsword, -1, 1;
+    sellitem ShortGladius, -1, 1;
+    sellitem BugSlayer, -1, 1;
+    sellitem WoodenSword, -1, 3;
     sellitem Dagger, 600, 5;
     sellitem SharpKnife, 450, 10;
     end;
 
 OnClock0009:
+    restoreshopitem Backsword, 1;
+    restoreshopitem ShortGladius, 1;
+    restoreshopitem BugSlayer, 1;
 OnClock0603:
 OnClock1207:
 OnClock1801:
diff --git a/npc/017-1/shops.txt b/npc/017-1/shops.txt
index c74e1c0be..ac5affeb0 100644
--- a/npc/017-1/shops.txt
+++ b/npc/017-1/shops.txt
@@ -30,9 +30,13 @@ OnInit:
 	sellitem Bullet, -1, 2000;
     if (!rand2(4))
     	sellitem OolongTea, getiteminfo(OolongTea, ITEMINFO_BUYPRICE)*15/10, rand2(1,3);
+    sellitem WoodenShield, -1, 1;
+    sellitem LeatherShirt, -1, 1;
     end;
 
 OnClock1250:
+    restoreshopitem WoodenShield, 1;
+    restoreshopitem LeatherShirt, 1;
 OnClock0112:
     restoreshopitem LOFCoin, -1, 1;
     restoreshopitem YellowDye, -1, 1;
diff --git a/npc/020-5/bracco.txt b/npc/020-5/bracco.txt
index 79692dd15..b725f3dde 100644
--- a/npc/020-5/bracco.txt
+++ b/npc/020-5/bracco.txt
@@ -352,6 +352,10 @@ OnInit:
 
     sleep(SHOPWAIT);
     tradertype(NST_MARKET);
+    sellitem BritShield, -1, 1;
+    sellitem BladeShield, -1, 1;
+    sellitem MiereCleaver, -1, 1;
+    sellitem ShortSword, -1, 1;
     sellitem LeatherShirt, -1, 1;
     sellitem LeatherShield, 5000, 1;
     sellitem ShortBow, -1, 1;
@@ -369,9 +373,13 @@ OnFri0800:
 OnSat1200:
 OnSun1600:
 OnMon2000:
-    restoreshopitem LeatherShirt, -1, 1;
+    restoreshopitem BritShield, 1;
+    restoreshopitem BladeShield, 1;
+    restoreshopitem MiereCleaver, 1;
+    restoreshopitem ShortSword, 1;
+    restoreshopitem LeatherShirt, 1;
     restoreshopitem LeatherShield, 5000, 1;
-    restoreshopitem ShortBow, -1, 1;
+    restoreshopitem ShortBow, 1;
 	restoreshopitem ArrowAmmoBox,rand(8,12);
 	restoreshopitem IronAmmoBox,rand(3,5);
     end;
diff --git a/npc/024-4/_import.txt b/npc/024-4/_import.txt
index 568d31559..10834a1c9 100644
--- a/npc/024-4/_import.txt
+++ b/npc/024-4/_import.txt
@@ -1,3 +1,5 @@
 // Map 024-4: Frostia Indoors
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/024-4/_warps.txt",
+"npc/024-4/alaion.txt",
+"npc/024-4/solana.txt",
diff --git a/npc/024-4/alaion.txt b/npc/024-4/alaion.txt
new file mode 100644
index 000000000..76a725844
--- /dev/null
+++ b/npc/024-4/alaion.txt
@@ -0,0 +1,55 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Random shops
+
+024-4,36,23,0	script	Alaion	NPC_ELF,{
+    npcshopattach(.name$);
+    shop .name$;
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, any(Chainmail, LightPlatemail, CopperArmor, AssassinChest));
+    setunitdata(.@npcId, UDT_HEADBOTTOM, any(RaidTrousers, LeatherTrousers, JeansChaps, BromenalPants, AssassinPants, ChainmailSkirt));
+    setunitdata(.@npcId, UDT_WEAPON, AncientSword);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, rand2(5,15));
+    setunitdata(.@npcId, UDT_HAIRCOLOR, rand2(2,10));
+
+    .sex = G_MALE;
+    .distance = 4;
+    sleep(SHOPWAIT);
+    tradertype(NST_MARKET);
+
+    sellitem Halberd, -1, 1;
+    sellitem Broadsword, -1, 1;
+    sellitem Kitana, -1, 1;
+    sellitem ShortSword, -1, 1;
+    sellitem Backsword, -1, 1;
+    sellitem ShortGladius, -1, 1;
+    end;
+
+OnClock1250:
+OnClock0112:
+    restoreshopitem Halberd, 1;
+    restoreshopitem Broadsword, 1;
+    restoreshopitem Kitana, 1;
+    restoreshopitem ShortSword, 1;
+    restoreshopitem Backsword, 1;
+    restoreshopitem ShortGladius, 1;
+    end;
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
+}
+
diff --git a/npc/024-4/solana.txt b/npc/024-4/solana.txt
new file mode 100644
index 000000000..5f87766f3
--- /dev/null
+++ b/npc/024-4/solana.txt
@@ -0,0 +1,47 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Random shops
+
+024-4,28,23,0	script	Solana	NPC_ELF_F,{
+    npcshopattach(.name$);
+    shop .name$;
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, any(LightPlatemail, ForestArmor, AssassinChest));
+    setunitdata(.@npcId, UDT_HEADBOTTOM, any(RaidTrousers, JeansChaps, AssassinPants, ChainmailSkirt));
+    setunitdata(.@npcId, UDT_WEAPON, BansheeBow);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, rand2(5,15));
+    setunitdata(.@npcId, UDT_HAIRCOLOR, rand2(2,10));
+
+    .sex = G_FEMALE;
+    .distance = 4;
+    sleep(SHOPWAIT);
+    tradertype(NST_MARKET);
+
+    sellitem ForestBow, -1, 1;
+    sellitem ElficBow, -1, 1;
+    end;
+
+OnClock1250:
+OnClock0112:
+    restoreshopitem ForestBow, 1;
+    restoreshopitem ElficBow, 1;
+    end;
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
+}
+
diff --git a/npc/024-5/_import.txt b/npc/024-5/_import.txt
index a0a3f3320..4d9bb3cbe 100644
--- a/npc/024-5/_import.txt
+++ b/npc/024-5/_import.txt
@@ -1,4 +1,5 @@
 // Map 024-5: Frostia Indoors
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/024-5/_warps.txt",
+"npc/024-5/rychell.txt",
 "npc/024-5/saevel.txt",
diff --git a/npc/024-5/rychell.txt b/npc/024-5/rychell.txt
new file mode 100644
index 000000000..ac6ba5670
--- /dev/null
+++ b/npc/024-5/rychell.txt
@@ -0,0 +1,57 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Random shops
+
+024-5,33,23,0	script	Rychell	NPC_ELF,{
+    npcshopattach(.name$);
+    shop .name$;
+    close;
+
+OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, any(Chainmail, LightPlatemail, CopperArmor, AssassinChest));
+    setunitdata(.@npcId, UDT_HEADBOTTOM, any(RaidTrousers, LeatherTrousers, JeansChaps, BromenalPants, AssassinPants, ChainmailSkirt));
+    setunitdata(.@npcId, UDT_WEAPON, BlueKnightShield);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, rand2(5,15));
+    setunitdata(.@npcId, UDT_HAIRCOLOR, rand2(2,10));
+
+    .sex = G_MALE;
+    .distance = 4;
+    sleep(SHOPWAIT);
+    tradertype(NST_MARKET);
+
+    sellitem BritShield, -1, 1;
+    sellitem Chainmail, -1, 1;
+    //sellitem CopperArmor, -1, 1;
+    sellitem SilkPants, -1, 1;
+    sellitem ChainmailSkirt, -1, 1;
+    sellitem BromenalGloves, -1, 1;
+    sellitem BromenalHelmet, -1, 1;
+    end;
+
+OnClock1251:
+OnClock0113:
+    restoreshopitem BritShield, 1;
+    restoreshopitem Chainmail, 1;
+    //restoreshopitem CopperArmor, 1;
+    restoreshopitem SilkPants, 1;
+    restoreshopitem ChainmailSkirt, 1;
+    restoreshopitem BromenalGloves, 1;
+    restoreshopitem BromenalHelmet, 1;
+    end;
+
+// Pay your taxes!
+OnBuyItem:
+    debugmes("Purchase confirmed");
+    PurchaseTaxes();
+    end;
+
+OnSellItem:
+    debugmes("Sale confirmed");
+    SaleTaxes();
+    end;
+}
+
diff --git a/npc/025-1/yuko.txt b/npc/025-1/yuko.txt
index f48e1dbce..81336bf70 100644
--- a/npc/025-1/yuko.txt
+++ b/npc/025-1/yuko.txt
@@ -37,6 +37,23 @@ OnInit:
     sellitem PoisonAmmoBox,      -1, 10;
     sellitem CursedAmmoBox,      -1, 15;
     sellitem PileOfAsh,          -1, 25;
+    sellitem BoneKnife,          -1,  1;
+    sellitem LeaderWand,         -1,  1;
+    sellitem BromenalShield,     -1,  1;
+    sellitem LightPlatemail,     -1,  1;
+    sellitem BromenalPants,      -1,  1;
+    sellitem CandleHelmet,       -1,  1;
+    sellitem WarlordHelmet,      -1,  1;
+    end;
+
+OnWed0016:
+    restoreshopitem BoneKnife,          1;
+    restoreshopitem LeaderWand,         1;
+    restoreshopitem BromenalShield,     1;
+    restoreshopitem LightPlatemail,     1;
+    restoreshopitem BromenalPants,      1;
+    restoreshopitem CandleHelmet,       1;
+    restoreshopitem WarlordHelmet,      1;
     end;
 
 OnClock1149: