git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16291 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 186 insertions, 3 deletions

diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 852aaf5d4..657a10260 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -2266,7 +2266,7 @@
 5102,Round_Eyes,Blank Eyes,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,185,{},{},{}
 5103,Sunflower_Hairpin,Sunflower Hairpin,5,20,,600,,1,,0,0xFFFFFFFE,7,2,256,,30,0,186,{ bonus bAgi,2; bonus bCritical,5; },{},{}
 5104,Dark_Blindfold,Dark Blinder,5,20,,100,,0,,0,0xFFFFFFFE,7,2,512,,0,0,187,{ bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200; },{},{}
-5105,Hat_Of_Cake_,2nd Anniversary Hat,5,20,,1000,,1,,0,0xFFFFFFFF,7,2,256,,24,1,109,{ bonus bDex,1; bonus bMaxSP,80; },{},{}
+5105,Hat_Of_Cake_,2nd Anniversary Hat,5,20,,1000,,1,,0,0xFFFFFFFF,7,2,256,,24,1,109,{ bonus bDex,1; bonus bMaxSP,80; bonus3 bAddMonsterDropItem,7864,7,50; },{},{}
 5106,Cone_Hat_INA,2nd Anniversary Hat,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,1,0,144,{ bonus bLuk,1; },{},{}
 5107,Well_Baked_Toast,Crunch Toast,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,0,0,188,{},{},{}
 5108,Detective_Hat,Renown Detective's Cap,5,20,,350,,3,,1,0xFFFFFFFF,7,2,256,,0,1,189,{},{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 760acaa4d..3c811e0dc 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -2682,7 +2682,7 @@
 5102,Round_Eyes,Blank Eyes,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,185,{},{},{}
 5103,Sunflower_Hairpin,Sunflower Hairpin,5,20,,600,,1,,0,0xFFFFFFFE,7,2,256,,30,0,186,{ bonus bAgi,2; bonus bCritical,5; },{},{}
 5104,Dark_Blindfold,Dark Blinder,5,20,,100,,0,,0,0xFFFFFFFE,7,2,512,,0,0,187,{ bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200; },{},{}
-5105,Hat_Of_Cake_,2nd Anniversary Hat,5,20,,1000,,1,,0,0xFFFFFFFF,7,2,256,,24,1,109,{ bonus bDex,1; bonus bMaxSP,80; },{},{}
+5105,Hat_Of_Cake_,2nd Anniversary Hat,5,20,,1000,,1,,0,0xFFFFFFFF,7,2,256,,24,1,109,{ bonus bDex,1; bonus bMaxSP,80; bonus3 bAddMonsterDropItem,7864,7,50; },{},{}
 5106,Cone_Hat_INA,2nd Anniversary Hat,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,1,0,144,{ bonus bLuk,1; },{},{}
 5107,Well_Baked_Toast,Crunch Toast,5,20,,50,,0,,0,0xFFFFFFFF,7,2,1,,0,0,188,{},{},{}
 5108,Detective_Hat,Renown Detective's Cap,5,20,,350,,3,,1,0xFFFFFFFF,7,2,256,,0,1,189,{},{},{}
diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt
new file mode 100644
index 000000000..7bde3e2dd
--- /dev/null
+++ b/npc/events/valentinesday_2012.txt
@@ -0,0 +1,183 @@
+//===== rAthena Script =======================================

+//= Valentine's Day NPC's 2012

+//===== By: ==================================================

+//= Rikimaru

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= rAthena SVN

+//===== Description: =========================================

+//= The full Valentine's Day NPC's of the Valentine's Day

+//= Event 2012 (Account based,not Character based)

+//===== Additional Comments: =================================

+//= 1.0 First version. [Rikimaru]

+//============================================================

+//=============== Pinkamenia =================================

