summaryrefslogtreecommitdiff
path: root/npc/events/christmas_2005.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/events/christmas_2005.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/events/christmas_2005.txt')
-rw-r--r--npc/events/christmas_2005.txt33
1 files changed, 16 insertions, 17 deletions
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index a5af84273..5b8af009b 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -5,7 +5,7 @@
//===== Current Version: =====================================
//= 1.2
//===== Description: =========================================
-//= [Aegis Conversion]
+//= [Official Conversion]
//= Event 1: Louise's Kim creates Louise's Santa Hat.
//= Event 2: Enjoy Happymerry Chistmas Event summons monsters.
//= Event 3: Oholy requires you to hunt Deviruchi NPCs.
@@ -51,7 +51,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
mes "";
emotion e_lv;
next;
- if(countitem(2236) > 0) {
+ if (countitem(2236) > 0) {
if (select("Here.:It's ok.") == 1) {
mes "[Designer Louise Kim]";
mes "Nice choice!!";
@@ -294,7 +294,7 @@ prontera,155,285,3 script Enjoy#enjoy 753,{
end;
}
}
- else if((christ_solo05 > 0) && (christ_solo05 < 5)){
+ else if ((christ_solo05 > 0) && (christ_solo05 < 5)){
mes "[Enjoy]";
mes "Each should have one person's phone number.";
mes "We must keep it secret before we put in action.";
@@ -395,7 +395,7 @@ prontera,155,285,3 script Enjoy#enjoy 753,{
donpcevent "Christ#christ02::OnCommandEmotion";
donpcevent "Mas#mas02::OnCommandEmotion";
donpcevent "Event#event02::OnCommandEmotion";
- misceffect 376; //_HITLINE2
+ misceffect EF_HITLINE2;
delitem 604,5; //Branch_of_Dead_Tree
set christ_solo05,6;
donpcevent "Happymerry#happymerry02::OnCommandOff";
@@ -719,7 +719,7 @@ prontera,62,339,3 script Christ#christ 875,{
set christ_solo05,3;
close;
}
- else if(christ_solo05 > 2) {
+ else if (christ_solo05 > 2) {
mes "[Christ]";
mes "Than,see you there!!";
mes "I'll go meet Enjoy!";
@@ -755,7 +755,7 @@ prontera,62,339,3 script Christ#christ 875,{
}
prontera,163,66,7 script Mas#mas 748,{
- if(christ_solo05 == 3) {
+ if (christ_solo05 == 3) {
mes "[Mas]";
mes "Herds!!!!!How long does it take!";
mes "Somebody know the regenerating time of Herb?!!";
@@ -810,7 +810,7 @@ prontera,163,66,7 script Mas#mas 748,{
set christ_solo05,4;
close;
}
- else if(christ_solo05 > 3) {
+ else if (christ_solo05 > 3) {
mes "[Mas]";
mes "If you excuse me, I'll go ahead and meat Enjoy.";
mes "And don't forget to tell ^0000FFEvent^000000 about this.";
@@ -837,7 +837,7 @@ prontera,163,66,7 script Mas#mas 748,{
}
prontera,35,209,5 script Event#event 881,{
- if(christ_solo05 == 4) {
+ if (christ_solo05 == 4) {
mes "[Event]";
mes "........................";
next;
@@ -891,7 +891,7 @@ prontera,35,209,5 script Event#event 881,{
set christ_solo05,5;
close;
}
- else if(christ_solo05 > 4) {
+ else if (christ_solo05 > 4) {
mes "[Event]";
mes "Wait for me miss Kafra~~~";
mes "Don't be so lonely~.";
@@ -1104,7 +1104,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
close;
}
}
- else if(christ_carol05 == 1) {
+ else if (christ_carol05 == 1) {
mes "[Oholy]";
mes "He should not be able to escape";
mes "from the town. Please find the";
@@ -1113,8 +1113,8 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "Punish the wicked devil who is ruining Christmas!!!";
close;
}
- else if(christ_carol05 == 2) {
- if(!checkweight(1201,1)) {
+ else if (christ_carol05 == 2) {
+ if (!checkweight(1201,1)) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
mes "too many things with you.";
@@ -1123,8 +1123,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 79,{
mes "to store some of your items.^000000";
close;
}
- set .@now_weight,MaxWeight-Weight;
- if(.@now_weight < 2000) {
+ if (MaxWeight - Weight < 2000) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
mes "too many things with you.";
@@ -1441,7 +1440,7 @@ function script F_carol_devi {
disablenpc getarg(0);
next;
mes "-You are now cursed!!!-";
- sc_start SC_Curse,5000,0;
+ sc_start SC_CURSE,5000,0;
emotion e_omg,1;
close;
case 3:
@@ -1458,7 +1457,7 @@ function script F_carol_devi {
disablenpc getarg(0);
next;
mes "-You are blinded!!!-";
- sc_start SC_Blind,5000,0;
+ sc_start SC_BLIND,5000,0;
emotion e_omg,1;
close;
case 4:
@@ -1475,7 +1474,7 @@ function script F_carol_devi {
disablenpc getarg(0);
next;
mes "-You are poisoned!!!-";
- sc_start SC_Poison,5000,0;
+ sc_start SC_POISON,5000,0;
emotion e_omg,1;
close;
}