Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline

Conflicts:
	db/item_db.txt
	npc/013-3_Cave/barrier.txt

2 files changed, 5 insertions, 2 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index ed27292a..ea5a1cec 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -224,6 +224,7 @@
 740,Root,Root,3,500,200,5,,,,,,,,,,,{},{},,
 741,CottonGloves,Cotton Gloves,5,2000,500,20,,1,,-10,0,2,4,,0,0,{},{},,
 742,FourLeafClover,Four-Leaf Clover,5,10000,5000,1,,,,5,0,2,8,,0,0,{},{ bonus bLuk, 1; },
+743,Acorn,Acorn,0,50,10,1,,,,,,2,,,0,,{ itemheal 3,0; },{},
 744,DilutedConcentrationPotion,Diluted Concentration Potion,0,250,100,10,,,,,,2,,,0,,{ sc_start 37,30, 20; },{}
 745,DarkConcentrationPotion,Dark Concentration Potion,0,50,25,10,,,,,,2,,,0,,{ sc_start 37,10, 40; sc_start sc_poison, 1, 50;},{}
 1198,JackOSoul,Jack O Soul,3,100000,1,1,,,,,,,,,,,{},{},,
@@ -246,6 +247,8 @@
 1215,ToySabre,Toy Sabre,4,50,25,1,1,,1,,0,2,2,1,1,1,{},{},,
 1216,MoubooHead,Mouboo Head,5,10,1,20,,1,,0,0,2,256,,0,0,{},{},,
 1217,CatEars,Cat Ears,5,100,50,2,,1,,1,0,2,256,,0,0,{},{ bonus bAgi, 3; },
+1218,PaperBagHelm,Paper Bag,5,1000,5,1,,1,,-1,0,2,256,,0,0,{},{ bonus bAgi, -1; },
+1219,MoubootaurHead,Moubootaur Head,5,10,1,20,,1,,0,0,2,256,,0,0,{},{},,
 2050,RedCottonShirt,Red Cotton Shirt,5,10,5,100,,2,,-4,0,2,512,,0,0,{},{},,
 2051,GreenCottonShirt,Green Cotton Shirt,5,10,5,100,,2,,-4,0,2,512,,0,0,{},{},,
 2052,DarkBlueCottonShirt,Dark Blue Cotton Shirt,5,10,5,100,,2,,-4,0,2,512,,0,0,{},{},,
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 4e19fcc7..21e8b529 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -22,7 +22,7 @@
 1022,JackO,Jack O,250,10000,0,0,5000,2,100,500,40,20,35,40,25,25,35,50,1,1,1,0,20,133,250,1500,672,480,617,300,622,400,624,400,620,400,615,300,1203,400,1198,10000,616,600,0,0,0,0,,,,,,,2,30
 1023,FireSkull,Fire Skull,180,5000,0,0,100,2,75,175,35,15,30,30,20,20,25,60,1,1,1,3,23,175,600,1600,672,480,631,1000,701,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,30
 1024,PoisonSkull,Poison Skull,180,5000,0,0,100,2,75,175,35,15,30,30,20,20,25,60,1,1,1,3,25,175,600,1600,672,480,631,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,4,20
-1025,LogHead,Log Head,30,500,0,0,30,1,7,20,50,5,1,1,1,0,20,25,1,1,1,3,22,129,800,1872,672,480,569,2000,740,2500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,50
+1025,LogHead,Log Head,30,500,0,0,30,1,7,20,50,5,1,1,1,0,20,25,1,1,1,3,22,129,800,1872,672,480,569,2000,740,2500,743,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,50
 1026,MountainSnake,Mountain Snake,130,900,0,0,100,1,80,125,4,6,20,40,10,10,35,45,1,1,1,0,20,133,1000,1500,672,480,532,20,641,150,715,400,715,400,711,500,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
 1027,EasterFluffy,Easter Fluffy,30,500,0,0,3,1,10,12,0,5,1,1,1,0,20,25,1,1,1,3,20,129,800,1872,672,480,1208,2000,1209,2000,1210,2000,1211,1000,1212,1000,1213,200,0,0,0,0,0,0,0,0,,,,,,,1,40
 1028,Mouboo,Mouboo,85,1200,0,0,40,2,30,75,65,5,15,5,15,0,40,10,2,2,1,3,20,129,600,1872,672,480,660,200,660,100,541,750,660,10,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
@@ -35,4 +35,4 @@
 1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,10,20,11,10,10,40,10,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40
 // ,Zombie,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 1037,CloverPatch,Clover Patch,1,1,0,0,1,1,0,0,0,5,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,742,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
-1038,Squirrel,Squirrel,15,160,1,0,1,1,15,25,1,6,1,3,1,0,15,40,1,1,1,3,20,129,800,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,15
+1038,Squirrel,Squirrel,15,160,1,0,1,1,15,25,1,6,1,3,1,0,15,40,1,1,1,3,20,129,800,800,672,480,743,7000,680,1000,681,1000,682,1000,683,1000,0,0,0,0,0,0,0,0,0,0,,,,,,,1,15