Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 46 insertions, 47 deletions

diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index a5af84273..5236e5a54 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.
@@ -24,7 +24,7 @@
 //============================================================
 
 // Louise's Santa Hat (Event 1)
-xmas_in,89,92,5	script	Louise Kim#designer	714,{
+xmas_in,89,92,5	script	Louise Kim#designer	4_F_06,{
 	mes "[Designer Louise Kim]";
 	mes "Cone shaped red Santa hat is too ordinary.";
 	mes "It's old fashioned.";
@@ -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!!";
@@ -189,7 +189,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	714,{
 }
 
 // Enjoy Happymerry Chistmas Event (Event 2)
-prontera,155,285,3	script	Enjoy#enjoy	753,{
+prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 	if (!christ_solo05){
 		mes "[Enjoy]";
 		mes "Oh~~~";
@@ -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";
@@ -506,7 +506,7 @@ OnTimer180000:
 	end;
 }
 
-prontera,150,286,5	script	Happymerry#happymerry02	869,{
+prontera,150,286,5	script	Happymerry#happymerry02	4_M_LGTMAN,{
 	end;
 
 OnInit:
@@ -535,7 +535,7 @@ OnTimer60000:
 	end;
 }
 
-prontera,161,286,4	script	Christ#christ02	875,{
+prontera,161,286,4	script	Christ#christ02	4_M_PECOKNIGHT,{
 	end;
 OnInit:
 	disablenpc "Christ#christ02";
@@ -552,7 +552,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,161,281,1	script	Mas#mas02	748,{
+prontera,161,281,1	script	Mas#mas02	4_M_ALCHE_A,{
 	end;
 OnInit:
 	disablenpc "Mas#mas02";
@@ -569,7 +569,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,150,281,7	script	Event#event02	881,{
+prontera,150,281,7	script	Event#event02	4_M_SITDOWN,{
 	end;
 OnInit:
 	disablenpc "Event#event02";
@@ -586,7 +586,7 @@ OnCommandOff:
 	end;
 }
 
-prontera,188,177,4	script	Happymerry#happymerry	869,{
+prontera,188,177,4	script	Happymerry#happymerry	4_M_LGTMAN,{
 	if (christ_solo05==1) {
 		mes "[Happymerry]";
 		mes "Holgren~~!!";
@@ -666,7 +666,7 @@ prontera,188,177,4	script	Happymerry#happymerry	869,{
 	}
 }
 
-prontera,62,339,3	script	Christ#christ	875,{
+prontera,62,339,3	script	Christ#christ	4_M_PECOKNIGHT,{
 	if (christ_solo05 == 2) {
 		mes "[Christ]";
 		mes "Now~finally!!!";
@@ -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!";
@@ -754,8 +754,8 @@ prontera,62,339,3	script	Christ#christ	875,{
 	}
 }
 
-prontera,163,66,7	script	Mas#mas	748,{
-	if(christ_solo05 == 3) {
+prontera,163,66,7	script	Mas#mas	4_M_ALCHE_A,{
+	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.";
@@ -836,8 +836,8 @@ prontera,163,66,7	script	Mas#mas	748,{
 	}
 }
 
-prontera,35,209,5	script	Event#event	881,{
-	if(christ_solo05 == 4) {
+prontera,35,209,5	script	Event#event	4_M_SITDOWN,{
+	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~.";
@@ -933,7 +933,7 @@ prontera,35,209,5	script	Event#event	881,{
 }
 
 // Oholy (Event 3)
-prontera,156,242,0	script	Oholy#pron::OholyDup	79,{
+prontera,156,242,0	script	Oholy#pron::OholyDup	1_F_PRIEST,{
 	if (!christ_carol05) {
 		mes "[Oholy]";
 		mes "Joy to the world!";
@@ -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;
 		}
@@ -1539,7 +1538,7 @@ function	script	F_carol_devi2	{
 	end;
 }
 
-prontera,94,297,3	script	Deviruchi#pron_01	738,3,3,{
+prontera,94,297,3	script	Deviruchi#pron_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1548,7 +1547,7 @@ OnTouch:
 	end;
 }
 
