diff options
author | shennetsind <shennetsind@users.noreply.github.com> | 2013-10-30 14:48:26 -0700 |
---|---|---|
committer | shennetsind <shennetsind@users.noreply.github.com> | 2013-10-30 14:48:26 -0700 |
commit | 566529c819bcf9aeb1bd3a4a691c443c2b88d076 (patch) | |
tree | 5d3448afe67329cc9d650732425f0152ef242e7b /npc/re/jobs/1-1 | |
parent | 8039bd169886a4b0583cd1a794fcf61c79626e86 (diff) | |
parent | e9b4aec5eae2bc3454636a71953dcb1e1abb5ee7 (diff) | |
download | hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.gz hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.bz2 hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.xz hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.zip |
Merge pull request #210 from kisuka/npc-constants
NPC Constants
Diffstat (limited to 'npc/re/jobs/1-1')
-rw-r--r-- | npc/re/jobs/1-1/acolyte.txt | 8 | ||||
-rw-r--r-- | npc/re/jobs/1-1/archer.txt | 2 | ||||
-rw-r--r-- | npc/re/jobs/1-1/mage.txt | 2 | ||||
-rw-r--r-- | npc/re/jobs/1-1/merchant.txt | 2 | ||||
-rw-r--r-- | npc/re/jobs/1-1/swordman.txt | 2 | ||||
-rw-r--r-- | npc/re/jobs/1-1/thief.txt | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index ca80fda9c..07c37a07c 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -12,7 +12,7 @@ //= 1.2 Added Baby Job compatibility [Streusel] //= 1.3 Rewrote bits [Euphy] //============================================================ -prt_church,184,41,4 script Cleric#aco 60,{ +prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ if (Upper == 1) { if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) { if (Class == Job_Novice_High) { @@ -110,7 +110,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ } } -prt_fild03,365,255,2 script Ascetic#aco 89,{ +prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{ mes "[Father Rubalkabara]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 6) { @@ -187,7 +187,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{ } } -moc_fild07,41,355,4 script Ascetic#2aco 95,{ +moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{ mes "[Mother Mathilda]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 7) { @@ -256,7 +256,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{ } } -prt_fild00,208,218,6 script Ascetic#3aco 98,{ +prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{ mes "[Father Yosuke]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 8) { diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index d22e85f04..71df65889 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -11,7 +11,7 @@ //= 1.1 Added Baby Job compatibility [Streusel] //= 1.2 Rewrote bits [Euphy] //============================================================ -payon_in02,64,71,4 script Archer Guildsman#archer 85,{ +payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) { mes "[Archer Guildsman]"; diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index ef60603f0..e87f89328 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -11,7 +11,7 @@ //= 1.1 Added Baby Job compatibility [Streusel] //= 1.2 Rewrote bits [Euphy] //============================================================ -geffen_in,164,124,4 script Mage Guildsman#mage 123,{ +geffen_in,164,124,4 script Mage Guildsman#mage 2_F_MAGICMASTER,{ if (Upper == 1) { if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) { if (Class == Job_Novice_High) { diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 05b82ec66..619a2a465 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -11,7 +11,7 @@ //= 1.1 Added Baby Job compatibility [Streusel] //= 1.2 Rewrote bits [Euphy] //============================================================ -alberta_in,53,43,6 script Merchant#mer 86,{ +alberta_in,53,43,6 script Merchant#mer 4_M_04,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { mes "[Chief Mahnsoo]"; diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index fffebe722..d8bd67711 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -11,7 +11,7 @@ //= 1.1 Added Baby Job compatibility [Streusel] //= 1.2 Rewrote bits [Euphy] //============================================================ -izlude_in,74,172,4 script Swordman#swd 119,{ +izlude_in,74,172,4 script Swordman#swd 2_M_SWORDMASTER,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) { mes "[Swordman]"; diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index c99368b8c..c42888a66 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -11,7 +11,7 @@ //= 1.1 Added Baby Job compatibility [Streusel] //= 1.2 Rewrote bits [Euphy] //============================================================ -moc_prydb1,39,129,2 script Thief Guide#thief 69,{ +moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ if (Upper == 1) { if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) { if (Class == Job_Novice_High) { @@ -155,7 +155,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ close; } -moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{ +moc_prydb1,42,133,2 script Thief Guildsman#thief 2_M_THIEFMASTER,{ if(q_job_thief == 1) { mes "[Thief Guildsman]"; mes "Alright. You must have passed the job interview, huh?"; |