Cotton Pants/Cotton Trousers

Rename Cotton Pants to Cotton Trousers.
Some minor fixes in Lora Tay.
Added it in Bleacher/Dyer.
Submodule pointer updated.

5 files changed, 29 insertions, 14 deletions

diff --git a/client-data b/client-data
-Subproject a23afa05bcebdd8dbb41b46f01b5ed9cdf07a20
+Subproject 48918d269c156ff06bec11e271cbab9bb2ff9ff
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index d2786d97..437536cf 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -154,7 +154,7 @@
 645,		GoldenPlatemail,		Golden Platemail,		5,	9999000,3000,	4500,	,	25,	,	-100,	0,	2,	512,	,	0,	0,	{},					{},					,
 646,		Crown,				Crown,				5,	5000,	1000,	240,	,	4,	,	0,	0,	2,	256,	,	0,	0,	{},					{},					,
 647,		DevelopersCap,			Developer's Cap,		5,	2000,	500,	20,	,	5,	,	5,	0,	2,	256,	,	0,	0,	{},					{},					,
-648,		CottonPants,            Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+648,		CottonTrousers,			Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
 649,		WhiteEvokersRobeBlue,		White Evokers Robe Blue,	5,	8000,	4000,	5,	,	5,	,	20,	0,	2,	512,	,	0,	0,	{},					{bonus bAgi,				1;},	,
 650,		BlackEvokersRobeBlue,		Black Evokers Robe Blue,	5,	8000,	4000,	5,	,	5,	,	20,	0,	2,	512,	,	0,	0,	{},					{bonus bAgi,				1;},	,
 651,		WhiteWizardRobe,		White Wizard Robe,		5,	8000,	4000,	5,	,	5,	,	0,	0,	2,	512,	,	0,	0,	{},					{},					,
@@ -581,16 +581,16 @@
 2177,		OrangeMiniskirt,		Orange Miniskirt,		5,	1000,	500,	8,	,	4,	,	-8,	0,	2,	1,	,	1,	0,	{},					{}
 2178,		PurpleMiniskirt,		Purple Miniskirt,		5,	1000,	500,	8,	,	4,	,	-8,	0,	2,	1,	,	1,	0,	{},					{}
 2179,		DarkGreenMiniskirt,		Dark Green Miniskirt,		5,	1000,	500,	8,	,	4,	,	-8,	0,	2,	1,	,	1,	0,	{},					{}
-2180,		RedCottonPants,         Red Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2181,		GreenCottonPants,       Green Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2182,		DarkBlueCottonPants,    Dark Blue Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2183,		YellowCottonPants,      Yellow Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2184,		LightBlueCottonPants,   Light Blue Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2185,		PinkCottonPants,        Pink Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2186,		BlackCottonPants,       Black Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2187,		OrangeCottonPants,      Orange Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2188,		PurpleCottonPants,      Purple Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
-2189,		DarkGreenCottonPants,   Dark Green Cotton Pants,			5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2180,		RedCottonTrousers,		Red Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2181,		GreenCottonTrousers,		Green Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2182,		DarkBlueCottonTrousers,		Dark Blue Cotton Trousers,	5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2183,		YellowCottonTrousers,		Yellow Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2184,		LightBlueCottonTrousers,	Light Blue Cotton Trousers,	5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2185,		PinkCottonTrousers,		Pink Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2186,		BlackCottonTrousers,		Black Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2187,		OrangeCottonTrousers,		Orange Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2188,		PurpleCottonTrousers,		Purple Cotton Trousers,		5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
+2189,		DarkGreenCottonTrousers,	Dark Green Cotton Trousers,	5,	1500,	750,	25,	,	4,	,	-6,	0,	2,	1,	,	1,	0,	{},					{},					,
 2190,		RedRabbitEars,			Red Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}
 2191,		GreenRabbitEars,		Green Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}
 2192,		DarkBlueRabbitEars,		Dark Blue Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index b3122816..ce8856a7 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -24,6 +24,7 @@ L_bleach_menu:
         "V-Neck sweater", L_vneck,
         "Turtleneck sweater", L_tneck,
         "Cotton shorts", L_shorts,
