Added new monsters and items.

4 files changed, 107 insertions, 15 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 06cccce1..a03f3328 100755
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -49,7 +49,29 @@
 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,,,,{},{}
+547,Spear,Spear,4,20,10,10,100,,,,0,2,2,,,,{},{}
+548,Pickaxe,Pickaxe,4,20,10,10,100,,,,0,2,2,,,,{},{}
+549,Axe,Axe,4,20,10,10,100,,,,0,2,2,,,,{},{}
+550,Blacksmith_Axe,Blacksmith's axe,4,20,10,10,100,,,,0,2,2,,,,{},{}
+551,Hint1,Hint,3,0,0,10,,,,,,,,,,,{},{}
+552,Hint2,Hint,3,0,0,10,,,,,,,,,,,{},{}
+553,Hint3,Hint,3,0,0,10,,,,,,,,,,,{},{}
+554,Hint4,Hint,3,0,0,10,,,,,,,,,,,{},{}
+555,Hint5,Hint,3,0,0,10,,,,,,,,,,,{},{}
+556,Hint6,Hint,3,0,0,10,,,,,,,,,,,{},{}
+557,Hint7,Hint,3,0,0,10,,,,,,,,,,,{},{}
+558,Hint8,Hint,3,0,0,10,,,,,,,,,,,{},{}
+559,Hint9,Hint,3,0,0,10,,,,,,,,,,,{},{}
+560,Hint10,Hint,3,0,0,10,,,,,,,,,,,{},{}
+561,SabreSword,SabreSword,4,10000,5000,100,100,,1,0,10477567,2,2,1,1,1,{},{}
+562,ChickenLeg,ChickenLeg,0,250,125,10,,,,,10477567,2,,,,,{ itemheal 500,5; },{}
+563,WinterGloves,WinterGloves,5,6000,3000,20,,2,,0,10477567,2,4,,0,0,{},{}
+564,WoolSweather,WoolSweather,5,2000,1000,10,,6,,,10477567,2,16,,,,{},{}
+565,Petal,Petal,0,50,25,10,,,,,10477567,2,,,,,{ itemheal 50,5; },{}
+566,SmallMushroom,SmallMushroom,0,50,25,10,,,,,10477567,2,,,,,{ itemheal 50,5; },{}
+567,IronPotion,IronPotion,0,500,250,10,,,,,10477567,2,,,,,{ sc_start SC_ATKPOT,30,30; },{}
+568,ConcentrationPotion,ConcentrationPotion,0,500,250,10,,,,,10477567,2,,,,,{ sc_start SC_SpeedPot0,1800,0; },{}
 1199,Arrow,Arrow,10,1,1,1,25,,,,35046926835711,2,32768,,1,,{},{}
 1200,Bow,Bow,4,1000,500,200,15,,5,0,10477567,2,34,1,4,11,{},{}
 1201,Knife,Knife,4,50,25,100,5,,1,0,554329694207,2,2,1,1,1,{},{}
-1202,Cotton_Shirt,Cotton Shirt,5,10,5,100,,2,,0,10477567,2,16,,0,0,{},{}
+1202,Cotton_Shirt,Cotton Shirt,5,10,5,100,,2,,0,10477567,2,16,,0,0,{},{}
\ No newline at end of file
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 7860bfaf..ac1c1fa8 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -12,4 +12,8 @@
 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,400,100,4,6,20,20,10,10,35,10,2,1,1,0,20,133,1000,1500,672,480,524,300,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,,,,,,
