From 8a88da702153773f221d9945a50204b07b2d1a48 Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Tue, 24 Feb 2009 11:13:52 +0100 Subject: Tweak spelling of a few item names --- db/item_db.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'db') diff --git a/db/item_db.txt b/db/item_db.txt index a5cfe960..85c1c369 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -117,7 +117,7 @@ 629, MushHat, Mush Hat, 5, 2500, 1250, 10, , 10, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} 630, ShroomHat, Shroom Hat, 5, 3000, 1500, 10, , 13, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} 631, DarkCrystal, Dark Crystal, 3, 100, 50, 10, , , , , , , , , , , , {}, {} -632, CottonSkirt, CottonSkirt, 5, 1000, 500, 10, , 4, , -8, 0, 10477567, 2, 1, , 1, 0, {}, {} +632, CottonSkirt, Cotton Skirt, 5, 1000, 500, 10, , 4, , -8, 0, 10477567, 2, 1, , 1, 0, {}, {} 633, ChristmasElfHat, Christmas Elf Hat, 5, 3000, 1500, 10, , 13, , 2, 0, 10477567, 2, 256, , 0, 0, {}, {} 634, FaceMask, Face Mask, 5, 2500, 1250, 10, , 10, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} 635, SantaCookie, Santa Cookie, 3, 1, 1, 1, , , , , , , , , , , , {}, {} @@ -213,7 +213,7 @@ 721, HighPriestCrown, High Priest Crown, 5, 20000, 5000, 60, , 4, , 20, 0, 10477567, 2, 256, , 0, 0, {}, { bonus bMaxSP, 20; } 722, MonsterSkullHelmet, Monster Skull Helmet, 5, 15000, 3000, 40, , 7, , 10, 0, 10477567, 2, 256, , 0, 0, {}, { bonus bMdef, 20; } 723, DesertHat, Desert Hat, 5, 5000, 1000, 10, , 3, , -1, 0, 10477567, 2, 256, , 0, 0, {}, {} -724, CottonHeadBand, Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +724, CottonHeadband, Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} 725, GMCap, GM Cap, 5, 2000, 500, 10, , 5, , 5, 0, 10477567, 2, 256, , 0, 0, {}, {} 726, GMRobe, GM Robe, 5, 8000, 4000, 5, , 5, , 0, 0, 10477567, 2, 512, , 0, 0, {}, {} 727, Iten, Iten, 3, 0, 0, 100, , , , , , , , , , , , {}, {} @@ -359,16 +359,16 @@ 2139, DarkGreenDesertHat, Dark Green Desert Hat, 5, 5000, 1000, 10, , 3, , -1, 0, 10477567, 2, 256, , 0, 0, {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} -2140, RedCottonHeadBand, Red Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2141, GreenCottonHeadBand, Green Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2142, DarkBlueCottonHeadBand, Dark Blue Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2143, YellowCottonHeadBand, Yellow Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2144, LightBlueCottonHeadBand, Light Blue Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2145, PinkCottonHeadBand, Pink Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2146, BlackCottonHeadBand, Black Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2147, OrangeCottonHeadBand, Orange Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2148, PurpleCottonHeadBand, Purple Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} -2149, DarkGreenCottonHeadBand, Dark Green Cotton Head Band, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2140, RedCottonHeadband, Red Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2141, GreenCottonHeadband, Green Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2142, DarkBlueCottonHeadband, Dark Blue Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2143, YellowCottonHeadband, Yellow Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2144, LightBlueCottonHeadband, Light Blue Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2145, PinkCottonHeadband, Pink Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2146, BlackCottonHeadband, Black Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2147, OrangeCottonHeadband, Orange Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2148, PurpleCottonHeadband, Purple Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} +2149, DarkGreenCottonHeadband, Dark Green Cotton Headband, 5, 3000, 500, 5, , 2, , 0, 0, 10477567, 2, 256, , 0, 0, {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 2150, RedCottonBoots, Red Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} -- cgit v1.2.3-70-g09d2 From 5b5cc1021fe8eb01383915722fffb314744a3439 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Wed, 25 Feb 2009 16:23:13 +0000 Subject: Add dyed gloves and put them on sale --- db/item_db.txt | 15 ++++++++++++++- npc/001-1_Tulimshar/bleacher.txt | 24 +++++++++++++++--------- npc/009-2_Hurnscald/selim.txt | 7 +++++++ npc/009-2_Hurnscald/shops.txt | 2 +- npc/020-2_Nivalis/shops.txt | 2 +- 5 files changed, 38 insertions(+), 12 deletions(-) (limited to 'db') diff --git a/db/item_db.txt b/db/item_db.txt index 85c1c369..b05a5fb5 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -221,12 +221,13 @@ 731, AssassinPants, Assassin Pants, 5, 10000, 3000, 10, , 5, , -5, 0, 10477567, 2, 1, , 0, 0, {}, {} // RESERVED 734, BlackBoots, Black Boots, 5, 20000, 3000, 35, , 4, , -10, 0, 10477567, 2, 64, , 0, 0, {}, {} -735, WhiteCottonBoots, White Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} +735, CottonBoots, Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} 736, WhiteCake, White Cake, 0, 500, 100, 10, , , , , , 10477567, 2, , , 0, , { itemheal 10,0; }, {} 737, ChocolateCake, Chocolate Cake, 0, 550, 125, 10, , , , , , 10477567, 2, , , 0, , { itemheal 11,0; }, {} 738, OrangeCake, Orange Cake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} 739, AppleCake, Apple Cake, 0, 600, 150, 10, , , , , , 10477567, 2, , , 0, , { itemheal 12,0; }, {} 740, Root, Root, 3, 500, 200, 5, , , , , , , , , , , , {}, {} +741, CottonGloves, Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 1198, JackOSoul, Jack O Soul, 3, 100000, 1, 1, , , , , , , , , , , , {}, {} @@ -381,3 +382,15 @@ 2157, OrangeCottonBoots, Orange Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} 2158, PurpleCottonBoots, Purple Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} 2159, DarkGreenCottonBoots, Dark Green Cotton Boots, 5, 2000, 500, 10, , 1, , 1, 0, 10477567, 2, 64, , 0, 0, {}, {} + +#ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Job, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} +2160, RedCottonGloves, Red Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2161, GreenCottonGloves, Green Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2162, DarkBlueCottonGloves, Dark Blue Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2163, YellowCottonGloves, Yellow Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2164, LightBlueCottonGloves, Light Blue Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2165, PinkCottonGloves, Pink Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2166, BlackCottonGloves, Black Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2167, OrangeCottonGloves, Orange Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2168, PurpleCottonGloves, Purple Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} +2169, DarkGreenCottonGloves, Dark Green Cotton Gloves, 5, 2000, 500, 20, , 1, , -10, 0, 10477567, 2, 4, , 0, 0, {}, {} \ No newline at end of file diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt index 67ea1497..d51c134b 100644 --- a/npc/001-1_Tulimshar/bleacher.txt +++ b/npc/001-1_Tulimshar/bleacher.txt @@ -19,45 +19,46 @@ L_bleach_menu: next; menu - "Cotton shirt", L_cottonshirt, + "Cotton shirt", L_cottonshirt, "V-Neck sweater", L_vneck, "Turtleneck sweater", L_tneck, "Cotton shorts", L_shorts, "Cotton skirt", L_skirt, - "Tank top ", L_tanktop, + "Tank top ", L_tanktop, "Short tank top", L_tanktop_short, "Silk robe", L_robe, "Cotton headband", L_cotton_headband, "Desert hat", L_desert_hat, "Cotton boots", L_cotton_boots, + "Cotton gloves", L_cotton_gloves, "Nevermind", -; goto L_close; -L_cottonshirt: set @normal, 1202; +L_cottonshirt: set @normal, 1202; set @dyeBase, 2050; goto L_choose_color; -L_vneck: set @normal, 624; +L_vneck: set @normal, 624; set @dyeBase, 2060; goto L_choose_color; -L_tneck: set @normal, 564; +L_tneck: set @normal, 564; set @dyeBase, 2070; goto L_choose_color; -L_shorts: set @normal, 586; +L_shorts: set @normal, 586; set @dyeBase, 2110; goto L_choose_color; -L_skirt: set @normal, 632; +L_skirt: set @normal, 632; set @dyeBase, 2100; goto L_choose_color; -L_tanktop: set @normal, 688; +L_tanktop: set @normal, 688; set @dyeBase, 2090; goto L_choose_color; -L_tanktop_short: set @normal, 689; +L_tanktop_short: set @normal, 689; set @dyeBase, 2120; goto L_choose_color; @@ -80,6 +81,11 @@ L_cotton_boots: set @normal, 735; set @dyeBase, 2150; goto L_choose_color; + +L_cotton_gloves: + set @normal, 741; + set @dyeBase, 2160; + goto L_choose_color; L_choose_color: mes "[Candide]"; diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt index 14eac5b9..bfd8bc46 100644 --- a/npc/009-2_Hurnscald/selim.txt +++ b/npc/009-2_Hurnscald/selim.txt @@ -29,6 +29,7 @@ L_clothes_choice: "Cotton headband", L_headband, "Desert hat", L_desert_hat, "Cotton boots", L_cottonboots, + "Cotton gloves", L_cottongloves, "I'm fine for now, thanks.", -; close; @@ -100,6 +101,12 @@ L_cottonboots: set @name$, "cotton boots"; goto L_picked_item; +L_cottongloves: + set @del, 741; + set @new, 2160; + set @name$, "cotton gloves"; + goto L_picked_item; + L_picked_item: if (countitem(@del) == 0) goto L_havenone; L_colour: diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt index ebd9f767..3cd1e8f0 100644 --- a/npc/009-2_Hurnscald/shops.txt +++ b/npc/009-2_Hurnscald/shops.txt @@ -31,4 +31,4 @@ // General Store // Sells various things, many not sold elsewhere -009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000 +009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,741:-1 diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt index fa7d8fe6..f1b452b5 100644 --- a/npc/020-2_Nivalis/shops.txt +++ b/npc/020-2_Nivalis/shops.txt @@ -1,7 +1,7 @@ // Snow town shops // Clothes shop -020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 +020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,741:-1 // Weapons shop 020-2.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 // Potions shop -- cgit v1.2.3-70-g09d2 From 9808f3a8a135136589344bdd0f9b7f93de56f18f Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Thu, 26 Feb 2009 10:03:32 +0100 Subject: Remove mention of colour in names of dyeable base items --- db/item_db.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'db') diff --git a/db/item_db.txt b/db/item_db.txt index b05a5fb5..c34a7eda 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -175,8 +175,8 @@ 685, SmallHealingPotion, Small Healing Potion, 0, 50, 25, 10, , , , , , 10477567, 2, , , 0, , { itemheal 200,0; }, {} 686, MediumHealingPotion, Medium Healing Potion, 0, 100, 50, 20, , , , , , 10477567, 2, , , 0, , { itemheal 400,0; }, {} 687, LargeHealingPotion, Large Healing Potion, 0, 200, 100, 40, , , , , , 10477567, 2, , , 0, , { itemheal 800,0; }, {} -688, WhiteTankTop, White Tank Top, 5, 10, 5, 100, , 2, , -4, 0, 10477567, 2, 512, , 0, 0, {}, {} -689, WhiteShortTankTop, White Short Tank Top, 5, 10, 5, 100, , 2, , -4, 0, 10477567, 2, 512, , 0, 0, {}, {} +688, TankTop, Tank Top, 5, 10, 5, 100, , 2, , -4, 0, 10477567, 2, 512, , 0, 0, {}, {} +689, ShortTankTop, Short Tank Top, 5, 10, 5, 100, , 2, , -4, 0, 10477567, 2, 512, , 0, 0, {}, {} 690, RedDye, Red Dye, 3, 100, 20, 10, , , , , , 10477567, 2, , , 0, , {}, {} 691, GreenDye, Green Dye, 3, 2500, 1000, 10, , , , , , 10477567, 2, , , 0, , {}, {} 692, DarkBlueDye, Dark Blue Dye, 3, 40000, 15000, 10, , , , , , 10477567, 2, , , 0, , {}, {} -- cgit v1.2.3-70-g09d2