+        "Cotton trousers", L_trousers,
         "Cotton skirt", L_skirt,
         "Miniskirt", L_miniskirt,
         "Tank top ", L_tanktop,
@@ -61,6 +62,11 @@ L_shorts:
     set @dyeBase, 2110;
     goto L_choose_color;
 
+L_trousers:
+    set @normal, 648;
+    set @dyeBase, 2180;
+    goto L_choose_color;
+
 L_skirt:
     set @normal, 632;
     set @dyeBase, 2100;
diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt
index aad7ff24..485a14b3 100644
--- a/world/map/npc/009-2/selim.txt
+++ b/world/map/npc/009-2/selim.txt
@@ -22,6 +22,7 @@ L_clothes_choice:
         "V-Neck sweater", L_vneck,
         "Turtleneck sweater", L_tneck,
         "Cotton shorts", L_shorts,
+        "Cotton trousers", L_trousers,
         "Cotton skirt", L_skirt,
         "Miniskirt", L_miniskirt,
         "Tank top ", L_tanktop,
@@ -65,6 +66,14 @@ L_shorts:
     set @is_verb$, "are";
     goto L_picked_item;
 
+L_trousers:
+    set @del, 648;
+    set @new, 2180;
+    set @name$, "cotton trousers";
+    set @pronoun$, "them";
+    set @is_verb$, "are";
+    goto L_picked_item;
+
 L_skirt:
     set @del, 632;
     set @new, 2100;
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index edb9c3e9..19704227 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -282,8 +282,8 @@ L_trim:
 
     set @default_choice$, "Never mind.";
     setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 632, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 648, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189;
-    setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "dark green cotton shirt", "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top", "cotton skirt", "red cotton skirt", "green cotton skirt", "dark blue cotton skirt", "yellow cotton skirt", "light blue cotton skirt", "pink cotton skirt", "black cotton skirt", "orange cotton skirt", "purple cotton skirt", "dark green cotton skirt", "cotton pants", "red cotton pants", "green cotton pants", "dark blue cotton pants", "yellow cotton pants", "light blue cotton pants", "pink cotton pants", "black cotton pants", "orange cotton pants", "purple cotton pants", "dark green cotton pants";
-    set @items_nr, 33;
+    setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "dark green cotton shirt", "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top", "cotton skirt", "red cotton skirt", "green cotton skirt", "dark blue cotton skirt", "yellow cotton skirt", "light blue cotton skirt", "pink cotton skirt", "black cotton skirt", "orange cotton skirt", "purple cotton skirt", "dark green cotton skirt", "cotton trousers", "red cotton trousers", "green cotton trousers", "dark blue cotton trousers", "yellow cotton trousers", "light blue cotton trousers", "pink cotton trousers", "black cotton trousers", "orange cotton trousers", "purple cotton trousers", "dark green cotton trousers";
+    set @items_nr, 44;
     callsub SUB_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;
@@ -343,7 +343,7 @@ L_lengthen:
     setarray @items, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 689, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 771, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 586, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119;
     setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top", "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "dark green short tank top", "miniskirt", "red miniskirt", "green miniskirt", "dark blue miniskirt", "yellow miniskirt", "light blue miniskirt", "pink miniskirt", "black miniskirt", "orange miniskirt", "purple miniskirt", "dark green miniskirt", "cotton shorts", "red cotton shorts", "green cotton shorts", "dark blue cotton shorts", "yellow cotton shorts", "light blue cotton shorts", "pink cotton shorts", "black cotton shorts", "orange cotton shorts", "purple cotton shorts", "dark green cotton shorts";
 
-    set @items_nr, 33;
+    set @items_nr, 44;
     callsub SUB_pick_one_of_many_items;
     if (@item == 0)
         goto L_main_menu;