+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,5,535,100,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
+1013,EvilMushroom,EvilMushroom,1,4000,0,420,110,1,400,100,4,6,20,20,10,10,35,10,1,1,1,3,25,137,800,1800,672,480,535,500,540,5,534,100,566,500,0,0,0,0,909,0,0,0,0,0,0,0,,,,,,
+1014,SleepFlower,SleepFlower,1,4000,0,260,110,5,100,100,0,5,20,20,20,20,20,20,5,5,1,3,25,128,800,800,672,480,535,100,540,5,1199,100,526,400,565,500,0,0,909,0,0,0,0,0,0,0,,,,,,
+1015,SantaSlime,SantaSlime,1,2500,0,100,0,2,100,60,2,7,1,30,1,0,30,30,2,2,1,0,20,161,1500,1872,672,480,512,800,513,700,514,600,519,500,527,400,538,10,0,0,0,0,0,0,0,0,,,,,,
+1016,RudolphSlime,RudolphSlime,1,250,0,30,16,1,18,30,2,7,1,30,1,0,30,30,1,1,1,0,20,131,1500,1872,672,480,504,800,506,500,508,200,509,300,510,600,515,200,516,10,0,0,0,0,0,0,,,,,,
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
new file mode 100644
index 00000000..4d553194
--- /dev/null
+++ b/db/mob_skill_db.txt
@@ -0,0 +1,63 @@
+// Aegis zone 8.5 -> eAthena conversion by Komurka
+// + Mob Skills for Einbroch+ by Lupus
+//MOB_ID, a unused dummy character sequence (for information only), STATE, SKILL_ID, SKILL_LV,
+// rate (10000 = 100%), casttime, delay, cancelable, a target, a condition type, a condition value,
+// a value 1, a value 2, a value 3, a value 4, a value 5, emotion
+//Example
+//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7
+//
+//rate refers to the chance of the skill being casted when the condition is fulfilled.
+//delay is the time in milliseconds that has to be pass before recasting the same skill.
+//
+//STATE:
+// any / idle (in standby) / walk (in movement) / dead (on killed) / loot /
+// attack / angry (like attack, except player has not attacked mob yet) / 
+// chase (following target, after being attacked) / follow (following
+// target, without being attacked)
+//
+//target: The target of the skill can be: target (when a PC is targetted) / self / friend / master
+// (the following are for ground-skills, a random target tile is selected from
+// the specified area):
+// around1 (3x3 area around self) / around2 (5x5 area around self) / 
+// around3 (7x7 area around self) / around4 (9x9 area around self) /
+// around5 (3x3 area around target) / around6 (5x5 area around target) /
+// around7 (7x7 area around target) / around8 (9x9 area around target) /
+// around (11x11 area around self)
+//
+//conditions: (condition type) (value which specifies a condition value) 
+//	always			uncondtional
+//	myhpltmaxrate		when the mob's hp drops to a certain %
+//	mystatuson		If the mob has any abnormalities in status (condition value), 
+//	mystatusoff		If the mob has ended any abnormalities in status (condition value), 
+//	friendhpltmaxrate	when the mobs' friend's hp drops to a certain %
+//	friendstatuson		If the friend has any abnormalities in status (condition value), 
+//	friendstatusoff		If the friend has ended any abnormalities in status (condition value), 
+//	attackpcgt		Attack PC becomes more than the  number of specification 
+//	attackpcge		Attack PC becomes equal or more than the number of specification. 
+//	slavelt			when the number of slaves is lower than the original number of specification. 
+//	slavele			when the number of slaves is lower or equal than the original number of specification. 
+//	closedattacked		when melee attacked (close range attack)
+//	longrangeattacked	when long ranged attacked (like bows and far range weapons)
+//	skillused		when a skill is used on the mob
+//	afterskill		after the mob used certain skill.
+//	casttargeted		when a target is in cast range.
+//	rudeattacked		when a target is rude attacked
+//	hiding			*not implemented yet* when a target is hidden
+//
+// The character's state which can be specified to be a condition value by the statuson/statusoff system
+//	anybad		any type of state change
+//	stone		condition of being in stone state
+//	freeze		condition of being in frozen state
+//	stan		condition of being in stunned state
+//	sleep		condition of being in sleep state
+//	poison		condition of being in poisoned state
+//	curse		condition of being in cursed state
+//	silence		condition of being in silenced state
+//	confusion		condition of being in confusion state
+//	blind		condition of being in blind state
+//	hiding		condition of being in hidden state
+//	sight		condition of being in unhidden state
+1015,SantaSlime@NPC_EMOTION,idle,197,1,200,0,5000,yes,self,always,0,7,,,,,
+1015,SantaSlime@NPC_EMOTION,walk,197,1,100,0,10000,yes,self,always,0,5,,,,,
+1015,SantaSlime@NPC_SUMMONSLAVE,attack,196,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
+1015,SantaSlime@NPC_SUMMONSLAVE,idle,196,5,10000,2000,60000,no,self,slavele,3,1016,,,,,
\ No newline at end of file
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 1868aaa0..71b76e61 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -1,15 +1,18 @@
 //skill_db.txt�—AthenaDBŒv‰æ 2004/06/06 14:27:11 +0900 (JST)
 //id,range,hit,inf,pl,nk,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count
