diff options
Diffstat (limited to 'npc/jobs/2-1')
| -rw-r--r-- | npc/jobs/2-1/hunter.txt | 6 | ||||
| -rw-r--r-- | npc/jobs/2-1/knight.txt | 13 | ||||
| -rw-r--r-- | npc/jobs/2-1/priest.txt | 4 | ||||
| -rw-r--r-- | npc/jobs/2-1/wizard.txt | 12 |
4 files changed, 26 insertions, 9 deletions
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 9637e5ff1..19d4267a9 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -645,7 +645,7 @@ OnStart: if ((getwaitingroomstate(33)) == 0) end; // stops the rest of the script from running if there is no one in the waiting room
killmonsterall "job_hunte.gat";
warpwaitingpc "job_hunte.gat", 90, 67;
- donpcevent "Ev_HntRm";
+ donpcevent "Ev_HntRm::OnStart";
end;
}
@@ -654,6 +654,7 @@ OnStart: // Ev_HntRm: Test room --------------------------------------------------------
job_hunte.gat,1,1,1 script Ev_HntRm -1,{
+OnStart:
disablenpc "SwitchHnt";
disablenpc "ExitHnt";
set $@HntMob, 4;
@@ -664,7 +665,7 @@ job_hunte.gat,1,1,1 script Ev_HntRm -1,{ monster "job_hunte.gat",53,73,"Job Change Monster",1041,1,"Ev_HntRm::OnMyMobDead1";
monster "job_hunte.gat",125,70,"Job Change Monster",1016,1,"Ev_HntRm::OnMyMobDead1";
monster "job_hunte.gat",90,92,"Job Change Monster",1015,1,"Ev_HntRm::OnMyMobDead1";
- donpcevent "Ev_HntRm2";
+ donpcevent "Ev_HntRm2::OnStart";
initnpctimer "TimerHnt";
end;
@@ -683,6 +684,7 @@ OnMyMobDead1: // Ev_HntRm2: Spawns the Decoy Monsters ----------------------------------------
job_hunte.gat,1,1,1 script Ev_HntRm2 -1,{
+OnStart:
// Decoy Monsters
monster "job_hunte.gat",85,100,"Test Monster",1016,1,"Ev_HntRm2::OnMyMobDead2";
monster "job_hunte.gat",72,102,"Test Monster",1041,1,"Ev_HntRm2::OnMyMobDead2";
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index a0f45118f..7cb5952ad 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -848,12 +848,14 @@ OnStart: killmonster "job_knt.gat", "KntLvl2::OnMyMobDead";
killmonster "job_knt.gat", "KntLvl3::OnMyMobDead";
warpwaitingpc "job_knt.gat",43,146;
- donpcevent "KntLvl1";
+ donpcevent "KntLvl1::OnStart";
end;
}
// First Level ---------------------------------------------------------
job_knt.gat,1,1,1 script KntLvl1 -1,{
+
+OnStart:
set $@KntRm, 1;
set $@KntMob,12;
monster "job_knt.gat",39,150,"Dustiness",1114,1,"KntLvl1::OnMyMobDead";
@@ -878,13 +880,15 @@ OnMyMobDead: stopnpctimer "TimerKnt";
areaannounce "job_knt.gat", 24, 126, 63, 165, "[Sir Windsor]: Get ready for the second level....",8;
set $@KntMob, 0;
- addtimer 5000, "KntLvl2";
+ addtimer 5000, "KntLvl2::OnStart";
end;
}
// Second Level ---------------------------------------------------------
job_knt.gat,1,1,1 script KntLvl2 -1,{
+
+OnStart:
set $@KntRm, 2;
set $@KntMob,12;
monster "job_knt.gat",53,52,"Frilldora",1119,1,"KntLvl2::OnMyMobDead";
@@ -910,13 +914,15 @@ OnMyMobDead: stopnpctimer "TimerKnt";
areaannounce "job_knt.gat", 24, 32, 63, 71, "[Sir Windsor]: Get ready for the third level....",8;
set $@KntMob, 0;
- addtimer 5000, "KntLvl3";
+ addtimer 5000, "KntLvl3::OnStart";
end;
}
// Third Level ---------------------------------------------------------------
job_knt.gat,1,1,1 script KntLvl3 -1,{
+
+OnStart:
set $@KntRm, 3;
set $@KntMob,7;
monster "job_knt.gat",136,152,"Knife Goblin Bro",1122,1,"KntLvl3::OnMyMobDead";
@@ -1419,6 +1425,7 @@ L_Test: // Test -----------------------------
job_knt.gat,1,1,1 script ev_Test -1,{
+
OnStart:
killmonster "job_knt.gat","ev_Test::OnMyMobDead";
monster "job_knt.gat",141,57,"Poring",1002,1,"ev_Test::OnMyMobDead";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 2abb01714..5e1a0d6c7 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -452,7 +452,7 @@ OnStart: disablenpc "prst2_1";
warpwaitingpc "job_prist.gat", 24, 44;
killmonsterall "job_prist.gat";
- donpcevent "PrstTest2_1";
+ donpcevent "PrstTest2_1::OnStart";
end;
}
@@ -461,6 +461,8 @@ OnStart: // Test 2, Part 1: Kill the Zombies \\
//********************************************************************************************************************************\\
job_prist.gat,1,1,1 script PrstTest2_1 -1,{
+
+OnStart:
set $@PrstRm, 1; //used to determine what areawarp and areaannounce to use
enablenpc "Zombie1_Trig";
enablenpc "Zombie2_Trig";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index f1dfd1ff6..b2b851d61 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -1144,12 +1144,14 @@ OnStart: disablenpc "firewarpS";
killmonsterall "job_wiz.gat"; //makes sure there are no left over mobs from other testers
warpwaitingpc "job_wiz.gat",114,169;
- donpcevent "WaterRm";
+ donpcevent "WaterRm::OnStart";
end;
}
// Room of Water -----------------------------------------------------------------------------
job_wiz.gat,1,1,1 script WaterRm -1,{
+
+OnStart:
set $@WzRm, 1; // used to determine which map area(room) to make time announcements in
set $@WzMOB, 8; //used as a counter for the monsters that are summoned
monster "job_wiz.gat",109,174,"Phen",1158,1,"WaterRm::OnMyMobDead1";
@@ -1202,6 +1204,8 @@ OnMyMobDead2: // Room of Earth -----------------------------------------------------------------------------------------------
job_wiz.gat,1,1,1 script EarthRm -1,{
+
+OnStart:
set $@WzRm, 2;
set $@WzMOB, 10;
monster "job_wiz.gat",111,102,"Yoyo",1057,1,"EarthRm::OnMyMobDead1";
@@ -1258,6 +1262,8 @@ OnMyMobDead2: // Room of Fire ------------------------------------------------------------------------------------------------------------
job_wiz.gat,1,1,1 script FireRm -1,{
+
+OnStart:
set $@WzRm, 3;
set $@WzMOB, 7;
monster "job_wiz.gat",58,110,"Zerom",1178,1,"FireRm::OnMyMobDead1";
@@ -1368,7 +1374,7 @@ job_wiz.gat,129,169,1 script waterwarpE::waterwrp 45,1,1,{ OnTimer30000:
stopnpctimer "waterwrp";
areawarp "job_wiz.gat", 98, 154, 129, 185, "job_wiz.gat",116,98;
- donpcevent "EarthRm";
+ donpcevent "EarthRm::OnStart";
end;
}
job_wiz.gat,98,169,1 duplicate(waterwrp) waterwarpW 45,1,1
@@ -1382,7 +1388,7 @@ job_wiz.gat,131,98,1 script earthwarpE::earthwrp 45,1,1,{ OnTimer30000:
stopnpctimer "earthwrp";
areawarp "job_wiz.gat", 100, 82, 131, 113, "job_wiz.gat",47,98;
- donpcevent "FireRm";
+ donpcevent "FireRm::OnStart";
end;
}
job_wiz.gat,100,98,1 duplicate(earthwrp) earthwarpW 45,1,1
|