Merge commit 'mainline/master'

Conflicts:
	db/item_db.txt

2 files changed, 7 insertions, 7 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index dbf42473..1f5f822a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -38,7 +38,7 @@
 536,	ShortSword,		Short Sword,			4,	8000,	4000,	100,	100,	,	1,	,	0,	10477567,	2,	2,	1,	1,	1,	{},					{}
 537,	TreasureKey,		Treasure Key,			3,	100,	50,	5,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 538,	GreenPresentBox,	Green Present Box,		0,	20,	10,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{},					{}
-539,	Beer,			Beer,				0,	175,	87,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 200,0; },			{}
+539,	Beer,			Beer,				0,	175,	87,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 200,5; },			{}
 540,	EmptyBottle,		Empty Bottle,			3,	20,	10,	10,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 541,	BottleOfWater,		Bottle of Water,		0,	200,	100,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 250,0; getitem 540,1; },	{}
 542,	BottleOfSand,		Bottle of Sand,			3,	70,	35,	10,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
@@ -225,11 +225,11 @@
 733,	PurificationPotion,	Purification Potion,		0,	0,	0,	5,	,	,	,	,	,	10477567,	2,	,	,	,	,	{ callfunc "usePurificationPotion"; },	{}
 734,	BlackBoots,		Black Boots,			5,	20000,	3000,	35,	,	4,	,	-10,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 735,	WhiteCottonBoots,	White Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
-736,	WhiteCake,		WhiteCake,			0,	500,	100,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 10,0; },			{}
-737,	ChocolateCake,		ChocolateCake,			0,	550,	125,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 11,0; },			{}
-738,	OrangeCake,		OrangeCake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
-739,	AppleCake,		AppleCake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
-
+736,	WhiteCake,		White Cake,			0,	500,	100,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 10,0; },			{}
+737,	ChocolateCake,		Chocolate Cake,			0,	550,	125,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 11,0; },			{}
+738,	OrangeCake,		Orange Cake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
+739,	AppleCake,		Apple Cake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
+740,	Root,			Root,				3,	500,	200,	5,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
 
 #ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
 1198,	JackOSoul,		Jack O Soul,			3,	100000,	1,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 243e3015..f8d17d12 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,0,0,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,0,0,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