Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed Flavius only needing 1 person on either side to start.

Browse Source 
* Updated the level 4 weapon quest to aegis conversion.
* Corrected a variable typo in the dts_warper script.
* Fixed a script hang in Hugel Temple Excavation quest.
* Fixed Cat Hand Agent checks, and mysterious rock#31.
* Corrected the two hour time limit for Sealed Shrine.
* Corrected a few other minor issues in Sealed Shrine.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14376 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-08-16 17:09:33 +00:00
parent 1c1353e59e
commit f9f50d8c09
10 changed files with 3539 additions and 3662 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/item_bonus.txt
View File

@ -331,3 +331,5 @@ bonus2 bSPDrainValue,n,x; When hitting a monster by physical attack, ...
x:
0=you gain n SP
1=you drain n SP from target
bonus2 bIgnoreDefRate,n,x; Disregard x% of the target's DEF if the target belongs to race n;

10
npc/Changelog.txt
View File

@ -1,6 +1,14 @@
Date Added
======
2010/08/11
2010/08/16
* Rev. 14376 Fixed Flavius only needing 1 person on either side to start. [L0ne_W0lf]
* Updated the level 4 weapon quest to aegis conversion.
* Corrected a variable typo in the dts_warper script.
* Fixed a script hang in Hugel Temple Excavation quest.
* Fixed Cat Hand Agent checks, and mysterious rock#31.
* Corrected the two hour time limit for Sealed Shrine.
* Corrected a few other minor issues in Sealed Shrine.
2010/08/14
* Rev. 14375 Fixed error in bg_common, and duplicate warp names. [L0ne_W0lf]
* Rev. 14374 More battleground editing, and some bug fixes. [L0ne_W0lf]
- * ALL BATTLEGROUNDS ARE NOW ACTIVE BY DEFAULT. PLEASE CONTINUE TESTING *

6
npc/battleground/flavius/flavius01.txt
View File

