summaryrefslogtreecommitdiff
path: root/npc/jobs/2-1/assassin.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/2-1/assassin.txt')
-rw-r--r--npc/jobs/2-1/assassin.txt130
1 files changed, 44 insertions, 86 deletions
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 126db3baf..e4b231fcf 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1,33 +1,33 @@
//===== Hercules Script ======================================
//= Assassin Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88
-//===== Current Version: =====================================
-//= 3.5
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 3.6
+//===== Description: =========================================
//= [Official Conversion]
//= Job Change quest for Assassin class.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
-//= Also converted the booby traps from the aegis script.[kobra_k88]
+//= Also converted the booby traps from the aegis script.[kobra_k88]
//= 1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
-//= Fixed some duplicate npc names. Added missing waitingroom triggers.
-//= Fixed warp in "TimerSin", was supposed to be an areawarp.
-//= For some reason sometimes the "Nameless One" would have message windows
-//= without controls. Changed the doevent that triggers him to an
-//= addtimer and that seemed make the prob. go away[kobra_k88]
+//= Fixed some duplicate npc names. Added missing waitingroom triggers.
+//= Fixed warp in "TimerSin", was supposed to be an areawarp.
+//= For some reason sometimes the "Nameless One" would have message windows
+//= without controls. Changed the doevent that triggers him to an
+//= addtimer and that seemed make the prob. go away[kobra_k88]
//= 1.2 Fixed WRONG skillpoint check! [Lupus]
//= 1.2b Fixed missing commands and typos [Lupus]
//= 1.3 Baby class Support added [Lupus]
//= 1.5 Fixed possible EXP abuse [Lupus]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Removed Duplicates [Silent]
//= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
-//= was still able to bypass it) [Toms]
+//= was still able to bypass it) [Toms]
//= 2.4 Fixed skipping of Nameless NPC [Lupus]
//= 2.5 Fixed a Rogue exploit [Lupus]
//= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
@@ -46,9 +46,10 @@
//= 3.3 Added Quest Log commands. [Kisuka]
//= 3.4 Removed the need for use of 'goto.' [L0ne_W0lf]
//= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
-//============================================================
+//= 3.6 Fixed broken event calls. [Euphy]
+//============================================================
-in_moc_16,19,33,1 script Guildsman#asn 55,{
+in_moc_16,19,33,1 script Guildsman#asn 1_M_JOBTESTER,{
if (Upper == 1) {
mes "[Ferocious-looking guy]";
mes "Hm? You....?";
@@ -253,9 +254,9 @@ in_moc_16,19,33,1 script Guildsman#asn 55,{
mes "you to the office.";
close2;
set ASSIN_Q,0;
- if(checkquest(8000) != -1) {
+ if (checkquest(8000) != -1) {
changequest 8000,8001;
- }else{
+ } else {
setquest 8001;
}
warp "in_moc_16",19,76;
@@ -289,10 +290,10 @@ in_moc_16,19,33,1 script Guildsman#asn 55,{
}
}
-in_moc_16,25,90,1 script Guildsman#ASN2 730,2,2,{
+in_moc_16,25,90,1 script Guildsman#ASN2 4_M_JOB_ASSASSIN,2,2,{
mes "[Assassin 'Khai']";
mes "Umm?!";
- Emotion e_gasp;
+ emotion e_gasp;
next;
mes "[Assassin 'Khai']";
mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";
@@ -380,7 +381,7 @@ OnTouch:
close;
case 2:
mes "[Assassin 'Khai']";
- if (sex) {
+ if (Sex) {
mes "Huh. You must have a lot of self confidence to be a Thief nowadays.";
next;
mes "[Assassin 'Khai']";
@@ -1093,7 +1094,7 @@ OnTouch:
}
}
-in_moc_16,21,165,2 script Standby Room#ASNTEST 725,{
+in_moc_16,21,165,2 script Standby Room#ASNTEST 4_F_JOB_ASSASSIN,{
end;
OnInit:
@@ -1105,12 +1106,10 @@ OnInit:
OnStartArena:
warpwaitingpc "in_moc_16", 66, 151;
attachrid($@warpwaitingpc[0]);
- if(ASSIN_Q2<5)
- {
+ if (ASSIN_Q2 < 5) {
warpchar "in_moc_16",20,145,getcharid(0);
end;
}
-
donpcevent "Beholder#ASNTEST::OnEnable";
donpcevent "Keeper of the Door#ASN::OnDisable";
set getvariableofnpc(.DisableTraps,"Beholder#ASNTEST"),0;
@@ -1122,7 +1121,7 @@ OnStart:
end;
}
-in_moc_16,21,165,2 script Test Guide#ASN 725,4,4,{
+in_moc_16,21,165,2 script Test Guide#ASN 4_F_JOB_ASSASSIN,4,4,{
end;
OnTouch:
@@ -1445,7 +1444,7 @@ in_moc_16,86,147,0 duplicate(SinTrap) 18_2 -1,0,0
in_moc_16,87,146,0 duplicate(SinTrap) 18_3 -1,0,0
in_moc_16,87,147,0 duplicate(SinTrap) 18_4 -1,0,0
-in_moc_16,87,137,0 script Keeper of the Door#ASN 45,2,1,{
+in_moc_16,87,137,0 script Keeper of the Door#ASN WARPNPC,2,1,{
OnInit:
disablenpc "Keeper of the Door#ASN";
end;
@@ -1493,7 +1492,7 @@ OnMyMobDead:
end;
}
-in_moc_16,89,98,1 script Thomas#ASNTEST 118,5,1,{
+in_moc_16,89,98,1 script Thomas#ASNTEST 2_M_THIEFMASTER,5,1,{
end;
OnTouch:
@@ -1583,7 +1582,7 @@ OnDisable:
end;
}
-in_moc_16,87,48,2 script Barcardi#ASN 725,2,2,{
+in_moc_16,87,48,2 script Barcardi#ASN 4_F_JOB_ASSASSIN,2,2,{
OnTouch:
donpcevent "timestopper#1::OnDisable";
donpcevent "Thomas#ASNTEST::OnDisable";
@@ -1597,7 +1596,7 @@ OnTouch:
end;
}
-in_moc_16,182,169,0 script Maze Assistant 45,1,1,{
+in_moc_16,182,169,0 script Maze Assistant WARPNPC,1,1,{
OnTouch:
if (ASSIN_Q == 5 || ASSIN_Q == 6) {
warp "in_moc_16",181,183;
@@ -1607,7 +1606,7 @@ OnTouch:
else {
mapannounce "in_moc_16",strcharinfo(0)+" has entered 'Guildmaster's room.'",bc_map;
savepoint "in_moc_16",181,183;
- donpcevent "Guildmaster#ASN2::OnDisable";
+ donpcevent "Guildmaster#ASN1::OnCast";
warp "in_moc_16",167,113;
end;
}
@@ -1629,12 +1628,12 @@ OnTouch:
mes "at the end of maze.";
close;
-OnDisable:
+OnCast:
mapannounce "in_moc_16","...Next volunteer, please come in.",bc_map;
end;
}
-in_moc_16,149,80,4 script Guildmaster#ASN2 106,1,1,{
+in_moc_16,149,80,4 script Guildmaster#ASN2 1_M_MOC_LORD,1,1,{
OnTouch:
savepoint "morocc",100,100;
if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
@@ -1882,7 +1881,7 @@ OnTouch:
mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature.";
next;
mes "[Guildmaster]";
- if (sex )
+ if (Sex)
mes "But you must never reveal to her the Assassin side of your life. No matter what it takes.";
else
mes "But you must never reveal to him the Assassin side of your life, no matter what it takes.";
@@ -1996,7 +1995,7 @@ OnTouch:
mes "'Beholder,' what";
mes "is your opinion?";
next;
- donpcevent "[Huey]::OnDisable";
+ disablenpc "[Huey]";
mes "[Beholder]";
mes "Well, I don't like the course score. But, somehow the whole test was passed. I'm okay with this person.";
next;
@@ -2173,7 +2172,7 @@ OnTouch:
}
}
-in_moc_16,186,81,1 script Master Assist 55,1,1,{
+in_moc_16,186,81,1 script Master Assist 1_M_JOBTESTER,1,1,{
mes "[Assistent Gayle Maroubitz]";
mes "Sorry, but I'm not in charge of job changes. Go to the Guildmaster, as he has told you.";
close;
@@ -2240,58 +2239,17 @@ OnTouch:
close;
}
-in_moc_16,156,87,1 script [Huey] 55,{
- end;
-
-OnInit:
- disablenpc "[Huey]";
- end;
-}
-
-in_moc_16,156,85,1 script [Khai] 730,{
- end;
-
-OnInit:
- disablenpc "[Khai]";
- end;
-}
-
-in_moc_16,156,83,1 script [The Anonymous One] 106,{
- end;
-
-OnInit:
- disablenpc "[The Anonymous One]";
- end;
-}
-
-in_moc_16,156,81,2 script [Barcardi] 725,{
- end;
-
-OnInit:
- disablenpc "[Barcardi]";
- end;
-}
-
-in_moc_16,156,79,1 script [Beholder] 118,{
- end;
-
-OnInit:
- disablenpc "[Beholder]";
- end;
-}
-
-in_moc_16,156,77,1 script [Thomas] 118,{
- end;
-
-OnInit:
- disablenpc "[Thomas]";
- end;
-}
-
-in_moc_16,156,75,1 script [Gayle Maroubitz] 55,{
+- script #moc_assin_dup -1,{
end;
OnInit:
- disablenpc "[Gayle Maroubitz]";
+ disablenpc strnpcinfo(0);
end;
}
+in_moc_16,156,87,1 duplicate(#moc_assin_dup) [Huey] 1_M_JOBTESTER
+in_moc_16,156,85,1 duplicate(#moc_assin_dup) [Khai] 4_M_JOB_ASSASSIN
+in_moc_16,156,83,1 duplicate(#moc_assin_dup) [The Anonymous One] 1_M_MOC_LORD
+in_moc_16,156,81,2 duplicate(#moc_assin_dup) [Barcardi] 4_F_JOB_ASSASSIN
+in_moc_16,156,79,1 duplicate(#moc_assin_dup) [Beholder] 2_M_THIEFMASTER
+in_moc_16,156,77,1 duplicate(#moc_assin_dup) [Thomas] 2_M_THIEFMASTER
+in_moc_16,156,75,1 duplicate(#moc_assin_dup) [Gayle Maroubitz] 1_M_JOBTESTER
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-26 22:03:06 +0000