* Some bug fixing! Hoorah for me not feeling lazy!

- Fixed some issues related to the guild relay quests. (bugreport:3934)
- Disabled the warp back to moc_fild22b from mid_camp. (bugreport:3985)
- Loop in sealed shrine should disable all thorches. (bugreport:4044)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14258 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-03-03 21:28:22 +00:00
parent 7475720d25
commit ec29baaa99
4 changed files with 31 additions and 21 deletions

View File

@ -1,6 +1,10 @@
Date Added
======
2010/03/03
* Rev. 14258 Some bug fixing! Hoorah for me not feeling lazy! [L0ne_W0lf]
- Fixed some issues related to the guild relay quests. (bugreport:3934)
- Disabled the warp back to moc_fild22b from mid_camp. (bugreport:3985)
- Loop in sealed shrine should disable all thorches. (bugreport:4044)
* Rev. 14257 Added some 13.2 content, and more 13.1 content. [L0ne_W0lf]
- Added "Otherworld language" quest.
- Added Cat Hand Trading NPCs for 13.2 maps.

View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.1
//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -12,6 +12,7 @@
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Added setquest for instance cooldown. [L0ne_W0lf]
//= 1.2 Fixed Torch#12 not being disabled. (bugreport:4044) [L0ne_w0lf]
//============================================================
// Sealed Catacomb Entrance
@ -137,7 +138,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
disablenpc instance_npcname("Gravestone#1F_"+.@i+"T", instance_id());
disablenpc instance_npcname("Gravestone#1F_"+.@i+"F", instance_id());
}
for( set .@i, 1; .@i < 12; set .@i, .@i + 1 ) {
for( set .@i, 1; .@i <= 12; set .@i, .@i + 1 ) {
disablenpc instance_npcname("Bobbing Torch#"+.@i, instance_id());
}

View File

@ -3,23 +3,24 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.0
//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= Guild Relay Quest.
//= Quest designed for multiple users at once.
//= Luina Castle NPCs must remain enabled.
//= Variable in use: guildrelay_q (Max: ??)
//= Variable in use: guildtime (Max: ??)
//===== Additional Comments: =================================
//= 1.0 First version.
//= 1.1 Fixed errors reported by NoHealing (Bugreport:3934) [L0ne_W0lf]
//= NPCs now duplicate from FLOATING npcs instead of Luina 1 npcs.
//============================================================
// Luina 1
// Floating NPCs to duplicate from.
//============================================================
aldeg_cas01,51,102,5 script Buzz#01::GuildRelay1 754,{
- script RelayDummy1::GuildRelay1 754,{
set .@name$,strnpcinfo(1);
if (.@name$ == "Buzz") {
set .@name2$,"Lenya";
@ -805,7 +806,7 @@ aldeg_cas01,51,102,5 script Buzz#01::GuildRelay1 754,{
}
}
else if (countitem(7238) > 0) {
if ((guildrelay_q == 86) && (BaseClass == Job_Alchemist)) {
if ((guildrelay_q == 86) && (BaseJob == Job_Alchemist)) {
mes "[" + .@name$ + "]";
mes "Hello," + strcharinfo(0) + ".";
mes "I commend you on your work.";
@ -1219,11 +1220,10 @@ aldeg_cas01,51,102,5 script Buzz#01::GuildRelay1 754,{
}
}
aldeg_cas01,75,39,3 script Lenya#01::GuildRelay2 754,{
- script RelayDummy2::GuildRelay2 754,{
set .@name$,strnpcinfo(1);
if (.@name$ == "Lenya") {
set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1);
}
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
@ -1729,11 +1729,10 @@ aldeg_cas01,75,39,3 script Lenya#01::GuildRelay2 754,{
}
}
aldeg_cas01,200,175,3 script Gealuve#01::GuildRelay3 754,{
- script RelayDummy3::GuildRelay3 754,{
set .@name$,strnpcinfo(1);
if (.@name$ == "Gealuve") {
set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1);
}
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
@ -2415,11 +2414,10 @@ aldeg_cas01,200,175,3 script Gealuve#01::GuildRelay3 754,{
close;
}
aldeg_cas01,59,224,3 script Pariz#01::GuildRelay4 754,{
- script GuildDummy4::GuildRelay4 754,{
set .@name$,strnpcinfo(1);
if (.@name$ == "Pariz") {
set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1);
}
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! You're";
mes "carrying too many items";
@ -3092,6 +3090,13 @@ aldeg_cas01,59,224,3 script Pariz#01::GuildRelay4 754,{
}
}
// Luina 1
//============================================================
aldeg_cas01,51,102,5 duplicate(GuildRelay1) Buzz#01 754,{
aldeg_cas01,75,39,3 duplicate(GuildRelay2) Lenya#01 754,{
aldeg_cas01,200,175,3 duplicate(GuildRelay3) Gealuve#01 754,{
aldeg_cas01,59,224,3 duplicate(GuildRelay4) Pariz#01 754,{
// Luina 2
//============================================================
aldeg_cas02,120,51,5 duplicate(GuildRelay1) Buzz#02 754

View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.3
//= 1.4
//===== Compatible With: =====================================
//= Any Athena Version
//===== Description: =========================================
@ -15,9 +15,9 @@
//= 1.1 Fixed a small bug by brianlew, bugreport:1824 [Brainstorm]
//= 1.2 Corrected the observatory warp portal, thanks to Ziu. [brianluau]
//= 1.3 Added warps, and also Updated warp positions. [L0ne_W0lf]
//= 1.4 Removed the warp from midgard camp to morroc field. [L0ne_W0lf]
//============================================================
mid_camp,210,293,0 warp moc_fild22b1-2 1,1,moc_fild22b,241,195
mid_camp,205,211,0 warp mid_weapon1-1 1,1,mid_campin,229,123
mid_campin,232,123,0 warp mid_weapon1-2 1,1,mid_camp,208,211
mid_camp,196,204,0 warp mid_weapon2-1 1,1,mid_campin,220,109