summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorAnnieRuru <jeankof@ymail.com>2015-12-21 20:12:45 +0800
committerHaru <haru@dotalux.com>2015-12-31 23:39:22 +0100
commitefaaf842dc3717e21b915edf37b3e907b02fa5a1 (patch)
tree5412410e6c953b7abc42b7a6c21d28e78b3688ef /npc/jobs
parentef171a8ac1e063ca98cc6c8e9788a2ddcfa6fa35 (diff)
downloadhercules-efaaf842dc3717e21b915edf37b3e907b02fa5a1.tar.gz
hercules-efaaf842dc3717e21b915edf37b3e907b02fa5a1.tar.bz2
hercules-efaaf842dc3717e21b915edf37b3e907b02fa5a1.tar.xz
hercules-efaaf842dc3717e21b915edf37b3e907b02fa5a1.zip
Replace -1,{ with FAKE_NPC,{
replace using Notepad++
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/2-1/assassin.txt10
-rw-r--r--npc/jobs/2-1/hunter.txt2
-rw-r--r--npc/jobs/2-1/knight.txt6
-rw-r--r--npc/jobs/2-1/priest.txt2
-rw-r--r--npc/jobs/2-2/crusader.txt14
-rw-r--r--npc/jobs/2-2/dancer.txt4
-rw-r--r--npc/jobs/2-2/monk.txt4
-rw-r--r--npc/jobs/2-2/rogue.txt2
-rw-r--r--npc/jobs/2-2/sage.txt8
9 files changed, 26 insertions, 26 deletions
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index c994fe5d6..e026f334f 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1194,7 +1194,7 @@ OnTouch:
}
}
-in_moc_16,1,1,0 script Beholder#ASNTEST -1,{
+in_moc_16,1,1,0 script Beholder#ASNTEST FAKE_NPC,{
end;
OnEnable:
@@ -1465,7 +1465,7 @@ OnDisable:
end;
}
-in_moc_16,3,3,0 script timestopper#1 -1,{
+in_moc_16,3,3,0 script timestopper#1 FAKE_NPC,{
OnEnable:
initnpctimer;
end;
@@ -2174,7 +2174,7 @@ in_moc_16,186,81,1 script Master Assist 1_M_JOBTESTER,1,1,{
close;
}
-in_moc_16,170,90,0 script info 1 -1,{
+in_moc_16,170,90,0 script info 1 FAKE_NPC,{
OnTouch:
mes "[Guildmaster]";
mes "Huh.";
@@ -2206,7 +2206,7 @@ OnTouch:
close;
}
-in_moc_16,164,88,0 script info 5 -1,{
+in_moc_16,164,88,0 script info 5 FAKE_NPC,{
OnTouch:
mes "[Guildmaster]";
mes "Well done...";
@@ -2235,7 +2235,7 @@ OnTouch:
close;
}
-- script #moc_assin_dup -1,{
+- script #moc_assin_dup FAKE_NPC,{
end;
OnInit:
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 53d273deb..6733055ad 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -1619,7 +1619,7 @@ job_hunte,64,92,0 duplicate(HntTrap) 57-1 -1,0,0
job_hunte,64,93,0 duplicate(HntTrap) 57-2 -1,0,0
job_hunte,65,92,0 duplicate(HntTrap) 57-3 -1,0,0
-job_hunte,65,93,0 script 57-4::HntTrap2 -1,{
+job_hunte,65,93,0 script 57-4::HntTrap2 FAKE_NPC,{
OnTouch:
mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
HNTR_Q = 13;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index d0308d771..462e45fc0 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1245,7 +1245,7 @@ OnStart:
end;
}
-- script Knight1 -1,{
+- script Knight1 FAKE_NPC,{
OnInit:
disablenpc "Knight1";
end;
@@ -1309,7 +1309,7 @@ OnTimer182000:
}
//== Test 2 part 2 =========================================
-- script Knight2 -1,{
+- script Knight2 FAKE_NPC,{
OnInit:
disablenpc "Knight2";
end;
@@ -1372,7 +1372,7 @@ OnTimer182000:
}
//== Test 2 part 3 =========================================
-- script Knight3 -1,{
+- script Knight3 FAKE_NPC,{
OnInit:
disablenpc "Knight3";
end;
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index cb5cf7fe1..f0ba8bf00 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1166,7 +1166,7 @@ OnTimer302000:
end;
}
-- script Z_C#prst -1,{
+- script Z_C#prst FAKE_NPC,{
end;
OnMyMobDead:
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index fc97351d5..b0854689c 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -978,7 +978,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
//== Actual tests ==========================================
//- Endurance Test -
-job_cru,1,1,1 script Summoner#cr1 -1,{
+job_cru,1,1,1 script Summoner#cr1 FAKE_NPC,{
OnTimer300000:
donpcevent "Summoner#cr1::OnReset";
end;
@@ -1039,7 +1039,7 @@ OnDead:
end;
}
-job_cru,1,2,1 script Summoner#cr2 -1,{
+job_cru,1,2,1 script Summoner#cr2 FAKE_NPC,{
OnTimer345000:
donpcevent "Summoner#cr2::OnReset";
end;
@@ -1090,7 +1090,7 @@ OnDead:
end;
}
-job_cru,1,3,1 script Summoner#cr3 -1,{
+job_cru,1,3,1 script Summoner#cr3 FAKE_NPC,{
OnTimer345000:
donpcevent "Summoner#cr3::OnReset";
end;
@@ -1143,7 +1143,7 @@ OnDead:
end;
}
-job_cru,1,4,1 script Summoner#cr4 -1,{
+job_cru,1,4,1 script Summoner#cr4 FAKE_NPC,{
OnTimer345000:
donpcevent "Summoner#cr4::OnReset";
end;
@@ -1263,7 +1263,7 @@ OnTouch:
close;
}
-job_cru,2,1,1 script Monster Summon#cr0 -1,{
+job_cru,2,1,1 script Monster Summon#cr0 FAKE_NPC,{
OnInit:
disablenpc "Monster Summon#cr0";
end;
@@ -1400,7 +1400,7 @@ OnEnd:
}
-job_cru,168,150,0 script Monster Summon#cr4-a -1,{
+job_cru,168,150,0 script Monster Summon#cr4-a FAKE_NPC,{
OnDead:
donpcevent "Monster Summon#cr5::OnStart";
end;
@@ -1432,7 +1432,7 @@ OnEnd:
end;
}
-job_cru,2,2,1 script Monster Summon#cr6 -1,{
+job_cru,2,2,1 script Monster Summon#cr6 FAKE_NPC,{
OnTimer241000:
areawarp "job_cru",160,14,175,178,"job_cru",24,169;
donpcevent "Monster Summon#cr0::OnReset";
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 4ceb4ca99..3714e9e1a 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -955,7 +955,7 @@ job_duncer,32,154,1 script Waiting Room#click 1_F_01,{
}
//== Dance Timer ===========================================
-job_duncer,69,105,0 script Bijou#dance_timer -1,{
+job_duncer,69,105,0 script Bijou#dance_timer FAKE_NPC,{
OnEnable:
initnpctimer;
end;
@@ -1324,7 +1324,7 @@ job_duncer,66,110,0 duplicate(StepTrigger) dance#left -1,1,1
job_duncer,72,110,0 duplicate(StepTrigger) dance#right -1,1,1
job_duncer,69,110,0 duplicate(StepTrigger) dance#cen -1,1,1
-job_duncer,10,10,0 script dance#poring -1,{
+job_duncer,10,10,0 script dance#poring FAKE_NPC,{
OnEnable:
monster "job_duncer",69,106,"Poring",1002,1,"dance#poring::OnMyMobDead";
end;
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index b7ec9ffaa..a9be752a6 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -2015,7 +2015,7 @@ OnTouch:
}
}
-monk_test,82,384,0 script Trap#t_monk1_1::MonkTrap -1,{
+monk_test,82,384,0 script Trap#t_monk1_1::MonkTrap FAKE_NPC,{
OnTouch:
mapannounce "monk_test",""+ strcharinfo(0) + ", you're trapped. You will be returned.",bc_map;
warp "monk_test",387,387;
@@ -2573,7 +2573,7 @@ OnTouch:
end;
}
-monk_test,3,3,0 script resetter#monk -1,{
+monk_test,3,3,0 script resetter#monk FAKE_NPC,{
OnTimer500000:
donpcevent "mob_monk#1_1::OnDisable";
donpcevent "mob_monk#1_2::OnDisable";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 9181492cc..4239d9f29 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1980,7 +1980,7 @@ OnTouch:
end;
}
-in_rogue,3,3,0 script resetter#rogue -1,{
+in_rogue,3,3,0 script resetter#rogue FAKE_NPC,{
OnTimer500000:
donpcevent "mob_rogue#1::OnDisable";
donpcevent "mob_rogue#2::OnDisable";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index b3a7ac4b7..32c4d172e 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2686,7 +2686,7 @@ OnTimer186000:
end;
}
-- script Arena#2 -1,{
+- script Arena#2 FAKE_NPC,{
OnInit:
disablenpc "Arena#2";
end;
@@ -2789,7 +2789,7 @@ OnTimer186000:
end;
}
-- script Arena#Doorkeeper -1,{
+- script Arena#Doorkeeper FAKE_NPC,{
OnInit:
disablenpc "Arena#Doorkeeper";
end;
@@ -2855,7 +2855,7 @@ OnTimer63000:
end;
}
-- script Arena#3 -1,{
+- script Arena#3 FAKE_NPC,{
OnInit:
disablenpc "Arena#3";
end;
@@ -2872,7 +2872,7 @@ OnDisable:
end;
}
-- script Test Helper#sg -1,{
+- script Test Helper#sg FAKE_NPC,{
OnInit:
disablenpc "Test Helper#sg";
end;