changing towels, adding gem powders

2 files changed, 37 insertions, 34 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 61ca3a30..670a6fa1 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -321,8 +321,23 @@
 806,		ReedBundle,			Reed Bundle,			3,	20,	10,	7,	,	,	,	,	,	2,	,	,	,	,	{},					{},					,
 807,		GrassSeed,			Grass Seed,			3,	20,	10,	1,	,	,	,	,	,	2,	,	,	,	,	{},					{},					,
 #ID,		Name,				Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}
-808,		WhiteWarpTowel,			White Towel,			3,	1000,	500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}
-
+808,		GreyWarpTowel,			Enchanted Towel,		3,	1000,	500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}
+809,		WhiteWarpTowel,			White Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useWhiteWarpTowel";},		{}
+810,		RedWarpTowel,			Red Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useRedWarpTowel";},	{}
+811,		GreenWarpTowel,			Green Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useGreenWarpTowel";},	{}
+812,		BlueWarpTowel,			Blue Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useBlueWarpTowel";},	{}
+813,		YellowWarpTowel,		Yellow Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useYellowWarpTowel";},	{}
+814,		PurpleWarpTowel,		Purple Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "usePurpleWarpTowel";},		{}
+815,		OrangeWarpTowel,		Orange Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useOrangeWarpTowel";},	{}
+816,		PinkWarpTowel,			Pink Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "usePinkWarpTowel";},	{}
+817,		TealWarpTowel,			Teal Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useTealWarpTowel";},	{}
+818,		LimeWarpTowel,			Lime Enchanted Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useLimeWarpTowel";},	{}
+819,		GemPowderWhite,			Diamond Powder,			3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
+820,		GemPowderRed,			Ruby Powder,			3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
+821,		GemPowderGreen,			Emerald Powder,			3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
+822,		GemPowderBlue,			Sapphire Powder,		3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
+823,		GemPowderYellow,		Topaz Powder,			3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
+824,		GemPowderPurple,		Amethyst Powder,		3,	1000,	500,	5,	,	,	,	,	,	,	,	,	,	,	{},					{}
 
 // Add new entries above here.  For dyed entries, add to the bottom of the 2000s.
 
@@ -615,16 +630,6 @@
 2237,		OrangeBowlerHatBrown,		Orange Bowler Hat Brown,	5,	2500,	1250,	30,	,	10,	,	2,	0,	2,	256,	,	0,	0,	{},					{}
 2238,		PurpleBowlerHatBrown,		Purple Bowler Hat Brown,	5,	2500,	1250,	30,	,	10,	,	2,	0,	2,	256,	,	0,	0,	{},					{}
 2239,		DarkGreenBowlerHatBrown,	Dark Green Bowler Hat Brown,	5,	2500,	1250,	30,	,	10,	,	2,	0,	2,	256,	,	0,	0,	{},					{}
-2240,		RedWarpTowel,			Red Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useRedWarpTowel";},		{}
-2241,		GreenWarpTowel,			Green Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useGreenWarpTowel";},	{}
-2242,		DarkBlueWarpTowel,		DarkBlue Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useDarkBlueWarpTowel";},	{}
-2243,		YellowWarpTowel,		Yellow Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useYellowWarpTowel";},	{}
-2244,		LightBlueWarpTowel,		LightBlue Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useLightBlueWarpTowel";},	{}
-2245,		PinkWarpTowel,			Pink Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "usePinkWarpTowel";},		{}
-2246,		BlackWarpTowel,			Black Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useBlackWarpTowel";},	{}
-2247,		OrangeWarpTowel,		Orange Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useOrangeWarpTowel";},	{}
-2248,		PurpleWarpTowel,		Purple Towel,			0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "usePurpleWarpTowel";},	{}
-2249,		DarkGreenWarpTowel,		DarkGreen Towel,		0,	1000,	500,	30,	,	,	,	,	,	2,	,	,	0,	,	{callfunc "useDarkGreenWarpTowel";},	{}
 #ID,		Name,				Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}
 
 // Add dyed entries above here.  For regular entries, please use the < 1000s.
diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt
index 11373b83..5ef5167b 100644
--- a/npc/items/warpTowels.txt
+++ b/npc/items/warpTowels.txt
@@ -1,52 +1,50 @@
+function	script	useWhiteWarpTowel	{
+	warp "020-1.gat",66,91; // Nivalis
+	getitem "GreyWarpTowel", 1;
+	end;
+}
 function	script	useRedWarpTowel	{
 	warp "009-1.gat",51,40; // Hurnscald
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
 function	script	useGreenWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	useDarkBlueWarpTowel	{
+function	script	useBlueWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
 function	script	useYellowWarpTowel	{
 	warp "001-1.gat",40,71; // Tulimshar
-	getitem "WhiteWarpTowel", 1;
-	end;
-}
-function	script	useLightBlueWarpTowel	{
-	warp "020-1.gat",66,91; // Nivalis
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	usePinkWarpTowel	{
+function	script	usePurpleWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	useBlackWarpTowel	{
+function	script	useOrangeWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	useOrangeWarpTowel	{
+function	script	usePinkWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	usePurpleWarpTowel	{
+function	script	useTealWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-function	script	useDarkGreenWarpTowel	{
+function	script	useLimeWarpTowel	{
 	warp "003-1.gat",35,25;
-	getitem "WhiteWarpTowel", 1;
+	getitem "GreyWarpTowel", 1;
 	end;
 }
-
-//TODO: entry in items.xml