summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-29 02:16:49 +0100
committerHaru <haru@dotalux.com>2015-12-31 23:39:23 +0100
commitb4c99db7d5a500770383e24ef2fd1f956b19da74 (patch)
treeafb1e9ad57cb48d4bb826183d630e99e840f9f8f /npc/re
parentefaaf842dc3717e21b915edf37b3e907b02fa5a1 (diff)
downloadhercules-b4c99db7d5a500770383e24ef2fd1f956b19da74.tar.gz
hercules-b4c99db7d5a500770383e24ef2fd1f956b19da74.tar.bz2
hercules-b4c99db7d5a500770383e24ef2fd1f956b19da74.tar.xz
hercules-b4c99db7d5a500770383e24ef2fd1f956b19da74.zip
Replaced leftover -1 view IDs with FAKE_NPC
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/instances/MalangdoCulvert.txt6
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt12
-rw-r--r--npc/re/jobs/3-1/warlock.txt2
-rw-r--r--npc/re/quests/quests_malangdo.txt46
-rw-r--r--npc/re/quests/quests_malaya.txt20
5 files changed, 43 insertions, 43 deletions
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 30c16e9d8..e72833640 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -1054,10 +1054,10 @@ OnTouch:
2@pump,100,74,4 duplicate(#Culvert_h1) #Culvert_h9 CLEAR_NPC,14,14
2@pump,115,50,4 duplicate(#Culvert_h1) #Culvert_h10 CLEAR_NPC,14,14
-2@pump,1,1,4 duplicate(Monster Hole#n) Monster Hole#h -1
-2@pump,1,1,4 duplicate(Boss Creation#n) Boss Creation#h -1
+2@pump,1,1,4 duplicate(Monster Hole#n) Monster Hole#h FAKE_NPC
+2@pump,1,1,4 duplicate(Boss Creation#n) Boss Creation#h FAKE_NPC
2@pump,39,88,4 duplicate(Missing, the Cleaner#no) Missing, the Cleaner#ho 4_CAT_SAILOR2
2@pump,38,100,0 duplicate(Culvert Entrance#n) Culvert Entrance#h WARPNPC,3,3
//MD_Putmob "2@pump" 0 0 0 0 20 HYDRA 0 0 2
-2@pump,1,1,4 duplicate(Hydra#n) Hydra#h -1
+2@pump,1,1,4 duplicate(Hydra#n) Hydra#h FAKE_NPC
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index c4ed09b19..e9ae1c0af 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -1372,7 +1372,7 @@ lhz_dun03,239,78,1 script lhz_dun03_lhz_dun04 WARPNPC,1,1,{
lhz_dun04,244,61,1 warp lhz_dun04_lhz_dun03 1,1,lhz_dun03,240,75
//== Inside the Lab ========================================
-que_lhz,242,50,0 script #01Startpoint -1,3,3,{
+que_lhz,242,50,0 script #01Startpoint FAKE_NPC,3,3,{
end;
OnInit:
@@ -1582,7 +1582,7 @@ que_lhz,147,224,4 script Researcher#04 4_LGTSCIENCE,{
}
//== Warp to lhz_dun04 from Wolfchev's Lab =================
-que_lhz,148,251,0 script #Move2lab -1,12,0,{
+que_lhz,148,251,0 script #Move2lab FAKE_NPC,12,0,{
end;
OnTouch:
@@ -2260,7 +2260,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
}
//== The Lab No.2 ==========================================
-1@lhz,151,29,0 script #2_0 -1,1,1,{
+1@lhz,151,29,0 script #2_0 FAKE_NPC,1,1,{
end;
OnEnable:
@@ -2465,7 +2465,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
}
//== The Lab No.2 2_3 System ===============================
-1@lhz,151,48,0 script #2_3 -1,20,20,{
+1@lhz,151,48,0 script #2_3 FAKE_NPC,20,20,{
end;
OnInstanceInit:
@@ -2626,7 +2626,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
}
//== The Lab No.3 ==========================================
-1@lhz,84,28,0 script #3_0 -1,1,1,{
+1@lhz,84,28,0 script #3_0 FAKE_NPC,1,1,{
end;
OnEnable:
@@ -2824,7 +2824,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{
}
//== The Lab No.4 ==========================================
-1@lhz,137,100,0 script #4_0 -1,1,1,{
+1@lhz,137,100,0 script #4_0 FAKE_NPC,1,1,{
end;
OnEnable:
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index cc9970c88..e068a963a 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -877,7 +877,7 @@ OnTimer305000:
stopnpctimer;
end;
}
-- duplicate(The chamber of magic#2) The chamber of magic#3 -1
+- duplicate(The chamber of magic#2) The chamber of magic#3 FAKE_NPC
- script The chamber of magic#4 FAKE_NPC,{
OnInit:
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 1d3ac1594..bd6af0bdd 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -1437,16 +1437,16 @@ OnTimer30000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-- duplicate(Crackt0#mal) Crackt1#mal -1
-- duplicate(Crackt0#mal) Crackt2#mal -1
-- duplicate(Crackt0#mal) Crackt3#mal -1
-- duplicate(Crackt0#mal) Crackt4#mal -1
-- duplicate(Crackt0#mal) Crackt5#mal -1
-- duplicate(Crackt0#mal) Crackt6#mal -1
-- duplicate(Crackt0#mal) Crackt7#mal -1
-- duplicate(Crackt0#mal) Crackt8#mal -1
-- duplicate(Crackt0#mal) Crackt9#mal -1
-- duplicate(Crackt0#mal) Crackt10#mal -1
+- duplicate(Crackt0#mal) Crackt1#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt2#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt3#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt4#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt5#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt6#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt7#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt8#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt9#mal FAKE_NPC
+- duplicate(Crackt0#mal) Crackt10#mal FAKE_NPC
mal_in02,181,55,3 script Brie#mal 4_CAT_SAILOR2,{
if (ma_tomas < 6) {
@@ -1974,16 +1974,16 @@ OnTimer30000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-- duplicate(Water Sand0#mal) Water Sand1#mal -1
-- duplicate(Water Sand0#mal) Water Sand2#mal -1
-- duplicate(Water Sand0#mal) Water Sand3#mal -1
-- duplicate(Water Sand0#mal) Water Sand4#mal -1
-- duplicate(Water Sand0#mal) Water Sand5#mal -1
-- duplicate(Water Sand0#mal) Water Sand6#mal -1
-- duplicate(Water Sand0#mal) Water Sand7#mal -1
-- duplicate(Water Sand0#mal) Water Sand8#mal -1
-- duplicate(Water Sand0#mal) Water Sand9#mal -1
-- duplicate(Water Sand0#mal) Water Sand10#mal -1
+- duplicate(Water Sand0#mal) Water Sand1#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand2#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand3#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand4#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand5#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand6#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand7#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand8#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand9#mal FAKE_NPC
+- duplicate(Water Sand0#mal) Water Sand10#mal FAKE_NPC
mal_dun01,136,120,6 script Linguist Devore#mald 4_CAT_MERMASTER,{
end;
@@ -3172,7 +3172,7 @@ malangdo,197,120,5 script A Foolish Cat#ml 4_CAT_SAILOR3,{
close;
}
-malangdo,196,120,0 script #ml1 -1,2,2,{
+malangdo,196,120,0 script #ml1 FAKE_NPC,2,2,{
OnTouch:
if (malang_bad_guys == 1 || malang_bad_guys == 2) {
mes "You hear a conversation between the Suspious Dealers.";
@@ -3231,7 +3231,7 @@ OnTouch:
end;
}
-malangdo,155,179,0 script #ml2 -1,2,2,{
+malangdo,155,179,0 script #ml2 FAKE_NPC,2,2,{
OnTouch:
if (malang_bad_guys == 2 || malang_bad_guys == 3) {
mes "There's a memo.";
@@ -3388,7 +3388,7 @@ mal_in02,184,72,3 script Gozangee#ml 4_CAT_SAILOR4,{
close;
}
-mal_in02,184,77,0 script #ml3 -1,2,2,{
+mal_in02,184,77,0 script #ml3 FAKE_NPC,2,2,{
OnTouch:
if (checkweight(Knife,1) == 0) {
mes "- You have too many items. -";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index a7b815d23..57c0eb8be 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -8007,16 +8007,16 @@ OnTimer30000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-- duplicate(Tent#ma) Tent1#ma -1
-- duplicate(Tent#ma) Tent2#ma -1
-- duplicate(Tent#ma) Tent3#ma -1
-- duplicate(Tent#ma) Tent4#ma -1
-- duplicate(Tent#ma) Tent5#ma -1
-- duplicate(Tent#ma) Tent6#ma -1
-- duplicate(Tent#ma) Tent7#ma -1
-- duplicate(Tent#ma) Tent8#ma -1
-- duplicate(Tent#ma) Tent9#ma -1
-- duplicate(Tent#ma) Tent10#ma -1
+- duplicate(Tent#ma) Tent1#ma FAKE_NPC
+- duplicate(Tent#ma) Tent2#ma FAKE_NPC
+- duplicate(Tent#ma) Tent3#ma FAKE_NPC
+- duplicate(Tent#ma) Tent4#ma FAKE_NPC
+- duplicate(Tent#ma) Tent5#ma FAKE_NPC
+- duplicate(Tent#ma) Tent6#ma FAKE_NPC
+- duplicate(Tent#ma) Tent7#ma FAKE_NPC
+- duplicate(Tent#ma) Tent8#ma FAKE_NPC
+- duplicate(Tent#ma) Tent9#ma FAKE_NPC
+- duplicate(Tent#ma) Tent10#ma FAKE_NPC
malaya,114,183,3 script Bent Old Lady#ma 4_F_BARYO_OLD,{
if (malaya_bang == 16) {