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

Corrected :

Browse Source 
-	variable typo in quests_nameless.txt
-	Suspicious Man#1 NPC localization and Xtrigger/Ytrigger in quests_nameless.txt
-	redundant message in eden_quests.txt

Merged :
-	warp eclage Hercules 64dfaf2c8c8be7ff288ea88a64eddfeae1e364a4
-	Deadman NPC localization in quest_disguiseloliruri.txt Hercules 450b0a3aeb6b472805c470712a0e6ebd9d04eb2a
-	NPC name in eclage Hercules 87beda59c824e9be6db6f86c02983ed2a44c4016 and daf5312ee4d1de6dd43b23f719e94427aeb33e5d

Signed-off-by: Atemo <capucrath@gmail.com>
This commit is contained in:
Atemo
2015-06-06 20:36:02 +02:00
parent b174e295b6
commit 36f337ea41
6 changed files with 190 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/quest_db.txt
View File

@@ -966,7 +966,7 @@
7149,0,1023,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle 2"
7150,0,1273,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle 3"
7151,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - Complete a quest"
7152,0,0,0,0,0,0,0,"bThe training course 'conquer the orc dungeon!' - start"
7152,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - start"
7153,0,1153,20,0,0,0,0,"The training course 'conquer the orc dungeon!' - A real battle 1"
7154,0,1152,20,0,0,0,0,"The training course 'conquer the orc dungeon!'- A real battle 2"
7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest"

2
npc/pre-re/quests/collection/quest_disguiseloliruri.txt
View File

