summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-08-10 05:47:31 +0200
committerHaru <haru@dotalux.com>2015-08-10 05:47:31 +0200
commit5e7ad85e29400fe891c9f1d42aa1c8383a636d76 (patch)
treea6d29e1185da51e8965a38a3b0aefd6cdc47af3d
parent08d4e50fecec0fa03d373e672fe95da1dbf87ab2 (diff)
downloadhercules-5e7ad85e29400fe891c9f1d42aa1c8383a636d76.tar.gz
hercules-5e7ad85e29400fe891c9f1d42aa1c8383a636d76.tar.bz2
hercules-5e7ad85e29400fe891c9f1d42aa1c8383a636d76.tar.xz
hercules-5e7ad85e29400fe891c9f1d42aa1c8383a636d76.zip
Minor script cleanup (part 2)
- Replaced leftover sprite IDs with constants - Corrected some NPC facing directions (in modulo 8) - Follow-up to 7b50fce0f62961b0228e6919562efcfe33e7fbca
-rw-r--r--npc/re/cities/dewata.txt12
-rw-r--r--npc/re/jobs/2e/kagerou_oboro.txt4
-rw-r--r--npc/re/merchants/enchan_ko.txt2
-rw-r--r--npc/re/quests/eden/eden_quests.txt2
-rw-r--r--npc/re/quests/newgears/2012_headgears.txt2
-rw-r--r--npc/re/quests/quests_dicastes.txt2
-rw-r--r--npc/re/quests/quests_eclage.txt6
-rw-r--r--npc/re/quests/quests_malaya.txt2
-rw-r--r--npc/re/quests/quests_mora.txt2
9 files changed, 17 insertions, 17 deletions
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 022d3d715..fe6b661a3 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -418,7 +418,7 @@ dewata,99,203,4 script Tourist#dew4 4_M_SAGE_C,{
close;
}
-dewata,67,186,8 script Monk#dew1 4_M_BUDDHIST,{
+dewata,67,186,0 script Monk#dew1 4_M_BUDDHIST,{
mes "[Monk]";
mes "I am a monk, content to spend my days in religious study.";
next;
@@ -430,7 +430,7 @@ dewata,67,186,8 script Monk#dew1 4_M_BUDDHIST,{
close;
}
-dewata,65,188,8 script Monk#dew2 4_M_BUDDHIST,{
+dewata,65,188,0 script Monk#dew2 4_M_BUDDHIST,{
mes "[Monk]";
mes "Borobudur temple is one of few temples left for worshiping the Great Buddha.";
next;
@@ -439,7 +439,7 @@ dewata,65,188,8 script Monk#dew2 4_M_BUDDHIST,{
close;
}
-dewata,63,190,8 script Monk#dew3 4_M_BUDDHIST,{
+dewata,63,190,0 script Monk#dew3 4_M_BUDDHIST,{
mes "[Monk]";
mes "Are you a Tourist? You can make an offering and a wish to one of the shrines.";
next;
@@ -448,7 +448,7 @@ dewata,63,190,8 script Monk#dew3 4_M_BUDDHIST,{
close;
}
-dewata,62,192,8 script Monk#dew4 4_M_BUDDHIST,{
+dewata,62,192,0 script Monk#dew4 4_M_BUDDHIST,{
mes "[Monk]";
mes "Our great Buddha is the king of souls and the leader of all good Gods.";
next;
@@ -657,7 +657,7 @@ OnTouch:
close;
}
-dewata,233,263,8 script Sweet Married Couple#1 4_M_ROGUE,2,3,{
+dewata,233,263,0 script Sweet Married Couple#1 4_M_ROGUE,2,3,{
OnTouch:
mes "[Sweet Husband]";
mes "You are the most beautiful thing in the world baby~";
@@ -677,7 +677,7 @@ OnTouch:
close;
}
-dewata,234,263,8 script Sweet Married Couple#2 4_F_JOB_HUNTER,2,3,{
+dewata,234,263,0 script Sweet Married Couple#2 4_F_JOB_HUNTER,2,3,{
OnTouch:
mes "[Sweet Wife]";
mes "Baby~ You know what flower that is~?";
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index 8c8e0bf3e..c9f639d67 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1348,7 +1348,7 @@ OnTouch:
job_ko,41,16,4 duplicate(Sight#ko_trap) Sight#ko_02 4_BULLETIN_BOARD2,1,1
-job_ko,33,16,4 script Sight#ko_03 858,1,1,{
+job_ko,33,16,4 script Sight#ko_03 4_BULLETIN_BOARD2,1,1,{
callfunc "F_KO_Survival_mes",3;
end;
OnTouch:
@@ -2859,4 +2859,4 @@ job_ko,4,1,4 script Guide#ko_helper 4_M_KAGE_OLD,{
close;
}
end;
-} \ No newline at end of file
+}
diff --git a/npc/re/merchants/enchan_ko.txt b/npc/re/merchants/enchan_ko.txt
index c162b4be6..98e309abb 100644
--- a/npc/re/merchants/enchan_ko.txt
+++ b/npc/re/merchants/enchan_ko.txt
@@ -13,7 +13,7 @@
// Main NPC :: job_ko
//============================================================
-que_ng,75,20,3 script Artisan Tene#ko 762,{
+que_ng,75,20,3 script Artisan Tene#ko 4_M_JPN2,{
disable_items;
mes "[Artisan Tene]";
mes "Hello? I'm Artisan Tene, the most respectful blacksmith of them all.";
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index f9030964c..1d25e17d3 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -2150,7 +2150,7 @@ S_Select:
close;
}
-moc_para01,179,44,3 script Chef 820,{
+moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "[Chef]";
mes "What's up?";
mes "Do you want a Meal? Or do you have other business?";
diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index c96c47ede..167817a10 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -14,7 +14,7 @@
// Main NPC :: 2012_hat_quest
//============================================================
-moc_para01,41,169,3 script Reno#2012hat 64,{
+moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
// iRO has (very) minor differences in dialogue from the original script.
// To use iRO's version, uncomment the line below.
//.@features_iRO = 1;
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 48e116884..10bb003e5 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -693,7 +693,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{
close;
}
-dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{
+dic_in01,48,273,1 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index ba7ea63dd..b2095ecdb 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -87,7 +87,7 @@ dic_fild01,161,266,4 duplicate(Teleport Cat No.1#1) Teleport Cat No.6#6 4_M_BOSS
// Eclage's Entrance
//============================================================
-ecl_fild01,97,322,0 script #ep14_2Entrance 45,3,3,{
+ecl_fild01,97,322,0 script #ep14_2Entrance WARPNPC,3,3,{
end;
OnTouch:
@@ -2310,7 +2310,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{
close;
}
-eclage,292,265,0 script #ep14_2Yube Entrance 45,2,2,{
+eclage,292,265,0 script #ep14_2Yube Entrance WARPNPC,2,2,{
end;
OnTouch:
@@ -4136,7 +4136,7 @@ end;
}
-eclage,200,272,4 script Masione#eclbig 437,{
+eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight)<2000) {
mes "- Stop Here!! -";
mes "- You have too many items. -";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 76e9a9536..e67a827e9 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -8932,7 +8932,7 @@ ma_fild01,173,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#03 HIDDEN_WARP_N
ma_fild01,172,222,0 duplicate(Ancient Grudge#01) Ancient Grudge#04 HIDDEN_WARP_NPC
ma_fild01,171,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#05 HIDDEN_WARP_NPC
-ma_fild01,192,200,8 script Tourist#pin01 1_M_MERCHANT,{
+ma_fild01,192,200,0 script Tourist#pin01 1_M_MERCHANT,{
mes "[Tourist]";
mes "I came from afar and dropped everything to come and enjoy the 'Pintados Festival'.";
next;
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index fc076a6b3..55a60de98 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -4466,7 +4466,7 @@ mora,133,80,6 script Elephantine#pa0829 4_ELEPHANT,{
close;
}
-mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{
+mora,115,98,0 script Hotcha#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;