From 375891127c5b639e04cb356b37f610e95667856c Mon Sep 17 00:00:00 2001 From: SinSloth Date: Thu, 10 May 2007 09:12:40 +0000 Subject: * Players can now dismantle more than one elemental stone at once from Umbala Shaman. * Alchemists are now able to purchase up to 2000 Medicine Bowl. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10519 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/merchants/alchemist.txt | 5 ++-- npc/quests/quests_umbala.txt | 58 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 5 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index eee63bb2f..9804c675f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2007/05/11 + * Players can now dismantle more than one elemental stone at once from Umbala Shaman. [SinSloth] + * Alchemists are now able to purchase up to 2000 Medicine Bowl. [SinSloth] * Rev. 10515 More Kiel Hyre quest related updates - Fixed the wrong name being displayed for Kiel Hyre in one dialog. - Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO. diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index f94c35c50..b8c52a0a2 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena Team //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.2 Reddozen's fixes of typos. added optional Elemental //= Potion Guide. [Lupus] //= 1.3 Deleted Elemental Potions Guide due to original quest [Lupus] +//= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth] //============================================================ @@ -34,7 +35,7 @@ alde_alche,24,188,3 script Gever AI Sharp 740,{ mes "Enter '0' if you want to quit."; next; input @num; - if((@num < 1) || (@num > 1000)) goto M_Bye; + if((@num < 1) || (@num > 2000)) goto M_Bye; set @price,@num * 8; mes "[Gever AI Sharp]"; if(Zeny < @price) goto sL_NoZeny; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 2df10d6fa..c0d827751 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= sabernet09 & eAthena Team //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -27,6 +27,8 @@ //= 1.7 Moved Umbala Event, Create Essence/Dismantle Stone, and Skeletal Gate from npc/cities/umbala.txt [Evera] //= 1.7a Removed all custom quests to custom folder [Lupus] //= 1.8 Added official chance of failure to Create Essence/Dismantle Stone [Lupus] +//= 1.9 Added functionality to allow players to dismantle more +//= than a stone at once, up to 10. [SinSloth] //============================================================ @@ -843,6 +845,42 @@ um_in,44,71,2 script Utan Tribe Shaman 782,{ close; } mes "[Putsuchiritan]"; + mes "Also, my power is strong"; + mes "enough to break more than"; + mes "stone at once. How many of"; + mes "them would you like me to"; + mes "work on? Yet, I don't intend"; + mes "to work on more than 10."; + next; + input .@want; + if(.@want <= 0) + { + mes "[Putsuchiritan]"; + mes "If you don't wish my help at the moment,"; + mes "that's fine. When you do, please come"; + mes "by again."; + close; + } + if(.@want > 10) + { + mes "[Putsuchiritan]"; + mes "I'm not responsible of what"; + mes "can happen if I work on"; + mes "more than 10 stones at once."; + mes "I don't even want to try."; + close; + } + if(countitem(.@need) < .@want) + { + mes "[Putsuchiritan]"; + mes "I can't dismantle something"; + mes "that doesn't even exist. Please"; + mes "come back when you'll have the"; + mes "number of stones you want me to"; + mes "break."; + close; + } + mes "[Putsuchiritan]"; switch(.@need) { case 997: mes "I will dismantle your earth crystal"; break; case 995: mes "I will dismantle your frozen crystal"; break; @@ -853,6 +891,15 @@ um_in,44,71,2 script Utan Tribe Shaman 782,{ mes "Choose a number between 1 and 9."; mes "If you don't want me to dismantle the"; mes "stone, choose 0."; + if(.@want > 1) + { + next; + mes "[Putsuchiritan]"; + mes "Choose well your number."; + mes "It will affect my potential"; + mes "and your spirit for all the"; + mes "stones at once."; + } while(1) { next; input .@num; @@ -873,6 +920,7 @@ um_in,44,71,2 script Utan Tribe Shaman 782,{ } break; } +L_Dismantle: set .@num,rand(1,10); //official amount chance if(.@num == 1) set .@num,10; @@ -882,6 +930,10 @@ um_in,44,71,2 script Utan Tribe Shaman 782,{ set .@num,7; else set .@num,6; + set .@want,.@want -1; + set .@result,.@result + .@num; + set .@delete,.@delete +1; + if(.@want) goto L_Dismantle; mes "[Putsuchiritan]"; mes "Please place the elemental stone"; mes "inside this holy circle. I will chant a"; @@ -904,8 +956,8 @@ um_in,44,71,2 script Utan Tribe Shaman 782,{ emotion e_swt,1; close; } - delitem .@need,1; - getitem .@gain,.@num; + delitem .@need,.@delete; + getitem .@gain,.@result; mes "The elemental stone has been"; mes "dismantled into its natural"; mes "essence. Please put it to"; -- cgit v1.2.3-60-g2f50