event!

4 files changed, 29 insertions, 34 deletions

diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index b0b8b407..3c29f794 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -77,3 +77,4 @@ npc: npc/guide.txt
 npc: npc/nekkio.txt
 npc: npc/spekko.txt
 npc: npc/heal.txt
+npc: npc/event1.txt
diff --git a/db/item_db.txt b/db/item_db.txt
index 13db6ad6..05e32e7b 100755
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1,31 +1,3 @@
-//Changes by Deviexx
-
-//       Sell prices changed
-// Red Scorp Stiner - 85gp
-// Scorp stinger - 25
-// xmas cake - 10 
-// Choc. Bar - 20 // changed healing to 20
-// Cactus Potion - 35 // changed healing to 25
-// cactus drink //changed healing to 15
-// cherry cake // changed healing to 35
-// Ginger Bread Man - 25 // changed healing to 20
-// slice of cake - 15 // changed healing to 15
-// xmas candy cane // changed healing to 10
-// purple present - 25
-// yellow present - 30
-
-//       Def Changes
-// Leath shirt def to 4
-// miner gloves def to 2
-// leather gloves def to 3
-// cotton shirt def to 2
-
-//       Atk Changes
-// Arrow to 20.
-
-
-
-
 // File created using Spamrat's Athena Database Editor v1.4.4
 //
 //ID,Name,Jname,Type,Price,Sell,Weight,ATK,DEF,Range,Slot,Job,Gender,Loc,wLV,eLV,View,{UseScript},{EquipScript}
@@ -54,7 +26,7 @@
 521,Dagger,Dagger,4,1000,500,100,15,,1,0,10477567,2,2,1,1,1,{},{}
 522,Sharp_Knife,Sharp knife,4,100,50,100,10,,1,0,554329694207,2,2,1,1,1,{},{}
 523,Leather_Shirt,Leather Shirt,5,10,1000,100,,4,,0,10477567,2,16,,0,0,{},{}
-524,Fancy_Hat,Fancy Hat,5,800,400,200,,2,,0,10477567,2,256,,0,0,{},{}
+524,Fancy_Hat,Fancy Hat,5,1600,800,200,,5,,0,10477567,2,256,,0,0,{},{}
 525,Miner_Hat,Miner Hat,5,800,400,200,,4,,0,10477567,2,256,,0,0,{},{}
 526,Coins_Bag,Coins Bag,3,100,50,5,,,,,,,,,,,{},{}
 527,Milk,Milk,0,300,150,5,,,,,10477567,2,,,,,{ itemheal 150,0; },{}
@@ -70,10 +42,10 @@
 537,Treasure_key,Treasure key,3,100,50,5,,,,,,,,,,,{},{}
 538,Green_Present,Green present,0,20,10,10,,,,,10477567,2,,,,,{},{}
 539,Beer,Beer,0,175,87,10,,,,,10477567,2,,,,,{ itemheal 200,5; },{}
-540,Empty Bottle,Empty Bottle,3,20,10,10,,,,,10477567,2,,,,,{},{}
+540,Empty Bottle,Empty Bottle,3,20,10,10,,,,,,,,,,,{},{}
 541,Bottle_Water,Bottle Water,0,200,100,10,,,,,10477567,2,,,,,{ itemheal 250,0; },{}
-542,Bottled_Sand,Bottled Sand,3,70,35,10,,,,,10477567,2,,,,,{},{}
-543,Head_Band,Head Band,5,400,200,10,,1,,,10477567,2,256,,,,{},{}
+542,Bottled_Sand,Bottled Sand,3,70,35,10,,,,,,,,,,,{},{}
+543,Head_Band,Head Band,5,5000,2000,10,,10,,,10477567,2,256,,,,{},{}
 544,Silk_Headband,Silk Headband,5,800,400,10,,3,,,10477567,2,256,,,,{},{}
 545,Forest_Bow,Forest Bow,4,5000,2500,10,65,,5,,10477567,2,34,,,,{},{}
 546,Desert_Shirt,Desert_Shirt,5,2000,1000,10,,6,,,10477567,2,16,,,,{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index a572a238..5c6cbc3c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -10,7 +10,6 @@
 1007,Yellow_slime,Yellow Slime,1,400,0,20,2,1,20,25,2,7,10,8,2,1,34,1,1,1,1,0,20,131,1400,1800,672,480,534,200,519,100,501,350,502,250,522,10,909,0,909,0,0,0,0,0,0,0,,,,,,
 1008,Red_slime,Red Slime,1,400,0,65,56,1,30,50,2,7,15,10,2,1,25,1,1,1,1,0,20,135,1300,1500,672,480,1201,300,509,110,521,200,523,40,525,80,535,750,528,250,531,150,0,0,0,0,,,,,,
 1009,BlackScorpion,Black Scorpion,1,1100,0,200,70,1,80,90,4,6,20,20,10,10,35,10,1,1,1,0,20,133,1000,1500,672,480,523,150,509,100,518,800,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
-1010,Snake,Snake,1,4000,0,400,100,1,200,80,4,6,20,20,10,10,35,10,2,1,1,0,20,133,1000,1500,672,480,524,300,542,2000,541,5000,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
+1010,Snake,Snake,1,1000,0,100,25,1,100,50,4,6,20,20,10,10,35,10,2,1,1,0,20,133,1000,1500,672,480,540,10000,0,0,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
 1011,Fire_Goblin,Fire Goblin,1,50,0,3,2,1,7,10,0,5,1,1,1,0,6,30,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,800,502,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
 1012,Spider,Spider,1,2000,0,230,90,1,150,80,4,6,20,20,10,10,35,10,2,1,1,0,25,175,1000,1500,672,480,537,500,535,100,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
-1013,Snake_,Snake,1,4000,0,400,100,1,100,40,4,6,20,20,10,10,35,10,2,1,1,10,20,133,1000,1500,672,480,540,10000,-1,0,-1,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
diff --git a/npc/event1.txt b/npc/event1.txt
new file mode 100644
index 00000000..54580c6b
--- /dev/null
+++ b/npc/event1.txt
@@ -0,0 +1,23 @@
+new_3-1.gat,35,30,0	script	Guard	110,{
+	mes "[Guard]";
+	mes "Snakes are entering the city, please help us killing them";
+	mes "Bring me a proof that you killed at least 50 snakes and you'll be rewarded!";
+	next;
+	goto check;
+check:
+	if(countitem(540) >= 50) goto have;
+	mes "[Guard]";
+	mes "Please hurry and kill some snakes";
+	close;
+have:
+	mes "[Guard]";
+	mes "Thank you very much!!";
+	delitem 540,50;
+	next;
+	mes "[Guard]";
+	mes "Here it is your reward:";
+	mes "an headband and a fresh beer";
+	getitem 543,1;
+	getitem 539,1;
+	close;
+}