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

Fixed Kafra length name follow up 7a011ecd3491adcd8ff82305d8e6fa9915c2a0d9

Browse Source
This commit is contained in:
Atemo 2016-10-01 22:14:14 +02:00
parent 963cfa5771
commit 6216bfbbfd
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
npc/re/guild3/agit_main_te.txt
View File

@ -70,13 +70,13 @@ OnAgitInit3:
monster .@map$,.@emproom[0],.@emproom[1],"Guardian Knight of Emperium",1219,2,.@npc_name$ +"::OnMyMobDead";
monster .@map$,.@emproom[0],.@emproom[1],"Raydric Archer",1276,5,.@npc_name$ +"::OnMyMobDead";
}
disablenpc "Kafra Employee#"+ .@map$;
disablenpc "Kafra Employee#"+ replacestr(.@map$, "cas", "");
}
else {
requestguildinfo .@guild_id;
donpcevent "::OnFlagTE" + strnpcinfo(2);// Guild emblem on flags.
if (getcastledata(.@map$,9) == 0)
disablenpc "Kafra Employee#"+ .@map$;
disablenpc "Kafra Employee#"+ replacestr(.@map$, "cas", "");
// Load purchased Guardian in castles.
if (.@map$ == "te_aldecas1") donpcevent "Clode::OnSpawnGuardians";
@ -169,8 +169,9 @@ OnAgitBreak:
OnGuildBreak:
.@map$ = strnpcinfo(4);
if (.@map$ == "") end;
killmonster .@map$, "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied";
disablenpc "Kafra Employee#"+ .@map$;
.@tmp$ = replacestr(.@map$, "cas", "");
killmonster .@map$, "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied";
disablenpc "Kafra Employee#"+ .@tmp$;
setcastledata .@map$,1,0;
sleep 7000;
announce "Guild Base [" + getcastlename(.@map$) + "] has been abandoned.",bc_all;
@ -291,7 +292,7 @@ OnMyMobDead:
}
}
else {
mes "I am instructed to only offer my services to the ^ff0000"+.@guildname$+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
mes "I am instructed to only offer my services to the ^ff0000"+ .@guildname$ +"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience.";
close2;
}
cutin "",255;
@ -415,7 +416,7 @@ function GuardianData;
else {
Zeny = Zeny - 10000;
setcastledata .@map$,(.@s+10),1;
guardian .@map$, .@x[.@s], .@y[.@s], .@name$[.@s], .@mob_id[.@s], "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied", .@s;
guardian .@map$, .@x[.@s], .@y[.@s], .@name$[.@s], .@mob_id[.@s], "Kafra Employee#"+ replacestr(.@map$, "cas", "") +"::OnGuardianDied", .@s;
mes "We completed the summoning of the Guardian. Our defenses are now increased with it in place.";
}
close;
@ -443,7 +444,7 @@ function GuardianData;
mes "Oh, my goodness! This is nonsense!";
next;
cutin "",255;
disablenpc "Kafra Employee#" + .@map$;
disablenpc "Kafra Employee#" + replacestr(.@map$, "cas", "");
setcastledata .@map$,9,0;
mes .@npc_name$;
mes "....";
@ -468,7 +469,7 @@ function GuardianData;
close;
}
Zeny = Zeny - 10000;
enablenpc "Kafra Employee#" + .@map$;
enablenpc "Kafra Employee#" + replacestr(.@map$, "cas", "");
setcastledata .@map$,9,1;
mes "We obtained a contract with the kafra Main Office, and hired a Kafra Employee.";
@ -685,10 +686,11 @@ function GuardianData {
OnSpawnGuardians:
GuardianData( .@mob_id, .@x, .@y, .@name$ );
.@map$ = strnpcinfo(4);
killmonster .@map$, "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied";
.@tmp$ = replacestr(.@map$, "cas", "");
killmonster .@map$, "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied";
for ( .@i = 0; .@i < MAX_GUARDIANS; .@i++ ) {
if (getcastledata( .@map$,(.@i+10) ))
guardian .@map$, .@x[.@i], .@y[.@i], .@name$[.@i], .@mob_id[.@i], "Kafra Employee#"+ strnpcinfo(4) +"::OnGuardianDied",.@i;
guardian .@map$, .@x[.@i], .@y[.@i], .@name$[.@i], .@mob_id[.@i], "Kafra Employee#"+ .@tmp$ +"::OnGuardianDied",.@i;
}
}

