summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-08 03:09:20 +0100
committerHaru <haru@dotalux.com>2013-11-08 03:12:33 +0100
commit0b7b3796ec987cbb1c263722b841cfa5795aa6d3 (patch)
treecc0aa01be6fdb5fa0e7fb0b0a1397bb2d71cbf90 /npc/re
parentbc9743ce3455f9d9cbc9c934b2a19343ad369fc5 (diff)
downloadhercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.gz
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.bz2
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.tar.xz
hercules-0b7b3796ec987cbb1c263722b841cfa5795aa6d3.zip
Added support for monster spritename constants
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/cities/mora.txt2
-rw-r--r--npc/re/instances/OldGlastHeim.txt2
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt6
-rw-r--r--npc/re/quests/eden/eden_iro.txt2
-rw-r--r--npc/re/quests/quests_brasilis.txt10
-rw-r--r--npc/re/quests/quests_malaya.txt2
6 files changed, 12 insertions, 12 deletions
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index c3c05d6f5..64f315fa9 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -1059,7 +1059,7 @@ mora,132,184,5 script Mora Villager#sleep6 4_M_RAFLE_OR,{
close;
}
-mora,133,184,1 script Mora Villager#sleep4 1790,{
+mora,133,184,1 script Mora Villager#sleep4 G_RAFFLESIA,{
mes "[Mora Villager]";
mes "Moan...";
end;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 1e005e43b..47e9e8000 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -702,7 +702,7 @@ OnMyMobDead:
end;
}
-1@gl_k,145,54,6 script .#ghinstance1 2471,{
+1@gl_k,145,54,6 script .#ghinstance1 MG_KHALITZBURG,{
end;
OnInstanceInit:
donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index c206599bb..2d106dc4a 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3264,7 +3264,7 @@ OnMyMobDead:
end;
}
-job3_guil03,110,27,3 script Guard Dog#dog01 1866,3,1,{
+job3_guil03,110,27,3 script Guard Dog#dog01 HELL_POODLE,3,1,{
end;
OnEnable:
enablenpc "Guard Dog#dog01";
@@ -3287,7 +3287,7 @@ OnMyMobDead:
end;
}
-job3_guil03,119,27,3 script Guard Dog#dog02 1866,3,1,{
+job3_guil03,119,27,3 script Guard Dog#dog02 HELL_POODLE,3,1,{
end;
OnEnable:
enablenpc "Guard Dog#dog02";
@@ -3455,7 +3455,7 @@ job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{
next;
mes "[Priest from Rachel]";
mes "Because of you, you ruined everything!";
- setnpcdisplay(strnpcinfo(0),2030);
+ setnpcdisplay(strnpcinfo(0), HIDEN_PRIEST);
next;
mes "[Priest from Rachel]";
mes "You want to destroy us forever!";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 8b81b5c4f..b4400854f 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -567,7 +567,7 @@ moc_para01,13,22,4 script Merry Badger#xch 4_F_SITDOWN,{
//switch(select("Redeem Badges:Trade in FOR badges:Exchange Rates:15 Job Manuals - 1 JM Box")) {
}
-moc_para01,174,33,3 script Bathory#2012spirits 1102,{
+moc_para01,174,33,3 script Bathory#2012spirits BATHORY,{
mes "[Bathory]";
mes "Eheeheeheehee! The spotlight is on Glast Heim this week, so I'm ferrying people there for a mere 1,000z!";
next;
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 5276fafe5..7c5ccbc7b 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -861,7 +861,7 @@ brasilis,59,226,3 script Poring#bra 4_PORING,{
end;
}
-bra_fild01,75,83,5 script Toucan#bra 2073,2,2,{
+bra_fild01,75,83,5 script Toucan#bra TOUCAN,2,2,{
OnTouch:
if (brazil_gua == 6) {
mes "[Toucan]";
@@ -921,7 +921,7 @@ OnTouch:
end;
}
-bra_fild01,34,184,5 script Jaguar#bra 2072,2,2,{
+bra_fild01,34,184,5 script Jaguar#bra JAGUAR,2,2,{
OnTouch_:
if (brazil_gua == 7) {
mes "[Jaguar]";
@@ -983,7 +983,7 @@ OnTouch_:
end;
}
-bra_fild01,245,53,3 script #Monkeybra 1057,{
+bra_fild01,245,53,3 script #Monkeybra YOYO,{
end;
}
@@ -2661,7 +2661,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
}
}
-bra_in01,136,180,5 script Ghost#bra 1867,{
+bra_in01,136,180,5 script Ghost#bra BANSHEE,{
end;
OnInit:
@@ -2832,7 +2832,7 @@ bra_fild01,323,136,1 script Pipe#brafild CLEAR_NPC,{
}
}
-bra_in01,206,190,3 script Ghost#bra_end 1867,{
+bra_in01,206,190,3 script Ghost#bra_end BANSHEE,{
end;
OnInit:
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 3487871b4..edc964053 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -2472,7 +2472,7 @@ L_SetQuest:
close;
}
-ma_in01,125,107,3 script Ghost Diwata 1761,4,4,{
+ma_in01,125,107,3 script Ghost Diwata G_SKOGUL,4,4,{
end;
OnTouch:
if (malaya_diwata == 0) {