From d545853dc153eb60a88c1576c342b9220ee15dd2 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 20 Feb 2009 05:44:42 -0700 Subject: Adjust the Trainer's description of luck Text by MadCamel --- npc/001-1_Tulimshar/guide.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'npc') diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index d4367616..75b4dcc3 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -117,7 +117,7 @@ L_Stats: mes "[Ian the Guide]"; mes "\"Vitality determines how resistant to injuries you are, and how much damage you can take before you die."; mes "Intelligence is useful for alchemy and magic, but there are few opportunities for either at the moment."; - mes "Luck determines many small things, but, to be honest, I don't think that it is very useful.\""; + mes "Luck determines many small things, including the likelihood of both recieving and dealing critical hits\""; next; mes "[Ian the Guide]"; mes "\"I recommend that you practice your dexterity, since some of the more dangerous monsters are very hard to hit otherwise."; -- cgit v1.2.3-60-g2f50 From b6e53c58c1f0562bc6d552cbd81e5704569fdc17 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 23 Feb 2009 11:01:30 -0700 Subject: Fix close bug in Taro --- npc/014-1_Woodland/taro.txt | 2 +- npc/019-1_Snow_field/taro.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'npc') diff --git a/npc/014-1_Woodland/taro.txt b/npc/014-1_Woodland/taro.txt index 3ec76163..34db26b9 100644 --- a/npc/014-1_Woodland/taro.txt +++ b/npc/014-1_Woodland/taro.txt @@ -69,6 +69,6 @@ L_Tree: close; L_Warp: + close2; warp "019-1.gat",56,61; - close; } diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index f2170390..c84e4e86 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -67,6 +67,6 @@ L_Tree: close; L_Warp: + close2; warp "014-1.gat", 52, 45; - close; } -- cgit v1.2.3-60-g2f50 From 49d73c38c61af593809c8ccfcc7c9b92325cec55 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 24 Feb 2009 16:41:16 -0700 Subject: Adjust mobs on map 002-3 Also fix the exit warp --- npc/002-3_Desert_mines/_mobs.txt | 31 +++++++++++++++++++++++++++++-- npc/002-3_Desert_mines/_warps.txt | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) (limited to 'npc') diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt index 185351b5..e85bbc85 100644 --- a/npc/002-3_Desert_mines/_mobs.txt +++ b/npc/002-3_Desert_mines/_mobs.txt @@ -1,10 +1,27 @@ // 002-3 Desert mines mobs -002-3.gat,38,38,9,9 monster Red Slime 1008,10,0,0,Mob002-3::On1008 -002-3.gat,82,92,9,9 monster Black Scorpion 1009,10,0,0,Mob002-3::On1009 +002-3.gat,45,38,30,19 monster Yellow Slime 1007,5,0,0,Mob002-3::On1007 +002-3.gat,91,41,17,20 monster Snake 1010,3,0,0,Mob002-3::On1010 +002-3.gat,71,35,25,17 monster Red Slime 1008,4,0,0,Mob002-3::On1008 +002-3.gat,69,100,8,5 monster Spider 1012,2,0,0,Mob002-3::On1012 +002-3.gat,68,57,26,24 monster Black Scorpion 1009,5,0,0,Mob002-3::On1009 +002-3.gat,45,61,11,28 monster Red Slime 1008,5,0,0,Mob002-3::On1008 +002-3.gat,38,76,15,22 monster Black Scorpion 1009,4,0,0,Mob002-3::On1009 +002-3.gat,58,78,6,17 monster Red Slime 1008,2,0,0,Mob002-3::On1008 +002-3.gat,89,68,11,32 monster Black Scorpion 1009,4,0,0,Mob002-3::On1009 +002-3.gat,83,93,19,17 monster Red Slime 1008,4,0,0,Mob002-3::On1008 +002-3.gat,72,77,21,14 monster Red Slime 1008,3,0,0,Mob002-3::On1008 +002-3.gat,67,91,11,12 monster Black Scorpion 1009,2,0,0,Mob002-3::On1009 +002-3.gat,58,95,6,13 monster Snake 1010,2,0,0,Mob002-3::On1010 +002-3.gat,63,100,2,5 monster Black Scorpion 1009,1,0,0,Mob002-3::On1009 002-3.gat,0,0,0 script Mob002-3 -1,{ +On1007: + set @mobID, 1007; + callfunc "MobPoints"; + break; + On1008: set @mobID, 1008; callfunc "MobPoints"; @@ -15,5 +32,15 @@ On1009: callfunc "MobPoints"; break; +On1010: + set @mobID, 1010; + callfunc "MobPoints"; + break; + +On1012: + set @mobID, 1012; + callfunc "MobPoints"; + break; + end; } diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt index 8f5b51c2..d750d5cd 100644 --- a/npc/002-3_Desert_mines/_warps.txt +++ b/npc/002-3_Desert_mines/_warps.txt @@ -1,4 +1,4 @@ // 002-3 Desert mines warps -002-3.gat,38,30 warp CaveExit 2,-1,002-1.gat,25,95 002-3.gat,68,98 warp toLevel2 -1,-1,002-4.gat,34,98 +002-3.gat,37,29 warp Exit -1,-1,002-1.gat,25,95 -- cgit v1.2.3-60-g2f50 From 3ea6b851ee7462f0ecc83b1d7e4f539f48aa502f Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 24 Feb 2009 18:06:02 -0700 Subject: Fix Taro for older clients --- npc/014-1_Woodland/taro.txt | 2 +- npc/019-1_Snow_field/taro.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'npc') diff --git a/npc/014-1_Woodland/taro.txt b/npc/014-1_Woodland/taro.txt index 34db26b9..3ec76163 100644 --- a/npc/014-1_Woodland/taro.txt +++ b/npc/014-1_Woodland/taro.txt @@ -69,6 +69,6 @@ L_Tree: close; L_Warp: - close2; warp "019-1.gat",56,61; + close; } diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index c84e4e86..f2170390 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -67,6 +67,6 @@ L_Tree: close; L_Warp: - close2; warp "014-1.gat", 52, 45; + close; } -- cgit v1.2.3-60-g2f50 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 'npc') 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-60-g2f50 From 5ab0807cd54f6344b1d993ce0417d7c584ff147f Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 28 Feb 2009 08:49:58 -0700 Subject: Fix relative shop prices --- npc/021-1_Tulimshar/north_shops.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'npc') diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt index cf2dbbe2..51fd1139 100644 --- a/npc/021-1_Tulimshar/north_shops.txt +++ b/npc/021-1_Tulimshar/north_shops.txt @@ -3,10 +3,10 @@ // More high-end stuff to satisfy the richer people in Royal Tulimshar // Some clothing -021-1.gat,136,38,0 shop Inar 108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-8,DesertHat :-6 +021-1.gat,136,38,0 shop Inar 108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-5,DesertHat :-4 // Some general stuff -021-1.gat,128,36,0 shop Imec 162,CoinBag :-4,EmptyBottle :-10,CasinoCoins :10,CottonCloth :-10 +021-1.gat,128,36,0 shop Imec 162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6 // A snobby store that won't sell to the player 021-1.gat,138,29,0 script Latoy 106,{ -- cgit v1.2.3-60-g2f50 From e9e7c9afa201613115ed23fba69b94b002cd9bff Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 28 Feb 2009 08:57:06 -0700 Subject: Fix a bug in Jack's script --- npc/009-1_Hurnscald/jack.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'npc') diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt index 84dc15d9..2231df49 100644 --- a/npc/009-1_Hurnscald/jack.txt +++ b/npc/009-1_Hurnscald/jack.txt @@ -242,7 +242,6 @@ L_Shield_state_3: close; S_NohMask_Ask: - next; menu "I'll keep that in mind.", -, "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer; -- cgit v1.2.3-60-g2f50 From 9480d6bb5c30feb915407c23bc9daee91cbc3381 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 1 Mar 2009 12:08:48 -0700 Subject: Only take GP when divorce was successful --- npc/014-1_Woodland/wedding-officiator.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'npc') diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 662aafc6..6b7ace7e 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,14 +236,24 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; + if (divorce()) goto L_DidDivorce; + + mes "[Wedding Officiator]"; + mes "The officiator searches through her records for your partner."; + mes "\"I can't find your partner's record, you'll have to come back later.\""; + next; + + mes "[Server]"; + mes "You can only divorce if both you and your partner are logged in at the same time."; + close; + +L_DidDivorce: set zeny, zeny - @divorce_cost; - divorce; mes "[Wedding Officiator]"; mes "After collecting her fee, Wendy licks her quill and writes down some notes."; mes "Then she sighs heavily."; mes "\"You are divorced now. Thank you for your business.\""; - next; close; L_No_Room_For_Rings: -- cgit v1.2.3-60-g2f50 From 3226368a1cd36e4d6e47302493fe5e0e91dddef3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 1 Mar 2009 12:20:01 -0700 Subject: Fix some bugs in the marriage scrcipts --- conf/magic.conf | 1 + npc/014-1_Woodland/wedding-officiator.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'npc') diff --git a/conf/magic.conf b/conf/magic.conf index 390df589..e0fb308c 100644 --- a/conf/magic.conf +++ b/conf/magic.conf @@ -573,6 +573,7 @@ NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = L_yes: if marriage(@caster_name$) announce @caster_name$ + " and " + strcharinfo(0) + " are now married!", 0; + close; } IF not (is_married(caster)) diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 6b7ace7e..20c7297e 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,7 +236,8 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; - if (divorce()) goto L_DidDivorce; + + if divorce(0) goto L_DidDivorce; mes "[Wedding Officiator]"; mes "The officiator searches through her records for your partner."; -- cgit v1.2.3-60-g2f50