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

Fixed a couple of bugs in Assassin job quest (#4723)

Browse Source 
* Fixed a bug where the player can't finish the quest if the NPC times out after obtaining the weapon.
*Fixed savepoints for pre-renewal.
*Thanks to @Tydus1
This commit is contained in:
Daegaladh 2020-03-27 15:32:56 +01:00 committed by GitHub
parent 34cb15ec04
commit 979e13dd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
npc/jobs/2-1/assassin.txt
View File

@ -1642,7 +1642,10 @@ OnCast:
in_moc_16,149,80,4 script Guildmaster#ASN2 106,1,1,{ in_moc_16,149,80,4 script Guildmaster#ASN2 106,1,1,{
end; end;
OnTouch_: OnTouch_:
savepoint "morocc",100,100,1,1; if (checkre(0))
savepoint "morocc",100,100,1,1;
else
savepoint "moc_ruins",79,99,1,1;
if (ASSIN_Q == 7 && BaseJob == Job_Thief) { if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
set ASSIN_Q,8; set ASSIN_Q,8;
mes "[Guildmaster]"; mes "[Guildmaster]";
@ -2094,11 +2097,10 @@ OnTouch_:
mes "It used to rule over the Assassin weapon market. Please take care of my gladius."; mes "It used to rule over the Assassin weapon market. Please take care of my gladius.";
getitem 1220,1; //Gladius_ getitem 1220,1; //Gladius_
} }
set ASSIN_Q,17; ASSIN_Q3 = 2;
set ASSIN_Q3,2;
next; next;
} }
else { else if (ASSIN_Q3 != 2) {
mes "[Guildmaster]"; mes "[Guildmaster]";
mes "Well, I talked too much."; mes "Well, I talked too much.";
mes "Please take this first."; mes "Please take this first.";
@ -2119,7 +2121,7 @@ OnTouch_:
case 5: case 5:
getitem 1252,1; //Katar getitem 1252,1; //Katar
} }
set ASSIN_Q,17; ASSIN_Q3 = 2;
} }
mes "[Guildmaster]"; mes "[Guildmaster]";
mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance."; mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance.";
@ -2129,8 +2131,12 @@ OnTouch_:
next; next;
mes "[Guildmaster]"; mes "[Guildmaster]";
mes "You, " + strcharinfo(0) + ", have chosen to live as an Assassin. May you learn our ways and be an honorable example to others."; mes "You, " + strcharinfo(0) + ", have chosen to live as an Assassin. May you learn our ways and be an honorable example to others.";
savepoint "morocc",100,100,1,1; if (checkre(0))
savepoint "morocc",100,100,1,1;
else
savepoint "moc_ruins",79,99,1,1;
getitem 1008,1; //Frozen_Heart getitem 1008,1; //Frozen_Heart
ASSIN_Q = 17;
changequest 8006,8007; changequest 8006,8007;
next; next;
mes "[Guildmaster]"; mes "[Guildmaster]";