+mosk_in,21,246,5	script	Pinkamenia	71,{

+set .@n$,"^0000FF[ Pinkamenia ]^000000";

+if(#v_QUE15==1) {

+set .LFlowerID,7864;

+setarray @SweetsID[0],538,558,539,573,559,560,12062,596,597,12414,12319;

+setarray @SweetsCost[0],1,2,5,10,10,10,15,15,15,20,20;

+setarray @SweetsCount[0],1,1,1,1,1,1,1,1,1,1,1;

+mes .@n$;

+mes "Hello ["+strcharinfo(0)+"],do";

+mes "you want to buy some items?";

+mes "You'll have to give me Love";

+mes "Flowers for the Items!";

+next;

+	if (select("Yes,sure","No,nevermind!") == 2) 

+		close;

+	next;

+	mes .@n$;

+	mes "Item = Cost";

+	for( set .@i, 0; .@i < getarraysize(@SweetsID); set .@i, .@i + 1 ) {

+		mes "^0000ff"+@SweetsCount[.@i]+"x "+getitemname(@SweetsID[.@i])+"^000000 = ^00aa00"+@SweetsCost[.@i]+"^000000";

+		if( .@i < 1 )

+			set .@menu$, getitemname(@SweetsID[.@i]);

+		else

+			set .@menu$, .@menu$+":"+getitemname(@SweetsID[.@i]);

+	}

+

+	next;

+	select(.@menu$);

+	set @choice, @menu - 1;

+

+	mes .@n$;

+	if(countitem(.LFlowerID) <@SweetsCost[@choice]) {

+		mes "You need more Love Flowers for "+@SweetsCount[@choice]+"x '"+getitemname(@SweetsID[@choice])+"'";

+		close;

+	}

+	mes "Are u realy sure to trade "+@SweetsCount[@choice]+"x '^ff0000"+getitemname(@SweetsID[@choice])+"^000000' for ^00aa00"+@SweetsCost[@choice]+"^000000 Love Flowerss?";

+	if(select("No! Cancel!:Yes, Trade me!") == 1 ) {

+		mes "Canceled the Trade";

+		close;

+	}

+

+	set .@new, .LFlowerID - @SweetsCost[@choice];

+	if( .@new < 0 )

+		set .@new, 0;

+	delitem .LFlowerID,@SweetsCost[@choice];

+	getitem @SweetsID[@choice], @SweetsCount[@choice];

+	mes "The Trade was succesfull. Have fun with the Item!";

+	close;

+}

+if(#V_QUE14==1) {

+mes .@n$;

+if(countitem(7864) < 15) {

+mes "Sorry but you have to bring me 15 Love Flower!";

+close;

+}

+mes "Thank you so much,for";

+mes "getting out Flowers back!";

+delitem 7864,15;

+next;

+mes .@n$;

+mes "Take this as a little";

+mes "Thank you.";

+set BaseEXP,+500000;

+set JobEXP,+400000;

+getitem 617,1;

+getitem 12319,2;

+next;

+mes .@n$;

+mes "If you get more Love";

+mes "Flowers,you can exchange";

+mes "them for some sweets here.";

+next;

+mes .@n$;

+mes "See you soon!";

+set #V_QUE15,1;

+close;

+}

+if(#V_QUE12==1) {

+mes .@n$;

+mes "Please bring a ";

+mes "+8 Cake Hat to Baker";

+mes "Extraordinaire,who is standing";

+mes "right next to me!";

+close;

+}

+if(BaseLevel >= 45) {

+mes .@n$;

+mes "Hello "+strcharinfo(0)+",it's";

+mes "Valentine's Day and we";

+mes "love to deliver sweet";

+mes "chocolate to the Friends";

+mes "of people,who pay us.";

+next;

+mes .@n$;

+mes "Our problem is,that we";

+mes "need a strong Person";

+mes "like you,who could help";

+mes "us,but first you'll have";

+mes "to bring a +8 Cake Hat";

+mes "to Baker Extraordinaire,who";

+mes "is standing right next to me!";

+set #V_QUE12,1;

+close;

+}

+mes .@n$;

+mes "Hello "+strcharinfo(0)+"!";

+close;

+}

+//=============== Baker Extraordinaire =======================

+mosk_in,21,244,3	script	Baker Extraordinaire	410,{

+set .@n$,"^0000FF[ Baker Extraordinaire ]^000000";

+if(#V_QUE15==1) {

+mes .@n$;

+mes "Exchange your Love Flowers at Pinkamenia!";

+close;

+}

+if(#V_QUE14==1) {

+mes .@n$;

+mes "Bring 15 Love Flowers to Pinkamenia!";

+close;

+}

+if(#V_QUE12==1) { 

+mes .@n$;

+if(getequipid(1==5024) && getequiprefinerycnt(1) >= 8) {

+mes "Ah,so Pinkamenia told you";

+mes "to bring me the +8 Cake";

+mes "Hat.Now I'm going";

+mes "to change your +8 Cake";

+mes "Hat into another Cake Hat.";

+next;

+mes .@n$;

+delitem 5024,1;

+getitem 5105,1;

+mes "Now,if you wear the";

+mes "new Cake Hat,there";

+mes "is a chance,that";

+mes "Demi-Human Monsters drop";

+mes "the item Love Flower";

+next;

+mes .@n$;

+mes "The Mobs stole our Flowers,";

+mes "which we need to create ";

+mes "our Chocolate.Now ";

+mes "get 15 Love Flowers and";

+mes "bring them to Pinkamenia,please.";

+set #V_QUE14,1;

+close;

+} else {

+mes "Sorry,but where is your";

+mes "+8 Cake Hat?";

+mes "Bring it to me,please.";

+mes "and remember,that you";

+mes "have to equip it on";

+mes "your head!";

+close;

+}

+}

+if(BaseLevel < 45) {

+mes .@n$;

+mes "Hello "+strcharinfo(0)+"!";

+close;

+}

+if(BaseLevel >= 45) {

+mes .@n$;

+mes "Hello "+strcharinfo(0)+"!";

+close;

+}

+}
\ No newline at end of file
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index bbf59bff0..1cd1a2743 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -2706,7 +2706,7 @@ REPLACE INTO `item_db` VALUES (5101,'Takius_Blindfold','Takius\'s Blindfold',5,2
 REPLACE INTO `item_db` VALUES (5102,'Round_Eyes','Blank Eyes',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,512,NULL,0,0,185,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (5103,'Sunflower_Hairpin','Sunflower Hairpin',5,20,NULL,600,NULL,1,NULL,0,0xFFFFFFFE,7,2,256,NULL,30,0,186,'bonus bAgi,2; bonus bCritical,5;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5104,'Dark_Blindfold','Dark Blinder',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFE,7,2,512,NULL,0,0,187,'bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Stun,200;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5105,'Hat_Of_Cake_','2nd Anniversary Hat',5,20,NULL,1000,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,24,1,109,'bonus bDex,1; bonus bMaxSP,80;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5105,'Hat_Of_Cake_','2nd Anniversary Hat',5,20,NULL,1000,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,24,1,109,'bonus bDex,1; bonus bMaxSP,80; bonus3 bAddMonsterDropItem,7864,7,50;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5106,'Cone_Hat_INA','2nd Anniversary Hat',5,20,NULL,300,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,1,0,144,'bonus bLuk,1;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5107,'Well_Baked_Toast','Crunch Toast',5,20,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,7,2,1,NULL,0,0,188,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (5108,'Detective_Hat','Renown Detective\'s Cap',5,20,NULL,350,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,189,NULL,NULL,NULL);