Merge commit 'mainline/master'

Conflicts:
	conf/magic.conf

1 files changed, 28 insertions, 15 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 1f5f822a..d05eac62 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -117,7 +117,7 @@
 629,	MushHat,		Mush Hat,			5,	2500,	1250,	10,	,	10,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 630,	ShroomHat,		Shroom Hat,			5,	3000,	1500,	10,	,	13,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 631,	DarkCrystal,		Dark Crystal,			3,	100,	50,	10,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-632,	CottonSkirt,		CottonSkirt,			5,	1000,	500,	10,	,	4,	,	-8,	0,	10477567,	2,	1,	,	1,	0,	{},					{}
+632,	CottonSkirt,		Cotton Skirt,			5,	1000,	500,	10,	,	4,	,	-8,	0,	10477567,	2,	1,	,	1,	0,	{},					{}
 633,	ChristmasElfHat,	Christmas Elf Hat,		5,	3000,	1500,	10,	,	13,	,	2,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 634,	FaceMask,		Face Mask,			5,	2500,	1250,	10,	,	10,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 635,	SantaCookie,		Santa Cookie,			3,	1,	1,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
@@ -175,8 +175,8 @@
 685,	SmallHealingPotion,	Small Healing Potion,		0,	50,	25,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 200,0; },			{}
 686,	MediumHealingPotion,	Medium Healing Potion,		0,	100,	50,	20,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 400,0; },			{}
 687,	LargeHealingPotion,	Large Healing Potion,		0,	200,	100,	40,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 800,0; },			{}
-688,	WhiteTankTop,		White Tank Top,			5,	10,	5,	100,	,	2,	,	-4,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
-689,	WhiteShortTankTop,	White Short Tank Top,		5,	10,	5,	100,	,	2,	,	-4,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
+688,	TankTop,		Tank Top,			5,	10,	5,	100,	,	2,	,	-4,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
+689,	ShortTankTop,		Short Tank Top,			5,	10,	5,	100,	,	2,	,	-4,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
 690,	RedDye,			Red Dye,			3,	100,	20,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{},					{}
 691,	GreenDye,		Green Dye,			3,	2500,	1000,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{},					{}
 692,	DarkBlueDye,		Dark Blue Dye,			3,	40000,	15000,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{},					{}
@@ -213,7 +213,7 @@
 721,	HighPriestCrown,	High Priest Crown,		5,	20000,	5000,	60,	,	4,	,	20,	0,	10477567,	2,	256,	,	0,	0,	{},					{ bonus bMaxSP, 20; }
 722,	MonsterSkullHelmet,	Monster Skull Helmet,		5,	15000,	3000,	40,	,	7,	,	10,	0,	10477567,	2,	256,	,	0,	0,	{},					{ bonus bMdef, 20; }
 723,	DesertHat,		Desert Hat,			5,	5000,	1000,	10,	,	3,	,	-1,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-724,	CottonHeadBand,		Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+724,	CottonHeadband,		Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 725,	GMCap,			GM Cap,				5,	2000,	500,	10,	,	5,	,	5,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 726,	GMRobe,			GM Robe,			5,	8000,	4000,	5,	,	5,	,	0,	0,	10477567,	2,	512,	,	0,	0,	{},					{}
 727,	Iten,			Iten,				3,	0,	0,	100,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
@@ -224,12 +224,13 @@
 732,	DruidTreeBranch,	Druid Tree Branch,		3,	0,	0,	2,	,	,	,	,	,	10477567,	,	,	,	,	,	{},					{}
 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,	{},					{}
+735,	CottonBoots,		Cotton Boots,			5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	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,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
+741,	CottonGloves,		Cotton Gloves,			5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
 
 #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,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
@@ -362,16 +363,16 @@
 2139,	DarkGreenDesertHat,	Dark Green Desert Hat,		5,	5000,	1000,	10,	,	3,	,	-1,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 
 #ID,	Name,				Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
-2140,	RedCottonHeadBand,		Red Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2141,	GreenCottonHeadBand,		Green Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2142,	DarkBlueCottonHeadBand,		Dark Blue Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2143,	YellowCottonHeadBand,		Yellow Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2144,	LightBlueCottonHeadBand,	Light Blue Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2145,	PinkCottonHeadBand,		Pink Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2146,	BlackCottonHeadBand,		Black Cotton Head Band,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2147,	OrangeCottonHeadBand,		Orange Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2148,	PurpleCottonHeadBand,		Purple Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
-2149,	DarkGreenCottonHeadBand,	Dark Green Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2140,	RedCottonHeadband,		Red Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2141,	GreenCottonHeadband,		Green Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2142,	DarkBlueCottonHeadband,		Dark Blue Cotton Headband,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2143,	YellowCottonHeadband,		Yellow Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2144,	LightBlueCottonHeadband,	Light Blue Cotton Headband,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2145,	PinkCottonHeadband,		Pink Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2146,	BlackCottonHeadband,		Black Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2147,	OrangeCottonHeadband,		Orange Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2148,	PurpleCottonHeadband,		Purple Cotton Headband,		5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
+2149,	DarkGreenCottonHeadband,	Dark Green Cotton Headband,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 
 #ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
 2150,	RedCottonBoots,		Red Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
@@ -384,3 +385,15 @@
 2157,	OrangeCottonBoots,	Orange Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 2158,	PurpleCottonBoots,	Purple Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 2159,	DarkGreenCottonBoots,	Dark Green Cotton Boots,	5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
+
+#ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
+2160,	RedCottonGloves,	Red Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2161,	GreenCottonGloves,	Green Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2162,	DarkBlueCottonGloves,	Dark Blue Cotton Gloves,	5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2163,	YellowCottonGloves,	Yellow Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2164,	LightBlueCottonGloves,	Light Blue Cotton Gloves,	5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2165,	PinkCottonGloves,	Pink Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2166,	BlackCottonGloves,	Black Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2167,	OrangeCottonGloves,	Orange Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2168,	PurpleCottonGloves,	Purple Cotton Gloves,		5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
+2169,	DarkGreenCottonGloves,	Dark Green Cotton Gloves,	5,	2000,	500,	20,	,	1,	,	-10,	0,	10477567,	2,	4,	,	0,	0,	{},					{}
\ No newline at end of file