From 8494f218353c4806cb1f98c44fb3dfe820c07b9a Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 13 Mar 2010 05:12:15 +0000 Subject: * More bug fixing! Lots of little things, really. - Corrected some condition errors in quests_veins. (bugreport:4088) - Corrected specialeffects so they play on the right NPC. (bugreport:4090) - Corrected an item ID in the reward NPC in monster races. (bugreport:4092) - Corrected NPCs overlapping with quests in msg_boards (bugreport:4093) - Corrected some of the given errors in the 2007_relay quest. (bugreport:4094) - Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102) - Commented out duplicate library curator in prontera city. (bugreport:4105) - Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/2007_relay.txt | 16 +++++++++------- npc/quests/quests_rachel.txt | 11 ++++++----- npc/quests/quests_veins.txt | 19 +++++++++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/2007_relay.txt b/npc/quests/2007_relay.txt index d0c3de548..a9d969e85 100644 --- a/npc/quests/2007_relay.txt +++ b/npc/quests/2007_relay.txt @@ -11,6 +11,7 @@ //= Party Relay Quest. //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] +//= 1.1 Fixed a couple typos, npcs check area for PCs. [L0ne_W0lf] //============================================================ payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{ @@ -2074,7 +2075,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "Don't forget now, alright?"; close; } - if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) { + if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2101,7 +2102,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "I'll see you later~"; close; } - else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) { + else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2129,7 +2130,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "I'll see you later~"; close; } - if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) { + if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2374,7 +2375,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "I just described, okay?"; close; } - if ((countitem(7735) > 0) && (.@relaytime >= 14) && (.@relaytime < 17) && (BaseClass == Jog_Acolyte)) { + if ((countitem(7735) > 0) && (.@relaytime >= 14) && (.@relaytime < 17) && (BaseClass == Job_Acolyte)) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2406,7 +2407,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "I'll see you later~"; close; } - else if ((countitem(7735) > 0) && (.@relaytime >= 18) && (.@relaytime < 21) && (BaseClass == Jog_Acolyte)) { + else if ((countitem(7735) > 0) && (.@relaytime >= 18) && (.@relaytime < 21) && (BaseClass == Job_Acolyte)) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2438,7 +2439,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{ mes "I'll see you later~"; close; } - if ((countitem(7735) > 0) && (BaseClass == Jog_Acolyte)) { + if ((countitem(7735) > 0) && (BaseClass == Job_Acolyte)) { mes "[Bafhail]"; mes "Oh, isn't that ticket...?"; mes "Ah, good, good. Judging"; @@ -2752,7 +2753,8 @@ payon,168,314,3 script Lospii#payon::RelayLospii 706,{ close; } set .@relaytime,gettime(3); - //set .@juwi,getusersinrange(7); + getmapxy(.@m$,.@x,.@y,1,strnpcinfo(3)); + set .@juwi,getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8); if (party_relay == 32) { mes "[Lospii]"; mes "Hey! Did you give"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 2b62ca76a..648451e7f 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 3.3 +//= 3.3a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -59,6 +59,7 @@ //= 3.2 Added missing updates for Peace to the Arunafeltz quest. [L0ne_W0lf] //= 3.3 Fixed occurance of PcName. [L0ne_W0lf] //= Fixed level 4 ID warps always being usable. +//= 3.3a Fixed level 4 ID warps again. (Bugreport:4102) [L0ne_W0lf] //============================================================ // Lost Child Quest (Prerequisite to High Priest quest) @@ -3840,7 +3841,7 @@ OnTouch: end; OnInit: - hideonnpc "#ice_4f_1"; + disablenpc "#ice_4f_1"; end; OnEnable: @@ -3855,7 +3856,7 @@ OnTouch: end; OnInit: - hideonnpc "#ice_4f_2"; + disablenpc "#ice_4f_2"; end; OnEnable: @@ -3870,7 +3871,7 @@ OnTouch: end; OnInit: - hideonnpc "#ice_4f_3"; + disablenpc "#ice_4f_3"; end; OnEnable: @@ -3885,7 +3886,7 @@ OnTouch: end; OnInit: - hideonnpc "#ice_4f_4"; + disablenpc "#ice_4f_4"; end; OnEnable: diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 2a63c2061..5309292c7 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -39,6 +39,7 @@ //= 1.5a Corrected a couple typos in Nameless Addition. [L0ne_W0lf] //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.7 Moved a couple NPCs related to the Spy quest. [L0ne_W0lf] +//= 1.8 Fixed some typos and confusing condition checks. [L0ne_W0lf] //============================================================ // Stone Quest @@ -194,7 +195,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ mes "by the Tavern. A-auuugh!"; close; } - else if (veins_stone < 4) { + else if ((veins_stone > 1) && (veins_stone < 4)) { mes "[Zabaroo]"; mes "Geez, Absar sure can"; mes "be fussy. Still, do your"; @@ -260,7 +261,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ else if (veins_stone < 7) { mes "[Zabaroo]"; mes "Thanks again for your help!"; - mes "What did Asbar call this"; + mes "What did Absar call this"; mes "thing again? A Tactile..."; mes "Extendable... Damn it..."; mes "Why's the name so long?"; @@ -289,7 +290,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ } else if (veins_stone > 7) { mes "[Zabaroo]"; - mes "Thanks to you and Asbar,"; + mes "Thanks to you and Absar,"; mes "my poor back hasn't been"; mes "bothering me at all lately."; mes "I should be taking better"; @@ -2910,7 +2911,7 @@ veins,327,185,3 script Kid#camelcamel 944,{ mes "if I want to free Curdie."; close; } - else if (rachel_camel <= 16) { + else if ((rachel_camel >= 12) && (rachel_camel <= 16)) { mes "["+strcharinfo(0)+"]"; mes "Well... I found the"; mes "camel. Now I need to get"; @@ -6560,11 +6561,13 @@ OnTouch: end; } else if (aru_vol == 14) { + enablenpc "Colonel Vito#1"; mes "[Colonel Vito]"; mes "What are you still"; mes "doing standing there?"; mes "Don't slack off! Come!"; close2; + disablenpc "Colonel Vito#1"; warp "thor_camp",156,68; end; } @@ -6574,7 +6577,6 @@ OnTouch: thor_camp,162,182,0 script #Colonel2 -1,7,7,{ OnTouch: //OnTouch2: - if (aru_vol == 13) { enablenpc "Colonel Vito#2"; mes "[????]"; @@ -6614,6 +6616,7 @@ OnTouch: end; } else if (aru_vol == 14) { + enablenpc "Colonel Vito#1"; mes "[Colonel Vito]"; mes "What are you still"; mes "doing standing there?"; @@ -6627,12 +6630,16 @@ OnTouch: } thor_camp,187,228,5 script Colonel Vito#1 946,{ + end; + OnInit: disablenpc "Colonel Vito#1"; end; } thor_camp,155,175,7 script Colonel Vito#2 946,{ + end; + OnInit: disablenpc "Colonel Vito#2"; end; -- cgit v1.2.3-60-g2f50