2
npc/re/guild3/te_aldecas1.txt
View File

@ -45,7 +45,7 @@ te_alde_gld,51,87,8 duplicate(Glaris#18) Glaris#21 GUILD_FLAG
// Guild kafra
//============================================================
te_aldecas1,218,170,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_aldecas1 4_F_KAFRA1
te_aldecas1,218,170,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_alde1 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_aldecas2.txt
View File

@ -40,7 +40,7 @@ te_alde_gld,99,244,4 duplicate(Defolty#15) Defolty#16 GUILD_FLAG
// Guild kafra
//============================================================
te_aldecas2,84,74,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_aldecas2 4_F_KAFRA1
te_aldecas2,84,74,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_alde2 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_aldecas3.txt
View File

@ -43,7 +43,7 @@ te_alde_gld,138,83,0 duplicate(Sorin#18) Sorin#19 GUILD_FLAG
// Guild kafra
//============================================================
te_aldecas3,118,76,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_aldecas3 4_F_KAFRA1
te_aldecas3,118,76,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_alde3 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_aldecas4.txt
View File

@ -45,7 +45,7 @@ te_alde_gld,239,239,2 duplicate(Bennit#18) Bennit#20 GUILD_FLAG
// Guild kafra
//============================================================
te_aldecas4,45,88,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_aldecas4 4_F_KAFRA1
te_aldecas4,45,88,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_alde4 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_aldecas5.txt
View File

@ -44,7 +44,7 @@ te_alde_gld,265,87,6 duplicate(W#17) W#18 GUILD_FLAG
// Guild kafra
//============================================================
te_aldecas5,31,190,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_aldecas5 4_F_KAFRA1
te_aldecas5,31,190,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_alde5 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_prtcas01.txt
View File

@ -38,7 +38,7 @@ te_prt_gld,135,60,6 duplicate(Gaebolg#11) Gaebolg#14 GUILD_FLAG
// Guild kafra
//============================================================
te_prtcas01,96,173,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_prtcas01 4_F_KAFRA1
te_prtcas01,96,173,0 duplicate(Kafra_Staff_TE) Kafra Employee#te_prt01 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_prtcas02.txt
View File

@ -40,7 +40,7 @@ te_prt_gld,236,128,8 duplicate(Richard#13) Richard#16 GUILD_FLAG
// Guild kafra
//============================================================
te_prtcas02,71,36,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prtcas02 4_F_KAFRA1
te_prtcas02,71,36,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prt02 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_prtcas03.txt
View File

@ -38,7 +38,7 @@ te_prt_gld,158,136,4 duplicate(Wigner#11) Wigner#14 GUILD_FLAG
// Guild kafra
//============================================================
te_prtcas03,181,215,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prtcas03 4_F_KAFRA1
te_prtcas03,181,215,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prt03 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_prtcas04.txt
View File

@ -38,7 +38,7 @@ te_prt_gld,122,236,6 duplicate(Heine#11) Heine#14 GUILD_FLAG
// Guild kafra
//============================================================
te_prtcas04,258,247,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prtcas04 4_F_KAFRA1
te_prtcas04,258,247,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prt04 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================

2
npc/re/guild3/te_prtcas05.txt
View File

@ -36,7 +36,7 @@ te_prt_gld,197,236,2 duplicate(Nerious#9) Nerious#12 GUILD_FLAG
// Guild kafra
//============================================================
te_prtcas05,52,41,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prtcas05 4_F_KAFRA1
te_prtcas05,52,41,4 duplicate(Kafra_Staff_TE) Kafra Employee#te_prt05 4_F_KAFRA1
// Lever 1 (warp outside treasure)
//============================================================