summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-2
diff options
context:
space:
mode:
authorAsheraf <acheraf1998@gmail.com>2016-08-28 17:03:57 +0100
committerhemagx <ibrahem.h.basyone@gmail.com>2016-08-29 01:03:42 +0200
commit86977d79269408a371384e61111c3a9cf6e87b0c (patch)
tree4f2a9b1f9a3ee6436a0b857d05caa2be7e99a877 /npc/re/jobs/3-2
parent16f998c8a79153ed9f6721c36e129b6080fa59d2 (diff)
downloadhercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.gz
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.bz2
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.tar.xz
hercules-86977d79269408a371384e61111c3a9cf6e87b0c.zip
*strnpcinfo now uses constants
- NPC_NAME for the whole npc name including hidden part - NPC_NAME_VISIBLE for the visible part of the npc name - NPC_NAME_HIDDEN for the hidden part of the npc name - NPC_NAME_UNIQUE for the npc unique name - NPC_MAP for npc map
Diffstat (limited to 'npc/re/jobs/3-2')
-rw-r--r--npc/re/jobs/3-2/genetic.txt4
-rw-r--r--npc/re/jobs/3-2/minstrel.txt8
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt4
-rw-r--r--npc/re/jobs/3-2/sorcerer.txt8
-rw-r--r--npc/re/jobs/3-2/sura.txt2
-rw-r--r--npc/re/jobs/3-2/wanderer.txt6
6 files changed, 16 insertions, 16 deletions
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index f2c1ded47..ea926b0b1 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -970,7 +970,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
mes "- You found a little metal fragment. -";
job_gen = job_gen+1;
specialeffect EF_BASH;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
} else if (job_gen == 74) {
@@ -979,7 +979,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
}
end;
OnTimer7000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
}
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index a8cb2d61d..ca5b7e261 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -828,18 +828,18 @@ OnTimer300000:
yuno,146,168,0 script Karian#cmd2 4_M_BARD,{
end;
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnTimer100000:
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
stopnpctimer;
end;
}
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index a1dff376d..0d87db5d2 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -465,7 +465,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
getitem Stone,1;
else {
mes "While investigating, the topography breaks. It would be better to dig other places for a while.";
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
}
@@ -473,7 +473,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
mes "There is a trace that someone has already dug here.";
close;
OnTimer60000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
OnTimer1000:
OnTimer20000:
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index ff9faf500..a75480f24 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -392,10 +392,10 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{
}
- script Spirit Detecting Staff#0 FAKE_NPC,{
- if (strnpcinfo(4) == "thor_v01") setarray .@id[0],990,994,6276,6278;
- else if (strnpcinfo(4) == "ice_dun01") setarray .@id[0],991,995,6278,6276;
- else if (strnpcinfo(4) == "mjo_dun03") setarray .@id[0],993,997,6277,6276;
- else if (strnpcinfo(4) == "gon_dun02") setarray .@id[0],992,996,6277,6278;
+ if (strnpcinfo(NPC_MAP) == "thor_v01") setarray .@id[0],990,994,6276,6278;
+ else if (strnpcinfo(NPC_MAP) == "ice_dun01") setarray .@id[0],991,995,6278,6276;
+ else if (strnpcinfo(NPC_MAP) == "mjo_dun03") setarray .@id[0],993,997,6277,6276;
+ else if (strnpcinfo(NPC_MAP) == "gon_dun02") setarray .@id[0],992,996,6277,6278;
if (job_soc == 4 && countitem(.@id[0]) > 2) {
progressbar "ffff00",5;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index b28cb6fdd..f1353e282 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -166,7 +166,7 @@ ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{
setquest 11155;
close;
} else {
- if (strnpcinfo(0) == "King Crab#job_shu") {
+ if (strnpcinfo(NPC_NAME) == "King Crab#job_shu") {
mes "[King Crab]";
mes "How come a little rookie knocked me out! Me! The great King Crab...";
} else {
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index baad4b65a..6f131f2bc 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -102,7 +102,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
close;
}
} else if (job_wan == 1) {
- if (strnpcinfo(0) == "Aspiring Wanderer, Soy") {
+ if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") {
mes "[Soy]";
mes "The performance will be held in front of the Christmas tree here in Lutie.";
mes "I can't wait! Ah~ I'm losing my senses, Mimi.";
@@ -120,7 +120,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
mes "<Nollio> is the best!!";
close;
} else {
- if (strnpcinfo(0) == "Aspiring Wanderer, Soy") {
+ if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") {
mes "[Soy]";
mes "I want to become an famous Wanderer too, Mimi.";
} else {
@@ -1044,7 +1044,7 @@ OnInit:
- script #wander_xmas FAKE_NPC,{
end;
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 4_M_MINSTREL