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/custom/events | |
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/custom/events')
-rw-r--r-- | npc/custom/events/cluckers.txt | 2 | ||||
-rw-r--r-- | npc/custom/events/disguise.txt | 2 | ||||
-rw-r--r-- | npc/custom/events/hallow06.txt | 2 | ||||
-rw-r--r-- | npc/custom/events/uneasy_cemetery.txt | 2 | ||||
-rw-r--r-- | npc/custom/events/valentinesdayexp.txt | 8 | ||||
-rw-r--r-- | npc/custom/events/xmas_rings_event.txt | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 7f3dd598f..1db4c2251 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -16,7 +16,7 @@ //= 1.2a Switched 'atcommand' to 'unitskilluseid'. //============================================================ -prontera,156,219,4 script Cluckers 800,{ +prontera,156,219,4 script Cluckers 4_NFCOCK,{ set .@GMAccess,80; // GM level required to access NPC diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index a091281ef..1b46e9b16 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -10,7 +10,7 @@ //= 5.1 Cleaned and standardized, mostly. [Euphy] //============================================================ -prontera,160,155,4 script Disguise Event 795,{ +prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ // Currently set to run every two hours. // To change times, edit the OnClock labels below. diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt index 71b63e983..01a122320 100644 --- a/npc/custom/events/hallow06.txt +++ b/npc/custom/events/hallow06.txt @@ -11,7 +11,7 @@ //= 1.2 fixed bugs, optimized. Now uses 1 var instead of 3 [Lupus] //============================================================ -prontera,151,190,5 script Hallows' Eve Event 807,{ +prontera,151,190,5 script Hallows' Eve Event 1_M_SIGNMCNT,{ mes "[Hallows' Eve Event]"; if(Class == Job_Novice){ mes "I am sorry but you have to got a job to complete the event."; diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt index d026792b0..ac8124bd1 100644 --- a/npc/custom/events/uneasy_cemetery.txt +++ b/npc/custom/events/uneasy_cemetery.txt @@ -64,7 +64,7 @@ L_Start_Undead: mapannounce "prontera","[Mother Mathana]: The cememtery has become restless! In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0; } -prontera,257,313,5 script Mother Mathana 79,{ +prontera,257,313,5 script Mother Mathana 1_F_PRIEST,{ mes "[Mother Mathana]"; if ($UNEASY_DL <= 0) goto L_Undead_Walk; mes "I'm afraid there's something wrong with our old cemetery..."; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index ec8464338..c60c6f3a6 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -14,7 +14,7 @@ //============================================================ // Tine - Valentine Event Chocolate Even Guide ------------------ -prontera,156,172,4 script Tine 58,{ +prontera,156,172,4 script Tine 1_M_MERCHANT,{ // Debug info for item effects and tricky conditions 8) // mes "@dsv: "+@dsv; // mes "ispartneron()=="+ispartneron(); @@ -72,7 +72,7 @@ OnInit: } // Stephen - Valentine Event Chocolate seller ------------------ -alberta,26,243,4 script Stephen#val1 58,{ +alberta,26,243,4 script Stephen#val1 1_M_MERCHANT,{ mes "[Stephen]"; mes "Guess what I've got?"; mes "A tasty treat not easily found in Rune-Midgard...."; @@ -127,7 +127,7 @@ L_NOTENO: } // Jainie -- Gives information about Valentine Event ------------------------ -alberta,29,243,4 script Jainie#val1 53,{ +alberta,29,243,4 script Jainie#val1 1_M_INNKEEPER,{ mes "[Jainie]"; mes "You know what? The chocolate that my boyfriend sells are from me!"; mes "I made them by myself. Now I need some Milk for my special White Chocolate."; @@ -195,7 +195,7 @@ L_NOMILK: } // Carl Orleans -- Valentine Event Chocolate maker ------------------ -prt_castle,54,34,4 script Carl Orleans#val1 47,{ +prt_castle,54,34,4 script Carl Orleans#val1 1_M_01,{ mes "[Carl Orleans]"; mes "Yes? What can I cook for you?"; next; diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt index 959e3a1a9..8d8be443b 100644 --- a/npc/custom/events/xmas_rings_event.txt +++ b/npc/custom/events/xmas_rings_event.txt @@ -12,7 +12,7 @@ //= 1.2 Fixed double quotes not being escaped [brianluau] //============================================================ -prontera,156,174,4 script Snower 713,{ +prontera,156,174,4 script Snower 4_M_06,{ mes "[Snower]"; if(Q_XMSRINGS==2){ mes "Oh.. is it true? You've helped my sis Sneewy? Thank you."; @@ -97,7 +97,7 @@ OnInit: end; } -louyang,224,249,4 script Sneewy 717,{ +louyang,224,249,4 script Sneewy 4_F_KID3,{ mes "[Sneewy]"; if(Q_XMSRINGS==0){ mes "Hi! I'm waithing for my sister's birdy with mail..."; @@ -140,7 +140,7 @@ M_END: close; } -izlu2dun,133,160,2 script Snoowy 714,{ +izlu2dun,133,160,2 script Snoowy 4_F_06,{ mes "[Snoowy]"; if(Q_XMSRINGS==0){ mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there."; |