From adfbb8ff8fdde71238cdf5f51a5a2edc5a29c937 Mon Sep 17 00:00:00 2001 From: euphyy Date: Sun, 10 Jun 2012 01:37:17 +0000 Subject: * Massive compression of "Card Trader" script, from 123kb to 7kb! (other\card_trader.txt) * Some optimization of Ash-Vacuum quests (quests\quests_13_1.txt) * "Sphinx Mask Quest" script optimized (custom\quests\sphinx_mask.txt) * Moved "Caral" NPC from non-existent moc_fild04 to cmd_fild08, as per bugreport:5959 (custom\quests\thq\THQS_Quests.txt) * Fixed Job_Archbishop/Job_Archbishop_T typos in job change script, but other issues in bugreport:5938 not addressed (jobs\3-1\archbishop.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16254 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/custom/quests/sphinx_mask.txt | 86 ++++++++++++----------------------- npc/custom/quests/thq/THQS_Quests.txt | 5 +- 2 files changed, 33 insertions(+), 58 deletions(-) (limited to 'npc/custom') diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt index 8c1a42072..00910428c 100644 --- a/npc/custom/quests/sphinx_mask.txt +++ b/npc/custom/quests/sphinx_mask.txt @@ -3,76 +3,50 @@ //===== By: ================================================== //= sabernet09 //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= this quest is related to Umbalian Chief +//= This quest is related to Umbalian Chief. //= 1.1 Removed it from official Umbala quests [Lupus] //= 1.2 Added a missing variable (sphmask_q) [erKURITA] +//= 1.3 Optimized, and coordinates moved. [Euphy] //============================================================ -morocc,140,156,5 script Turban Thief 58,{ - if(event_umbala < 2) goto AWAY; - if(sphmask_q) goto NoBus; - mes "[Turban Thief]"; - mes "E'llo mah frien, would I interesst tu with this rare mask? Its value I assure you is real mah frien. Tis manific!"; +morocc,208,90,6 script Turban Thief 58,{ + mes "[Turban Thief]"; + if(event_umbala < 2) { + mes "What do you wan te withz me? Be gone!"; + close; } + if(sphmask_q) { + mes "You have no more business with me, go away!"; + close; } + mes "E'llo mah frien, would I interesst tu with this rare mask? Its value I assure you is real mah frien. Tis manific!"; next; - mes "[Turban Thief]"; - mes "Wah? O ho ho ho, so you know thaz I steal dis from those savages no? Well I won'tz give it back. But I will for a pricez... wat you say?"; + callsub L_Menu,1,"1,000,000",1000000; + callsub L_Menu,2,"750,000",750000; + callsub L_Menu,3,"500,000",500000; next; - menu "Pay 1,000,000z",-,"No deal",NoGo; - - if(Zeny < 1000000) goto NotEnough; - set Zeny,Zeny-1000000; mes "[Turban Thief]"; - mes "O ho ho, its a deal then!"; - getitem 7114,1;//Items: Sphinx Mask, + mes "Ack! Forgez it! I can do bettaz en elsez where!"; set sphmask_q,1; close; -NoGo: +L_Menu: mes "[Turban Thief]"; - mes "Ahh a business man are you no? Fine, how about..."; + switch(getarg(0)) { + case 1: mes "Wah? O ho ho ho, so you know thaz I steal dis from those savages no? Well I won'tz give it back. But I will for a pricez... wat you say?"; break; + case 2: mes "Ahh a business man are you no? Fine, how about..."; break; + case 3: mes "Hmmm... you drive a hard bargain, ok... my final offer..."; break; } next; - menu "Pay 750,000",-,"Nope lower",NoGoB; - - if(Zeny < 750000) goto NotEnough; - set Zeny,Zeny-750000; - mes "[Turban Thief]"; - mes "It is a done deal, no refunds!"; - getitem 7114,1;//Items: Sphinx Mask, - set sphmask_q,1; - close; -NoGoB: - mes "[Turban Thief]"; - mes "Hmmm... you drive a hard bargain, ok... my final offer..."; - next; - menu "Pay 500,000",-,"It can go lower than that.",NoGoC; - - if(Zeny < 500000) goto NotEnough; - set Zeny,Zeny-500000; - mes "[Turban Thief]"; - mes "Alright, here you go then..."; - getitem 7114,1;//Items: Sphinx Mask, + if(select("Pay "+getarg(1)+"z:No deal")==2) return; + mes "[Turban Thief]"; + if (Zeny < getarg(2)) { + mes "Are youz playin wit me? You don't have ze money!"; + close; } + set Zeny, Zeny-getarg(2); + mes "O ho ho, it's a deal, then!"; + getitem 7114,1; set sphmask_q,1; close; -NoGoC: - next; - mes "[Turban Thief]"; - mes "Ack! Forgez it! I can do bettaz en elsez where!"; - set sphmask_q,1; - close; -NoBus: - mes "[Turban Thief]"; - mes "You have no more business with me, go away!"; - close; -AWAY: - mes "[Turban Thief]"; - mes "What do you wan te withz me? Be gone!"; - close; -NotEnough: - mes "[Turban Thief]"; - mes "Are youz playin wit me? You don't have ze money!"; - close; -} +} \ No newline at end of file diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index 132c5bf33..b1e6c1652 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Fredzilla //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.3 Removed Duplicates [Silent] //= 1.4 Further removed duplicates. [L0ne_W0lf] //= 1.5 Fixed name collision with 'Little Girl' in cities/lutie.txt [Ai4rei] +//= 1.6 Changed "Caral" coordinates because moc_fild04 no longer exists. [Euphy] //============================================================ ///////Job list 1/////// @@ -1000,7 +1001,7 @@ N_QuestStart: close; } //10-3; -moc_fild04,193,51,6 script Caral 119,{ +cmd_fild08,328,349,4 script Caral 119,{ if (ten_qset == 3 && countitem(1015) > 0) goto N_QuestComp; if (ten_qset == 3) goto N_QuestStart; mes "[Caral]"; -- cgit v1.2.3-60-g2f50