@ -20,7 +20,7 @@
bat_room,86,227,4 script Lieutenant Ator 418,{
end;
OnInit:
waitingroom "Battle Station",1,"start#bat_b01::OnReadyCheck",1;
waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1;
end;
OnEnterBG:
set $@FlaviusBG1_id1, waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit","");
@ -30,7 +30,7 @@ OnEnterBG:
bat_room,85,204,0 script Lieutenant Thelokus 414,{
end;
OnInit:
waitingroom "Battle Station",1,"start#bat_b01::OnReadyCheck",1;
waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1;
end;
OnEnterBG:
set $@FlaviusBG1_id2, waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit","");
@ -82,7 +82,7 @@ OnReadyCheck:
donpcevent "#bat_b01_timer::OnStop";
end;
}
if( .@Guillaume < 1 || .@Croix < 1 )
if( .@Guillaume < 10 || .@Croix < 10 )
end;
set $@FlaviusBG1, 1;
set $@FlaviusBG1_Victory, 0;

6
npc/battleground/flavius/flavius02.txt
View File

@ -20,7 +20,7 @@
bat_room,142,227,4 script Lieutenant Huvas 418,{
end;
OnInit:
waitingroom "Battle Station",1,"start#bat_b02::OnReadyCheck",1;
waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1;
end;
OnEnterBG:
set $@FlaviusBG2_id1, waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit","");
@ -30,7 +30,7 @@ OnEnterBG:
bat_room,142,204,0 script Lieutenant Yukon 414,{
end;
OnInit:
waitingroom "Battle Station",1,"start#bat_b02::OnReadyCheck",1;
waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1;
end;
OnEnterBG:
set $@FlaviusBG2_id2, waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit","");
@ -82,7 +82,7 @@ OnReadyCheck:
donpcevent "#bat_b02_timer::OnStop";
end;
}
if( .@Guillaume < 1 || .@Croix < 1 )
if( .@Guillaume < 10 || .@Croix < 10 )
end;
set $@FlaviusBG2, 1;
set $@FlaviusBG2_Victory, 0;

297
npc/instances/SealedShrine.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.4
//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -15,10 +15,12 @@
//= 1.2 Fixed Torch#12 not being disabled. (bugreport:4044) [L0ne_w0lf]
//= 1.3 Fixed cutins not being removed. (bugreport:4117) [L0ne_w0lf]
//= 1.4 Fixed some typos. [Gepard]
//= 1.5 Fixed not being able to enter dungeon for the first two hours.
//============================================================
// Sealed Catacomb Entrance
monk_test,309,146,3 script Friar Patrick#edq 412,{
if (checkquest(3040)>=0) erasequest 3040;
cutin "ins_cata_pri_n",2;
mes "[Friar Patrick]";
mes "The peace of this world cannot last forever... The hands of Evil are reaching into the world again...";
@ -70,9 +72,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
next;
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
cutin "",255;
end;
break;
case 2:
cutin "ins_cata_pri_n",2;
mes "[Friar Patrick]";
@ -80,10 +80,9 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
next;
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
cutin "",255;
end;
break;
}
break;
case 2:
if (BaseLevel > 74) {
@ -95,135 +94,118 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Do you mean you'll go to the grave and reseal Baphomet?";
next;
set .@ins_bapho_check,checkquest(3040,PLAYTIME);
// 12 hour cooldown
set .@ins_bapho_check,checkquest(3046,PLAYTIME);
// Two hour play limit
set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
if ((.@ins_bapho_check != 2) && (.@ins_bapho_check2 == 2)) {
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
close2;
cutin "",255;
end;
}
if (.@ins_bapho_check < 2) {
if (.@ins_bapho_check == -1) {
if ((getpartyleader(.@party_id,2) == getcharid(0)) && (.@partymembercount > 1)) {
set .@instance, instance_create("Sealed Catacombs", .@party_id);
if (.@instance < 0) {
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
mes "Name of the leader is "+.@partymembername$[0]+"...";
mes "Umm... But it seems that there is an unknown problem here... I'll check quickly. Please wait.";
}
else {
if (.@ins_bapho_check == -1) {
if ((getpartyleader(.@party_id,2) == getcharid(0)) && (.@partymembercount > 1)) {
set .@instance, instance_create("Sealed Catacombs", .@party_id);
if (.@instance < 0) {
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
mes "Name of the leader is "+.@partymembername$[0]+"...";
mes "Umm... But it seems that there is an unknown problem here... I'll check quickly. Please wait.";
close2;
cutin "",255;
for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
if( instance_attachmap("" + .@i + "@cata", .@instance) == "" )
break;
}
if( .@i < 2 ) {
instance_destroy(.@instance);
close;
}
instance_attach(.@instance);
instance_set_timeout 14400,300,.@instance;
instance_init(.@instance);
// First Floor
disablenpc instance_npcname("Soul of Ancient Hero#1F", instance_id());
disablenpc instance_npcname("ins_bapho_to_2f", instance_id());
for( set .@i, 1; .@i < 13; set .@i, .@i + 1 ) {
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 ) {
disablenpc instance_npcname("Bobbing Torch#"+.@i, instance_id());
}
// Second Floor
disablenpc instance_npcname("ins_baphomet_1f_timer", instance_id());
disablenpc instance_npcname("ins_2f_enter_broad", instance_id());
disablenpc instance_npcname("Magical Seal#0", instance_id());
disablenpc instance_npcname("Magical Seal#2", instance_id());
disablenpc instance_npcname("Magical Seal#4", instance_id());
disablenpc instance_npcname("Magical Seal#8", instance_id());
disablenpc instance_npcname("Magical Seal#10", instance_id());
disablenpc instance_npcname("Soul of Ancient Hero#2F", instance_id());
disablenpc instance_npcname("control_baphomet", instance_id());
disablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
disablenpc instance_npcname("2f_callmon_pattern_c", instance_id());
disablenpc instance_npcname("2f_callmon_pattern", instance_id());
disablenpc instance_npcname("ins_2f_hero_pattern_c", instance_id());
disablenpc instance_npcname("ins_2f_hero_pattern", instance_id());
// Pick proper grave
donpcevent instance_npcname("ins_baphomet_lotto", instance_id())+"::OnEnable";
// Spawn monsters.
donpcevent instance_npcname("ins_1f_spawn_mobs", instance_id())+"::OnEnable";
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
mes "Name of the leader is "+.@partymembername$[0]+"...";
mes "Okay... I'll adjust the seal of the grave so that you and your company can enter.";
next;
mes "[Friar Patrick]";
mes "You will see a sign when the control of the seal is finished. Please wait until the sign shows...";
next;
mes "[Friar Patrick]";
mes "When you see the sign, put your hands on the altar of the grave... Then you can move to inside of the grave.";
next;
mes "[Friar Patrick]";
mes "One thing that you should remember is... Anyone who enters this grave, will be cursed by Baphomet and they can't enter or leave this grave while they are cursed.";
next;
mes "[Friar Patrick]";
mes "And one more thing... In this cursed area, some skills, which are protected by outer physical power, are prohibited by the effect of the seal.";
next;
mes "[Friar Patrick]";
mes "For example, the skills like ^0000FFSafety wall, Assumptio^000000... So you'd better to prepare enoughly before enter the grave.";
}
}
else {
for( set .@i, 1; .@i <= 2; set .@i, .@i + 1 ) {
if( instance_attachmap("" + .@i + "@cata", .@instance) == "" )
break;
}
if( .@i < 2 ) {
instance_destroy(.@instance);
close;
}
instance_attach(.@instance);
instance_set_timeout 14400,300,.@instance;
instance_init(.@instance);
// First Floor
disablenpc instance_npcname("Soul of Ancient Hero#1F", instance_id());
disablenpc instance_npcname("ins_bapho_to_2f", instance_id());
for( set .@i, 1; .@i < 13; set .@i, .@i + 1 ) {
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 ) {
disablenpc instance_npcname("Bobbing Torch#"+.@i, instance_id());
}
// Second Floor
disablenpc instance_npcname("ins_baphomet_1f_timer", instance_id());
disablenpc instance_npcname("ins_2f_enter_broad", instance_id());
disablenpc instance_npcname("Magical Seal#0", instance_id());
disablenpc instance_npcname("Magical Seal#2", instance_id());
disablenpc instance_npcname("Magical Seal#4", instance_id());
disablenpc instance_npcname("Magical Seal#8", instance_id());
disablenpc instance_npcname("Magical Seal#10", instance_id());
disablenpc instance_npcname("Soul of Ancient Hero#2F", instance_id());
disablenpc instance_npcname("control_baphomet", instance_id());
disablenpc instance_npcname("ins_2f_hero_broad2", instance_id());
disablenpc instance_npcname("2f_callmon_pattern_c", instance_id());
disablenpc instance_npcname("2f_callmon_pattern", instance_id());
disablenpc instance_npcname("ins_2f_hero_pattern_c", instance_id());
disablenpc instance_npcname("ins_2f_hero_pattern", instance_id());
// Pick proper grave
donpcevent instance_npcname("ins_baphomet_lotto", instance_id())+"::OnEnable";
// Spawn monsters.
donpcevent instance_npcname("ins_1f_spawn_mobs", instance_id())+"::OnEnable";
mes "[Friar Patrick]";
mes "Party name is "+getpartyname(.@party_id)+"...";
mes "Name of the leader is "+.@partymembername$[0]+"...";
mes "Okay... I'll adjust the seal of the grave so that you and your company can enter.";
mes "Umm... I recognize your courage, but... I can't permit anyone to enter this place. I can only permit the leader of a party to enter first.";
next;
mes "[Friar Patrick]";
mes "You will see a sign when the control of the seal is finished. Please wait until the sign shows...";
next;
mes "[Friar Patrick]";
mes "When you see the sign, put your hands on the altar of the grave... Then you can move to inside of the grave.";
next;
mes "[Friar Patrick]";
mes "One thing that you should remember is... Anyone who enters this grave, will be cursed by Baphomet and they can't enter or leave this grave while they are cursed.";
next;
mes "[Friar Patrick]";
mes "And one more thing... In this cursed area, some skills, which are protected by outer physical power, are prohibited by the effect of the seal.";
next;
mes "[Friar Patrick]";
mes "For example, the skills like ^0000FFSafety wall, Assumptio^000000... So you'd better to prepare enoughly before enter the grave.";
close2;
cutin "",255;
mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand.";
}
end;
}
else {
else if ((.@ins_bapho_check == 0) || (.@ins_bapho_check == 1)) {
mes "[Friar Patrick]";
mes "Umm... I recognize your courage, but... I can't permit anyone to enter this place. I can only permit the leader of a party to enter first.";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
}
else if (.@ins_bapho_check == 2) {
mes "[Friar Patrick]";
mes "Umm... It seems that Baphomet's Curse has weakened. I can remove it now.";
next;
mes "[Friar Patrick]";
mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand.";
close2;
cutin "",255;
end;
mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!";
next;
if (checkquest(3046)) erasequest 3046;
if (checkquest(3041)) erasequest 3041;
if (checkquest(3045)) erasequest 3045;
mes "[Friar Patrick]";
mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
}
}
else if ((.@ins_bapho_check == 0) || (.@ins_bapho_check == 1)) {
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
close2;
cutin "",255;
end;
}
else if (.@ins_bapho_check == 2) {
mes "[Friar Patrick]";
mes "Umm... It seems that Baphomet's Curse has weakened. I can remove it now.";
next;
mes "[Friar Patrick]";
mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!";
next;
erasequest 3040;
erasequest 3041;
erasequest 3045;
mes "[Friar Patrick]";
mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
close2;
cutin "",255;
end;
}
}
else {
mes "[Friar Patrick]";
@ -231,10 +213,8 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
next;
mes "[Friar Patrick]";
mes "Please train more and come again.";
close2;
cutin "",255;
}
end;
break;
case 3:
if (.@doll == 1) {
mes "[Friar Patrick]";
@ -252,9 +232,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Go to see ^0000FFRust Blackhand^000000 who is near the main building of the monastery... Then he will make this doll helpful to you.";
setquest 3042;
close2;
cutin "",255;
end;
break;
}
case 4:
mes "[Friar Patrick]";
@ -262,16 +240,17 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
next;
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
cutin "",255;
end;
break;
}
close2;
cutin "",255;
end;
}
monk_test,306,151,3 script Grave of Baphomet#edq 111,{
if (countitem(6002) > 0) {
if (checkquest(3040)>=0) erasequest 3040;
if (countitem(6002) > 0)
delitem 6002,countitem(6002); //Token_Of_Apostle
}
mes "This stone-grave has a carving of a wicked devil with large horns. An ominous feeling emits from it.";
next;
switch(select("Touch this.:Step back.")) {
@ -285,18 +264,14 @@ monk_test,306,151,3 script Grave of Baphomet#edq 111,{
set .@instance, instance_id(1);
instance_attach(.@instance);
set .@ins_bapho_check,checkquest(3040,PLAYTIME);
// 12 hour cooldown
set .@ins_bapho_check,checkquest(3046,PLAYTIME);
// Two hour play limit
set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
if ((.@ins_bapho_check != 2) && (.@ins_bapho_check2 == 2)) {
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
close;
}
if (.@ins_bapho_check == -1) {
if ((.@ins_bapho_check == -1) || ((.@ins_bapho_check2 >= 0) && (.@ins_bapho_check2 < 2))) {
if (has_instance("1@cata") == "") {
mes "It's cold to the touch. But, there is no response.";
close;
}
//else if (ret == 2) {
// mes "It's cold to the touch. But, there is no response.";
@ -305,21 +280,19 @@ monk_test,306,151,3 script Grave of Baphomet#edq 111,{
else if ((has_instance("1@cata") != "") && (.@partymembercount < 2)) {
mes "[Friar Patrick]";
mes "To enter this dangerous place, you can't go alone. Come again after you join a party.";
close;
}
//else if (ret == 0) {
else {
mapannounce "monk_test","[" + strcharinfo(0) + "] member of [" + getpartyname(.@party_id) + "] party enters the Sealed catacombs.",bc_map,"0x00ff99";
setquest 3040;
setquest 3046;
setquest 3045;
warp "1@cata",100,224;
close;
}
}
else if ((.@ins_bapho_check == 0) || (.@ins_bapho_check == 1)) {
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because the curse of Baphomet still remains.";
mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
close;
}
else if (.@ins_bapho_check == 2) {
mes "[Friar Patrick]";
@ -328,17 +301,18 @@ monk_test,306,151,3 script Grave of Baphomet#edq 111,{
mes "[Friar Patrick]";
mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
specialeffect2 EF_HOLYHIT;
erasequest 3040;
erasequest 3041;
erasequest 3045;
if (checkquest(3046)) erasequest 3046;
if (checkquest(3041)) erasequest 3041;
if (checkquest(3045)) erasequest 3045;
next;
mes "[Friar Patrick]";
mes "Huu... It's over. Now I released all the curses on you. You can enter again.";
close;
}
break;
case 2:
close;
break;
}
close;
}
prt_monk,261,91,3 script Rust Blackhand#edq 826,{
@ -853,7 +827,6 @@ OnMyMobDead:
}
end;
//OnTouch2:
OnTouch:
if ('ins_baphomet == 0) {
mes "'Krrrr... Krrrr...'";
@ -990,7 +963,7 @@ OnTouch:
else {
mes "[Soul of Ancient Hero]";
mes "To remind you again, I can be substantialized in one hour. So everyone, finish your work within that time.";
set 'ins_baphomet,3;
//set 'ins_baphomet,3;
}
close2;
cutin "",255;
@ -1005,7 +978,7 @@ OnTouch:
delitem 6001,countitem(6001); //Essence_Of_Fire
set 'ins_baphomet,4;
mes "[Soul of Ancient Hero]";
mes "Okay. You've done your work. Now check your companies and tell me when everyone finished their work.";
mes "Okay. You've done your work. Now check your companions and tell me when everyone finished their work.";
}
else {
mes "[Soul of Ancient Hero]";
@ -1015,7 +988,7 @@ OnTouch:
cutin "",255;
end;
}
else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(0))) {
else if ('ins_baphomet == 3) {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "Do you have ^0000FFToken of Apostle^000000?";
@ -1023,7 +996,7 @@ OnTouch:
if (countitem(6002) > 0) {
set 'ins_baphomet,4;
mes "[Soul of Ancient Hero]";
mes "Okay. You've done your work. Tell your representative to check your companies and come to me when everyone finished their work.";
mes "Okay. You've done your work. Tell your representative to check your companions and come to me when everyone finished their work.";
}
else {
mes "[Soul of Ancient Hero]";
@ -1053,7 +1026,7 @@ OnTouch:
instance_announce 0, "Soul of Ancient Hero : Now you can go to the Main Altar's gate. It is located in the Southeast",bc_map,"0xFFFF00";
close;
}
else if (('ins_baphomet == 4) && (getpartyleader(.@party_id,2) == getcharid(0))) {
else if ('ins_baphomet == 4) {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "Are you ready? I opened the sealed gate right now. To pass the gate, you should carry ^0000FFToken of Apostle^000000.";
@ -1066,14 +1039,14 @@ OnTouch:
else if ('ins_baphomet == 5) {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "What are you doing? The entrance of the mail altar is opened right now, go and fight! Entrance is near the bottom of rightside of this floor.";
mes "What are you doing? The entrance of the main altar is opened right now, go and fight! Entrance is near the bottom of rightside of this floor.";
cutin "",255;
close;
}
else {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "I have nothing to talk to you...";
mes "I have nothing to say to you...";
cutin "",255;
close;
}
@ -1081,7 +1054,7 @@ OnTouch:
//===================== TO 2F Warp ========================
1@cata,281,12,0 script ins_bapho_to_2f 45,1,1,{
//OnTouch2:
OnTouch:
if (countitem(6002) > 0) {
delitem 6002,countitem(6002); //Token_Of_Apostle
@ -2152,9 +2125,9 @@ OnTouch:
2@cata,80,63,4 script Soul of Ancient Hero#2F 411,{
cutin "ins_cata_champ_s",2;
erasequest 3041;
erasequest 3040;
setquest 3040;
if (checkquest(3041)) erasequest 3041;
if (checkquest(3046)) erasequest 3046;
setquest 3046;
mes "[Soul of Ancient Hero]";
mes "Good job, my descendants... You've satisfied our long-cherished desire that me and my companies can't accomplish.";
next;
@ -2239,7 +2212,7 @@ OnDisable:
OnMyMobDead:
if (mobcount("2@cata",instance_npcname("control_baphomet", instance_id())+"::OnMyMobDead") < 1) {
set 'ins_baphomet,7;
setquest 3040;
setquest 3046;
erasequest 3041;
instance_announce 0, "Baphomet : No! Nonono! I get this insult again from these trivial bugs... No...",bc_map,"0xdb7093";
enablenpc instance_npcname("Soul of Ancient Hero#2F", instance_id());

7
npc/kafras/dts_warper.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera
//===== Current Version: =====================================
//= 2.7
//= 2.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -52,6 +52,7 @@
//= 2.5 Converted from Aegis file. (11.3) [L0ne_W0lf]
//= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
//= 2.7 Fixed a typo, a - to a +. Not sure how that happened. [L0ne_w0lf]
//= 2.8 Corrected another typo this time in a variable.
//============================================================
einbroch,246,70,0 script Vote Timer#ein -1,{
@ -769,7 +770,7 @@ yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{
//}
//else {
if ($DTS_Result == 0) {
if (lhz_vote <= $DTRS_VoteCount) {
if (lhz_vote <= $DTS_VoteCount) {
mes "[Cool Event Corp. Voting Staff]";
mes "Cool Event Corp.,";
mes "if chosen to provide the";
@ -833,7 +834,7 @@ yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{
}
}
else if ($DTS_Result == 3) {
if (lhz_vote <= $DTRS_VoteCount) {
if (lhz_vote <= $DTS_VoteCount) {
mes "[Cool Event Corp. Voting Staff]";
mes "Unfortunately, there wasn't";
mes "enough voter turnout in the";

6823
npc/quests/Lvl4_weapon_quest.txt
View File

File diff suppressed because it is too large Load Diff

15
npc/quests/quests_13_1.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.5
//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -32,6 +32,7 @@
//= Cat Hand Agents no longer ignore you with 300+ points.
//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
//= 1.6 Fixed check in cat hand agent.
//============================================================
// Onward to the New World
@ -8945,7 +8946,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
mes "40 or more Cat Trading Points.";
mes "Please remember, you can't come back easily once you move to Midgard.";
next;
if ((ep13_yong1 > 39) && (ep13_yong1 < 49)) {
if ((ep13_yong1 > 39) && (ep13_yong1 <= 49)) {
switch(select("Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -8961,7 +8962,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
break;
}
}
else if ((ep13_yong1 > 49) && (ep13_yong1 < 59)) {
else if ((ep13_yong1 > 49) && (ep13_yong1 < 60)) {
switch(select("Alberta -> 5500z:Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -8987,7 +8988,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
break;
}
}
else if ((ep13_yong1 > 59) && (ep13_yong1 < 69)) {
else if ((ep13_yong1 > 59) && (ep13_yong1 < 70)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -9023,7 +9024,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
break;
}
}
else if ((ep13_yong1 > 69) && (ep13_yong1 < 79)) {
else if ((ep13_yong1 > 69) && (ep13_yong1 < 80)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Geffen -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -9069,7 +9070,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
break;
}
}
else if ((ep13_yong1 > 79) && (ep13_yong1 < 89)) {
else if ((ep13_yong1 > 79) && (ep13_yong1 < 90)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {
@ -9125,7 +9126,7 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
break;
}
}
else if ((ep13_yong1 > 89) && (ep13_yong1 < 99)) {
else if ((ep13_yong1 > 89) && (ep13_yong1 < 100)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morroc -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {

29
npc/quests/quests_13_2.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 2.0
//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@ -37,6 +37,7 @@
//= 2.0 Added missing global var check in Yggdrasil Dungeon
//= floor 2 puzzle. Fixed a typo. Commented out untranslated
//= line. [Gepard]
//= 2.1 Fixed Myterious Rock 31, and Cart Hand Agents.
//============================================================
// Cat Hand Addition.
@ -161,7 +162,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
mes "[Cat Hand Agent]";
mes "With " + ep13_yong1 + " credit points, we offer the following warp services. Please remember, you can't come back easily once you move to Midgard.";
next;
if ((ep13_yong1 > 39) && (ep13_yong1 < 49)) {
if ((ep13_yong1 > 39) && (ep13_yong1 < 50)) {
switch(select("Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -178,7 +179,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
close;
}
}
else if ((ep13_yong1 > 49) && (ep13_yong1 < 59)) {
else if ((ep13_yong1 > 49) && (ep13_yong1 < 60)) {
switch(select("Alberta -> 5500z:Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -206,7 +207,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
close;
}
}
else if ((ep13_yong1 > 59) && (ep13_yong1 < 69)) {
else if ((ep13_yong1 > 59) && (ep13_yong1 < 70)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -245,7 +246,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
close;
}
}
else if ((ep13_yong1 > 69) && (ep13_yong1 < 79)) {
else if ((ep13_yong1 > 69) && (ep13_yong1 < 80)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Geffen -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -295,7 +296,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
close;
}
}
else if ((ep13_yong1 > 79) && (ep13_yong1 < 89)) {
else if ((ep13_yong1 > 79) && (ep13_yong1 < 90)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {
@ -356,7 +357,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
close;
}
}
else if ((ep13_yong1 > 89) && (ep13_yong1 < 99)) {
else if ((ep13_yong1 > 89) && (ep13_yong1 < 100)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morroc -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {
@ -1138,7 +1139,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
mes "[Cat Hand Agent]";
mes "With " + ep13_yong1 + " credit points, we offer the following warp services. Please remember, you can't come back easily once you move to Midgard.";
next;
if ((ep13_yong1 > 39) && (ep13_yong1 < 49)) {
if ((ep13_yong1 > 39) && (ep13_yong1 < 50)) {
switch(select("Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -1155,7 +1156,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
close;
}
}
else if ((ep13_yong1 > 49) && (ep13_yong1 < 59)) {
else if ((ep13_yong1 > 49) && (ep13_yong1 < 60)) {
switch(select("Alberta -> 5500z:Prontera -> 5500z:Cancel")) {
case 1:
if (Zeny >= 5500) {
@ -1183,7 +1184,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
close;
}
}
else if ((ep13_yong1 > 59) && (ep13_yong1 < 69)) {
else if ((ep13_yong1 > 59) && (ep13_yong1 < 70)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -1222,7 +1223,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
close;
}
}
else if ((ep13_yong1 > 69) && (ep13_yong1 < 79)) {
else if ((ep13_yong1 > 69) && (ep13_yong1 < 80)) {
switch(select("Alberta -> 5025z:Prontera -> 5025z:Izlude -> 5025z:Geffen -> 5025z:Cancel")) {
case 1:
if (Zeny >= 5025) {
@ -1272,7 +1273,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
close;
}
}
else if ((ep13_yong1 > 79) && (ep13_yong1 < 89)) {
else if ((ep13_yong1 > 79) && (ep13_yong1 < 90)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {
@ -1333,7 +1334,7 @@ man_fild02,132,47,4 script Cat Hand Agent#man 421,{
close;
}
}
else if ((ep13_yong1 > 89) && (ep13_yong1 < 99)) {
else if ((ep13_yong1 > 89) && (ep13_yong1 < 100)) {
switch(select("Alberta -> 4765z:Prontera -> 4765z:Izlude -> 4765z:Geffen -> 4765z:Payon -> 4765z:Morroc -> 4765z:Cancel")) {
case 1:
if (Zeny >= 4765) {
@ -2015,7 +2016,7 @@ man_fild02,146,81,0 script Mysterious Rock#31 844,{
else if (.@rhea_ran == 16) {
getitem 993,1; //Yellow_Live
}
else if (.@rhea_ran > 17) {
else if (.@rhea_ran == 17) {
getitem 6080,1; //Manuk_Coin
}
else if (.@rhea_ran > 18) {

6
npc/quests/quests_hugel.txt
View File

@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets & SinSloth
//===== Current Version: =====================================
//= 1.9
//= 2.0
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@ -22,6 +22,7 @@
//= 1.7 Corrected locations of warpinside#1. (DarkValmir) [L0ne_W0lf]
//= 1.8 Added missing checkweight. [L0ne_W0lf]
//= 1.9 Replaced effect numerics with constants. [Samuray22]
//= 2.0 Commented a break out to fix a script hang.
//============================================================
//-------------------------------------------------------------------------
@ -9030,7 +9031,8 @@ hu_in01,14,11,4 script Laura 70,{
case 2:
break;
}
break;
// Allow fall-through into the next case statment as this is a minor bug in aegis.
//break;
case 2:
mes "[Laura]";