-1,0,0,0,0,0,9,0,no,0,0,0,none,0	//NV_BASIC#Šî–{ƒXƒLƒ‹#
-2,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//SM_SWORD#Œ•�C—û#
-4,0,0,0,0,0,10,0,no,0,0,0,none,0	//SM_RECOVERY#HP‰ñ•œ—ÍŒü�ã#
-9,0,0,0,0,0,10,0,no,0,0,0,none,0	//MG_SRECOVERY#SP‰ñ•œ—ÍŒü�ã#
-36,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_INCCARRY#�ŠŽ�ŒÀŠE—Ê‘�‰Á#
-37,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_DISCOUNT#ƒfƒBƒXƒJƒEƒ“ƒg#
-38,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_OVERCHARGE#ƒI�[ƒo�[ƒ`ƒƒ�[ƒW#
-48,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_DOUBLE#ƒ_ƒuƒ‹ƒAƒ^ƒbƒN#
-49,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_MISS#‰ñ”𗦑�‰Á#
-142,0,6,4,0,1,1,1,no,0,1,0,none,0	//NV_FIRSTAID#‰ž‹}Žè“–#
-144,0,0,0,0,0,1,0,no,0,1,0,none,0	//SM_MOVINGRECOVERY#ˆÚ“®ŽžHP‰ñ•œ#
-146,0,0,0,0,0,1,0,no,0,1,0,weapon,0	//SM_AUTOBERSERK#ƒI�[ƒgƒo�[ƒT�[ƒN#
-150,0,6,4,0,1,1,1,no,0,1,0,weapon,5	//TF_BACKSLIDING#ƒoƒbƒNƒXƒeƒbƒv#
\ No newline at end of file
+1,0,0,0,0,0,9,0,no,0,0,0,none,0	//NV_BASIC
+2,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//SM_SWORD
+4,0,0,0,0,0,10,0,no,0,0,0,none,0	//SM_RECOVERY
+9,0,0,0,0,0,10,0,no,0,0,0,none,0	//MG_SRECOVERY
+36,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_INCCARRY
+37,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_DISCOUNT
+38,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_OVERCHARGE
+48,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_DOUBLE
+49,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_MISS
+142,0,6,4,0,1,1,1,no,0,1,0,none,0	//NV_FIRSTAID
+144,0,0,0,0,0,1,0,no,0,1,0,none,0	//SM_MOVINGRECOVERY
+146,0,0,0,0,0,1,0,no,0,1,0,weapon,0	//SM_AUTOBERSERK
+150,0,6,4,0,1,1,1,no,0,1,0,weapon,5	//TF_BACKSLIDING
+//NPC Skills
+196,0,0,4,0,1,10,1,no,0,2,0,magic,0	//NPC_SUMMONSLAVE
+197,0,0,4,0,1,10,1,no,0,2,0,none,0	//NPC_EMOTION