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

Fixed a pre-re function call in the byalan island kafra and removed some leftovers in the prontera culverts kafra.

Browse Source 
Fixed bugreport:7538 blame on r16660

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17258 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
lemongrass3110 2013-04-14 20:21:55 +00:00
parent fdeb3e605d
commit 8e66a430df
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
npc/kafras/kafras.txt
View File

@ -20,6 +20,7 @@
//= - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus
//= 1.0 Merged and cleaned up Kafras. [Joseph]
//= 1.1 Added Izlude RE coordinates. [Euphy]
//= 1.1a Fixed Pre-RE Call and some leftovers. [Lemongrass]
//============================================================
// Aldebaran
@ -598,7 +599,11 @@ niflheim,202,180,3 script Kafra Employee::kaf_niflheim 791,{
// - Byalan Island
izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 115,{
cutin "kafra_03",2;
if(BaseJob==Job_Novice && job_merchant_q2>0) callfunc "F_MercKafra"; //F_MercKafra found in merchant.txt
if( !checkre(0) && BaseJob==Job_Novice && job_merchant_q2 > 0 ){
// Merchant Job Change Quest
// function F_MercKafra is found in /pre-re/jobs/1-1/merchant.txt
callfunc "F_MercKafra";
}
mes "[Kafra Employee]";
mes "Welcome to the";
mes "Kafra Corporation.";
@ -621,10 +626,8 @@ prt_fild05,290,224,3 script Kafra Employee::prt_fild05 114,{
mes "with its excellent service. So";
mes "what can I do for you today?";
callfunc "F_Kafra",5,1,1,40,0;
M_Save:
savepoint "prt_fild05",274,243;
callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
savepoint "prt_fild05",274,243;
callfunc "F_KafEnd",0,1, "at the Prontera Culverts";
}
// - Coal Mine (Dead Pitt)

17
npc/quests/quests_moscovia.txt
View File

@ -23,6 +23,7 @@
//= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
//= 2.0 Optimized. [Joseph]
//= 2.0a Bug fixes. [Euphy]
//= 2.0b Bug fixes. [Lemongrass]
//============================================================
//============================================================================
@ -269,7 +270,14 @@ moscovia,135,52,0 script Bulletin Board#npc 837,{
// Mr. Ibanoff - Docks
//----------------------------------------------------------------------------
moscovia,135,49,5 script Mr. Ibanoff#npc 964,{
if (mos_whale_edq == 1 || mos_whale_edq == 2) {
if( !mos_whale_edq ){
mes "[Mr. Ibanoff]";
mes "You are also an adventurer from another province. I also was a great adventurer.";
next;
mes "[Mr. Ibanoff]";
mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
close;
}else if (mos_whale_edq == 1 || mos_whale_edq == 2) {
mes "["+strcharinfo(0)+"]";
mes "Hello. Are you Mr. Ibanoff?";
next;
@ -741,13 +749,6 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{
mes "You should ride a ship now? Let's ready to leave hurry up.";
set mos_whale_edq,19;
close;
} else {
mes "[Mr. Ibanoff]";
mes "You are also an adventurer from another province. I also was a great adventurer.";
next;
mes "[Mr. Ibanoff]";
mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
close;
}
if ((gettime(3) >= 0 && gettime(3) < 3) || (gettime(3) >= 6 && gettime(3) < 9) || (gettime(3) >= 12 && gettime(3) < 15) || (gettime(3) >= 18 && gettime(3) < 21)) {
mes "[Mr. Ibanoff]";