@@ -13,7 +13,7 @@
//= 1.0 First version.
//============================================================
nif_fild02,332,327,4 script Deadman 795,{
nif_fild01,332,327,4 script Deadman 795,{
if (checkquest(60173) != -1) {
if (checkquest(60173,HUNTING) != 2 ) {

647
npc/quests/quests_nameless.txt
View File

@@ -4321,7 +4321,7 @@ OnTouch:
next;
set .@engine,.@engine+1;
}
else if (engine > 0) {
else if (.@engine > 0) {
mes "^3355FFThe ruby in the";
mes "engine has already";
mes "been replaced.^000000";
@@ -8045,500 +8045,223 @@ payon,192,176,3 script Gooho Ahn 903,{
close;
}
moc_ruins,90,67,3 script Suspicious Man#1 99,2,2,{
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "I know you've";
mes "been pursuing us!";
mes "Grrrr... DIE NOW!";
specialeffect EF_STEAL;
next;
mes "[" + strcharinfo(0) + "]";
mes "Wh-who are you?";
next;
mes "[????]";
mes "Y-you're stronger";
mes "than I thought!";
mes "Run awaaaaay!";
hideoffnpc "Suspicious Man#2";
hideonnpc "Suspicious Man#1";
set $@zdan,0;
stopnpctimer;
next;
mes "[" + strcharinfo(0) + "]";
mes "Huh? That man must";
mes "have dropped this";
mes "note in his haste";
mes "to get away from here.";
mes "Let's see what it says...";
next;
mes "^FFFFFF ^000000";
mes "^FFFFFF ^000000";
mes "^666666Kill " + strcharinfo(0) + ", meow.";
mes "That arrogant do-gooder";
mes "is looking into us too much.";
mes "Fail to kill him, and death";
mes "will be too good for you, meow.^000000";
next;
mes "[" + strcharinfo(0) + "]";
mes "That must have been";
mes "an informer for the Z Gang.";
mes "He can't have gotten too far:";
mes "I have a chance to catch him!";
changequest 3126,3127;
set zdan_edq,10;
close;
moc_ruins,90,67,3 script Suspicious Man#1 4W_M_03,4,4,{
if (zdan_edq == 9) {
if ($@zdan == 0)
callsub S_Quest;
else {
mes "[Suspicious Man]";
if (atoi( strnpcinfo(2) ) == 1) {
mes "...............................";
mes "...............................";
mes "............................... ";
}
else
mes "... ...";
next;
mes "[" + strcharinfo(0) + "]";
mes "Something's not quite";
mes "right. I should come back";
mes "and investigate this area";
mes "later when there are fewer";
mes "people watching...";
}
}
if ((zdan_edq == 9) && ($@zdan > 0)) {
mes "[Suspicious Man]";
mes "...............................";
mes "...............................";
mes "............................... ";
next;
mes "[" + strcharinfo(0) + "]";
mes "Something's not quite";
mes "right. I should come back";
mes "and investigate this area";
mes "later when there are fewer";
mes "people watching...";
close;
else if (zdan_edq == 10) {
if ($@zdan > 0) {
mes "[" + strcharinfo(0) + "]";
mes "Nuts! I was supposed";
mes "to try to do this secretly!";
mes "I better try to investigate";
mes "this area again when no";
mes "one is around here.";
}
else {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "Eeek...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Haha! Got you!";
mes "You're an informer for";
mes "the Z Gang, aren't you?";
next;
mes "[????]";
mes "I... I... d-don't";
mes "know what you're";
mes "talking about!";
mes "I'm innocent!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Then you're telling";
mes "me this note didn't";
mes "just fall out of your";
mes "pocket? What's this";
mes "about trying to kill me?";
next;
mes "[????]";
mes "Th-that's...";
mes "I'm not--That...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "You better confess, or";
mes "I'll drag you over to the";
mes "Prontera Knightage or the";
mes "Rogue Guild to take care";
mes "of you. In fact, let's just";
mes "head over to Prontera...";
next;
mes "[Z Gang Informer]";
mes "N-no! I'll tell you";
mes "everything! Please!";
mes "My mother's old! I've";
mes "got kids to feed!";
mes "I... I can't go to jail!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Alright.";
mes "Let's start by you";
mes "telling me where";
mes "I can find the Z Gang.";
next;
mes "[Z Gang Informer]";
mes "I... I really don't";
mes "know where to find them.";
mes "I'm at the bottom of the";
mes "food chain, I just follow";
mes "their written instructions.";
next;
mes "[" + strcharinfo(0) + "]";
mes "You know what?";
mes "Never mind. I'm won't";
mes "take you to be jailed by";
mes "the Prontera Knights.";
mes "I'll drop you off";
mes "at the Rogues.";
next;
mes "[Z Gang Informer]";
mes "...............................";
mes "Their secret hideout is in";
mes "South Morroc, and you can't";
mes "enter the place without the";
mes "secret password.";
next;
mes "[" + strcharinfo(0) + "]";
mes "Nice. Now, you better";
mes "stop running with the";
mes "Z Gang. Otherwise, I'm";
mes "not going to be so merciful";
mes "the next time I see you.";
next;
mes "[Z Gang Informer]";
mes "Anything you want!";
mes "J-just let me liiive!";
next;
mes "[" + strcharinfo(0) + "]";
mes "I should head back to";
mes "Marybell, and see if she's";
mes "learned any new information.";
changequest 3127,3128;
set zdan_edq,11;
set $@zdan,0;
stopnpctimer;
}
}
if ((zdan_edq == 10) && ($@zdan > 0)) {
mes "[" + strcharinfo(0) + "]";
mes "Nuts! I was supposed";
mes "to try to do this secretly!";
mes "I better try to investigate";
mes "this area again when no";
mes "one is around here.";
close;
}
if ((zdan_edq == 10) && ($@zdan == 0 )) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "Eeek...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Haha! Got you!";
mes "You're an informer for";
mes "the Z Gang, aren't you?";
next;
mes "[????]";
mes "I... I... d-don't";
mes "know what you're";
mes "talking about!";
mes "I'm innocent!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Then you're telling";
mes "me this note didn't";
mes "just fall out of your";
mes "pocket? What's this";
mes "about trying to kill me?";
next;
mes "[????]";
mes "Th-that's...";
mes "I'm not--That...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "You better confess, or";
mes "I'll drag you over to the";
mes "Prontera Knightage or the";
mes "Rogue Guild to take care";
mes "of you. In fact, let's just";
mes "head over to Prontera...";
next;
mes "[Z Gang Informer]";
mes "N-no! I'll tell you";
mes "everything! Please!";
mes "My mother's old! I've";
mes "got kids to feed!";
mes "I... I can't go to jail!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Alright.";
mes "Let's start by you";
mes "telling me where";
mes "I can find the Z Gang.";
next;
mes "[Z Gang Informer]";
mes "I... I really don't";
mes "know where to find them.";
mes "I'm at the bottom of the";
mes "food chain, I just follow";
mes "their written instructions.";
next;
mes "[" + strcharinfo(0) + "]";
mes "You know what?";
mes "Never mind. I'm won't";
mes "take you to be jailed by";
mes "the Prontera Knights.";
mes "I'll drop you off";
mes "at the Rogues.";
next;
mes "[Z Gang Informer]";
mes "...............................";
mes "Their secret hideout is in";
mes "South Morroc, and you can't";
mes "enter the place without the";
mes "secret password.";
next;
mes "[" + strcharinfo(0) + "]";
mes "Nice. Now, you better";
mes "stop running with the";
mes "Z Gang. Otherwise, I'm";
mes "not going to be so merciful";
mes "the next time I see you.";
next;
mes "[Z Gang Informer]";
mes "Anything you want!";
mes "J-just let me liiive!";
next;
mes "[" + strcharinfo(0) + "]";
mes "I should head back to";
mes "Marybell, and see if she's";
mes "learned any new information.";
changequest 3127,3128;
set zdan_edq,11;
set $@zdan,0;
stopnpctimer;
close;
}
if (zdan_edq < 9) {
mes "[Suspicious Man]";
else if (zdan_edq < 9) {
if (atoi( strnpcinfo(2) ) == 1)
mes "[Suspicious Man]";
else
mes "[Thug]";
mes "What? Get lost!";
mes "Listen, you don't";
mes "want to mess with";
mes "me. Just. Don't.";
close;
}
if ((zdan_edq > 10) && (zdan_edq < 15)) {
else if (zdan_edq > 10 && zdan_edq < 15) {
mes "[Z Gang Informer]";
mes "Whoa, leave me alone!";
mes "I'm just standing here";
mes "on the road, I didn't";
mes "do anything wrong!";
close;
}
if (zdan_edq > 14) {
else if (zdan_edq > 14) {
mes "[Former Z Gang Informer]";
mes "You don't have to";
mes "worry about me anymore.";
mes "I've turned over a new";
mes "leaf, got a real job,";
mes "that sort of deal.";
close;
}
mes "[Suspicious Man]";
mes "What? Get lost!";
mes "Listen, you don't";
mes "want to mess with";
mes "me. Just. Don't.";
else {
if (atoi( strnpcinfo(2) ) == 1)
mes "[Suspicious Man]";
else
mes "[Thug]";
mes "What? Get lost!";
mes "Listen, you don't";
mes "want to mess with";
mes "me. Just. Don't.";
}
close;
OnTimer30000:
set $@zdan,0;
end;
OnTouch:
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "I know you've";
mes "been pursuing us!";
mes "Grrrr... DIE NOW!";
specialeffect EF_STEAL;
next;
mes "[" + strcharinfo(0) + "]";
mes "Wh-who are you?";
next;
mes "[????]";
mes "Y-you're stronger";
mes "than I thought!";
mes "Run awaaaaay!";
hideoffnpc "Suspicious Man#2";
hideonnpc "Suspicious Man#1";
set $@zdan,0;
stopnpctimer;
next;
mes "[" + strcharinfo(0) + "] ";
mes "Huh? That man must";
mes "have dropped this";
mes "note in his haste";
mes "to get away from here.";
mes "Let's see what it says...";
next;
mes "^FFFFFF ^000000";
mes "^FFFFFF ^000000";
mes "^666666Kill " + strcharinfo(0) + ", meow.";
mes "That arrogant do-gooder";
mes "is looking into us too much.";
mes "Fail to kill him, and death";
mes "will be too good for you, meow.^000000";
next;
mes "[" + strcharinfo(0) + "]";
mes "That must have been";
mes "an informer for the Z Gang.";
mes "He can't have gotten too far:";
mes "I have a chance to catch him!";
changequest 3126,3127;
set zdan_edq,10;
close;
}
end;
}
//Incorrect position.
moc_ruins,78,167,3 script Suspicious Man#2 99,2,2,{
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "I know you've";
mes "been pursuing us!";
mes "Grrrr... DIE NOW!";
specialeffect EF_STEAL;
next;
mes "[" + strcharinfo(0) + "]";
mes "Wh-who are you?";
next;
mes "[????]";
mes "Y-you're stronger";
mes "than I thought!";
mes "Run awaaaaay!";
hideoffnpc "Suspicious Man#1";
hideonnpc "Suspicious Man#2";
set $@zdan,0;
stopnpctimer;
next;
mes "[" + strcharinfo(0) + "] ";
mes "Huh? That man must";
mes "have dropped this";
mes "note in his haste";
mes "to get away from here.";
mes "Let's see what it says...";
next;
mes "^FFFFFF ^000000";
mes "^FFFFFF ^000000";
mes "^666666Kill " + strcharinfo(0) + ", meow.";
mes "That arrogant do-gooder";
mes "is looking into us too much.";
mes "Fail to kill him, and death";
mes "will be too good for you, meow.^000000";
next;
mes "[" + strcharinfo(0) + "]";
mes "That must have been";
mes "an informer for the Z Gang.";
mes "He can't have gotten too far:";
mes "I have a chance to catch him!";
changequest 3126,3127;
set zdan_edq,10;
close;
}
if ((zdan_edq == 10) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "Eeek...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Haha! Got you!";
mes "You're an informer for";
mes "the Z Gang, aren't you?";
next;
mes "[????]";
mes "I... I... d-don't";
mes "know what you're";
mes "talking about!";
mes "I'm innocent!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Then you're telling";
mes "me this note didn't";
mes "just fall out of your";
mes "pocket? What's this";
mes "about trying to kill me?";
next;
mes "[????]";
mes "Th-that's...";
mes "I'm not--That...!";
next;
mes "[" + strcharinfo(0) + "]";
mes "You better confess, or";
mes "I'll drag you over to the";
mes "Prontera Knightage or the";
mes "Rogue Guild to take care";
mes "of you. In fact, let's just";
mes "head over to Prontera...";
next;
mes "[Z Gang Informer]";
mes "N-no! I'll tell you";
mes "everything! Please!";
mes "My mother's old! I've";
mes "got kids to feed!";
mes "I... I can't go to jail!";
next;
mes "[" + strcharinfo(0) + "]";
mes "Alright.";
mes "Let's start by you";
mes "telling me where";
mes "I can find the Z Gang.";
next;
mes "[Z Gang Informer]";
mes "I... I really don't";
mes "know where to find them.";
mes "I'm at the bottom of the";
mes "food chain, I just follow";
mes "their written instructions.";
next;
mes "[" + strcharinfo(0) + "]";
mes "You know what?";
mes "Never mind. I'm won't";
mes "take you to be jailed by";
mes "the Prontera Knights.";
mes "I'll drop you off";
mes "at the Rogues.";
next;
mes "[Z Gang Informer]";
mes "...............................";
mes "Their secret hideout is in";
mes "South Morroc, and you can't";
mes "enter the place without the";
mes "secret password.";
next;
mes "[" + strcharinfo(0) + "]";
mes "Nice. Now, you better";
mes "stop running with the";
mes "Z Gang. Otherwise, I'm";
mes "not going to be so merciful";
mes "the next time I see you.";
next;
mes "[Z Gang Informer]";
mes "Anything you want!";
mes "J-just let me liiive!";
next;
mes "[" + strcharinfo(0) + "]";
mes "I should head back to";
mes "Marybell, and see if she's";
mes "learned any new information.";
changequest 3127,3128;
set zdan_edq,11;
set $@zdan,0;
stopnpctimer;
close;
}
if ((zdan_edq == 9) && ($@zdan > 0)) {
mes "[Suspicious Man]";
mes "... ...";
next;
mes "[" + strcharinfo(0) + "]";
mes "Something's not quite";
mes "right. I should come back";
mes "and investigate this area";
mes "later when there are fewer";
mes "people watching...";
close;
}
if ((zdan_edq == 10) && ($@zdan > 0)) {
mes "[" + strcharinfo(0) + "]";
mes "Nuts! I was supposed";
mes "to try to do this secretly!";
mes "I better try to investigate";
mes "this area again when no";
mes "one is around here.";
close;
}
if (zdan_edq < 9) {
mes "[Thug]";
mes "What? Get lost!";
mes "Listen, you don't";
mes "want to mess with";
mes "me. Just. Don't.";
close;
}
if ((zdan_edq > 10) && (zdan_edq < 15)) {
mes "[Z Gang Informer]";
mes "Whoa, leave me alone!";
mes "I'm just standing here";
mes "on the road, I didn't";
mes "do anything wrong!";
close;
}
if (zdan_edq > 14) {
mes "[Former Z Gang Informer]";
mes "You don't have to";
mes "worry about me anymore.";
mes "I've turned over a new";
mes "leaf, got a real job,";
mes "that sort of deal.";
close;
}
mes "[Thug]";
mes "What? Get lost!";
mes "Listen, you don't";
mes "want to mess with";
mes "me. Just. Don't.";
close;
OnInit:
hideonnpc "Suspicious Man#2";
end;
OnTimer30000:
set $@zdan,0;
OnTouch:
if (zdan_edq == 9 && $@zdan == 0)
callsub S_Quest;
end;
OnTouch:
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "I know you've";
mes "been pursuing us!";
mes "Grrrr... DIE NOW!";
specialeffect EF_STEAL;
next;
mes "[" + strcharinfo(0) + "]";
mes "Wh-who are you?";
next;
mes "[????]";
mes "Y-you're stronger";
mes "than I thought!";
mes "Run awaaaaay!";
hideoffnpc "Suspicious Man#1";
hideonnpc "Suspicious Man#2";
set $@zdan,0;
stopnpctimer;
next;
mes "[" + strcharinfo(0) + "] ";
mes "Huh? That man must";
mes "have dropped this";
mes "note in his haste";
mes "to get away from here.";
mes "Let's see what it says...";
next;
mes "^FFFFFF ^000000";
mes "^FFFFFF ^000000";
mes "^666666Kill " + strcharinfo(0) + ", meow.";
mes "That arrogant do-gooder";
mes "is looking into us too much.";
mes "Fail to kill him, and death";
mes "will be too good for you, meow.^000000";
next;
mes "[" + strcharinfo(0) + "]";
mes "That must have been";
mes "an informer for the Z Gang.";
mes "He can't have gotten too far:";
mes "I have a chance to catch him!";
changequest 3126,3127;
set zdan_edq,10;
close;
}
end;
S_Quest:
set $@zdan,1;
initnpctimer;
mes "[????]";
mes "I know you've";
mes "been pursuing us!";
mes "Grrrr... DIE NOW!";
specialeffect EF_STEAL;
next;
mes "[" + strcharinfo(0) + "]";
mes "Wh-who are you?";
next;
mes "[????]";
mes "Y-you're stronger";
mes "than I thought!";
mes "Run awaaaaay!";
hideoffnpc "Suspicious Man#2";
hideonnpc "Suspicious Man#1";
set $@zdan,0;
stopnpctimer;
next;
mes "[" + strcharinfo(0) + "] ";
mes "Huh? That man must";
mes "have dropped this";
mes "note in his haste";
mes "to get away from here.";
mes "Let's see what it says...";
next;
mes "^666666Kill " + strcharinfo(0) + ", meow.";
mes "That arrogant do-gooder";
mes "is looking into us too much.";
mes "Fail to kill him, and death";
mes "will be too good for you, meow.^000000";
next;
mes "[" + strcharinfo(0) + "]";
mes "That must have been";
mes "an informer for the Z Gang.";
mes "He can't have gotten too far:";
mes "I have a chance to catch him!";
changequest 3126,3127;
set zdan_edq,10;
close;
}
moc_ruins,75,171,3 duplicate(Suspicious Man#1) Suspicious Man#2 4W_M_03,4,4
moc_fild17,209,235,0 script Odd Slab 111,4,4,{
if (((zdan_edq == 15) || (zdan_edq == 16) || (zdan_edq == 17)) && ($@door2 == 0)) {

4
npc/re/merchants/coin_exchange.txt
View File

@@ -830,7 +830,7 @@ malangdo,150,135,5 script Roving Merchant 495,{
// Eclage
//============================================================
ecl_in01,66,95,3 script Armor Merchant Naphara#e 436,{
ecl_in01,66,95,3 script Armor Merchant Naphara#e::glove 436,{
if (!checkweight(1301,3)) {
mes "- Stop Here!! -";
mes "- You have too many items. -";
@@ -966,7 +966,7 @@ ecl_in01,64,97,5 script Slot Expert Nattuer#ecl 436,{
close;
}
ecl_in01,33,98,5 script Armor Merchant Naphara#a 443,{ // Armor Merchant Naphara#ec - Too long changed.
ecl_in01,33,98,5 script Herb Merchant Plafina#a 443,{
if (checkweight(1301,1)==0) {
mes "- Stop Here!! -";
mes "- You have too many items. -";

3
npc/re/quests/eden/eden_quests.txt
View File

@@ -239,9 +239,6 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{
mes "[Boya]";
mes "I will certify that you completed the training.";
mes "The person in charge of equipment storage will supply you with what you need.";
next;
mes "[Boya]";
mes "The person in charge of equipment storage will supply you with what you need.";
para_suv01 = 22;
completequest 7146;
}

2
npc/re/warps/cities/eclage.txt
View File

@@ -19,7 +19,7 @@
ecl_fild01,207,72,0 warp fild01-1_biffild 1,1,bif_fild02,294,350
bif_fild02,292,351,0 warp biffild_fild01-1 1,1,ecl_fild01,205,76
//ecl_fild01,97,320,0 warp eclage_field0003 1,1,eclage,100,28
eclage,98,26,0 warp eclageS_EclEnter 1,1,eclage,100,28
eclage,98,26,0 warp eclageS_EclEnter 1,1,ecl_fild01,99,317
eclage,299,309,0 warp eclageN_in01s 1,1,ecl_in01,47,11
ecl_in01,47,8,0 warp in01s_eclageN 1,1,eclage,297,307
ecl_in01,8,67,0 warp in01w_hub1-1 1,1,ecl_hub01,38,94