-prontera,205,242,3	script	Deviruchi#pron_02	738,3,3,{
+prontera,205,242,3	script	Deviruchi#pron_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1557,7 +1556,7 @@ OnTouch:
 	end;
 }
 
-prontera,126,118,3	script	Deviruchi#pron_03	738,3,3,{
+prontera,126,118,3	script	Deviruchi#pron_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","prontera",155,230);
 	end;
 
@@ -1567,8 +1566,8 @@ OnTouch:
 }
 
 // Payon
-payon,165,153,3	duplicate(OholyDup)	Oholy#payon	79
-payon,142,203,3	script	Deviruchi#payon_01	738,3,3,{
+payon,165,153,3	duplicate(OholyDup)	Oholy#payon	1_F_PRIEST
+payon,142,203,3	script	Deviruchi#payon_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1577,7 +1576,7 @@ OnTouch:
 	end;
 }
 
-payon,248,239,3	script	Deviruchi#payon_02	738,3,3,{
+payon,248,239,3	script	Deviruchi#payon_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1586,7 +1585,7 @@ OnTouch:
 	end;
 }
 
-payon,140,56,3	script	Deviruchi#payon_03	738,3,3,{
+payon,140,56,3	script	Deviruchi#payon_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","payon",166,60);
 	end;
 
@@ -1595,8 +1594,8 @@ OnTouch:
 	end;
 }
 
-morocc,161,85,0	duplicate(OholyDup)	Oholy#morocc	79
-morocc,52,134,3	script	Deviruchi#morocc_01	738,3,3,{
+morocc,161,85,0	duplicate(OholyDup)	Oholy#morocc	1_F_PRIEST
+morocc,52,134,3	script	Deviruchi#morocc_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1605,7 +1604,7 @@ OnTouch:
 	end;
 }
 
-morocc,210,264,3	script	Deviruchi#morocc_02	738,3,3,{
+morocc,210,264,3	script	Deviruchi#morocc_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1614,7 +1613,7 @@ OnTouch:
 	end;
 }
 
-morocc,223,74,3	script	Deviruchi#morocc_03	738,3,3,{
+morocc,223,74,3	script	Deviruchi#morocc_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","morocc",160,51);
 	end;
 
@@ -1624,8 +1623,8 @@ OnTouch:
 }
 
 // Geffen
-geffen,120,188,0	duplicate(OholyDup)	Oholy#geffen	79
-geffen,173,163,3	script	Deviruchi#geffen_01	738,3,3,{
+geffen,120,188,0	duplicate(OholyDup)	Oholy#geffen	1_F_PRIEST
+geffen,173,163,3	script	Deviruchi#geffen_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1634,7 +1633,7 @@ OnTouch:
 	end;
 }
 
-geffen,49,95,3	script	Deviruchi#geffen_02	738,3,3,{
+geffen,49,95,3	script	Deviruchi#geffen_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1643,7 +1642,7 @@ OnTouch:
 	end;
 }
 
-geffen,111,101,3	script	Deviruchi#geffen_03	738,3,3,{
+geffen,111,101,3	script	Deviruchi#geffen_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","geffen",120,34);
 	end;
 
@@ -1653,8 +1652,8 @@ OnTouch:
 }
 
 // Alberta
-alberta,54,237,0	duplicate(OholyDup)	Oholy#alberta	79
-alberta,97,86,3	script	Deviruchi#alberta_01	738,3,3,{
+alberta,54,237,0	duplicate(OholyDup)	Oholy#alberta	1_F_PRIEST
+alberta,97,86,3	script	Deviruchi#alberta_01	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;
 
@@ -1663,7 +1662,7 @@ OnTouch:
 	end;
 }
 
-alberta,180,48,3	script	Deviruchi#alberta_02	738,3,3,{
+alberta,180,48,3	script	Deviruchi#alberta_02	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;
 
@@ -1672,7 +1671,7 @@ OnTouch:
 	end;
 }
 
-alberta,54,132,3	script	Deviruchi#alberta_03	738,3,3,{
+alberta,54,132,3	script	Deviruchi#alberta_03	4_DEVIRUCHI,3,3,{
 	callfunc("F_carol_devi2","alberta",28,235);
 	end;