diff options
Diffstat (limited to 'npc/re/jobs/3-1')
-rw-r--r-- | npc/re/jobs/3-1/archbishop.txt | 28 | ||||
-rw-r--r-- | npc/re/jobs/3-1/guillotine_cross.txt | 8 | ||||
-rw-r--r-- | npc/re/jobs/3-1/mechanic.txt | 10 | ||||
-rw-r--r-- | npc/re/jobs/3-1/ranger.txt | 14 | ||||
-rw-r--r-- | npc/re/jobs/3-1/rune_knight.txt | 12 | ||||
-rw-r--r-- | npc/re/jobs/3-1/warlock.txt | 12 |
6 files changed, 42 insertions, 42 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index e59492ce5..c7e5b8a61 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -243,7 +243,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm, I wanted to tell you..."; next; - input .@inputstr$; + input(.@inputstr$); mes "[" + strcharinfo(PC_NAME) + "]"; mes "" + .@inputstr$ + ""; next; @@ -483,7 +483,7 @@ OnTouch: next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Pain... What kind of faults have I had?"; - input .@inputstr$; + input(.@inputstr$); next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "I confess my guilt to the Almighty God Odin."; @@ -779,7 +779,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{ warp "odin_tem02",282,263; end; } - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1006,7 +1006,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { if (strnpcinfo(NPC_NAME) == "#arch_1_10") viewpoint 1,113,327,1,0xFF9900; .@randht = rand(1,10); @@ -1038,7 +1038,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; donpcevent "mob#arch_1::OnKill"; end; @@ -1113,7 +1113,7 @@ OnKill: } job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{ - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1355,7 +1355,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { .@randht = rand(1,10); if (.@randht < 8) mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; @@ -1400,7 +1400,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; end; } diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 19f4ac7cf..a13afcbd9 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 4dcc98448..b97c27c85 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 41e5b476f..d91a1b448 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -613,7 +613,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Don't hang around here doing nothing. This is my area!"; close; L_Start: - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Test Instructor, Teardrop]"; mes "Stop!"; next; @@ -1491,7 +1491,7 @@ job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ setquest 8261; close; } - if (getmercinfo(1) == 2034) { + if (getmercinfo(MERCINFO_CLASS) == M_DESERT_WOLF_B) { erasequest 8261; mes "Good! Then I'll start the test right now!"; next; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8ab8f74..333c5c129 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -962,7 +962,7 @@ job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{ next; mes .@str$[1]; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@str$[0]) { mes "[Rune Knight Renoa]"; mes "Wow! This is great. The image of the rune stone in my head and the modeled rune stone match perfectly. It's well made."; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 13f99013b..41921e74e 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by |