Merge commit 'mainline/master'

Conflicts:
	conf/magic.conf

2 files changed, 16 insertions, 10 deletions

diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
index 67ea1497..d51c134b 100644
--- a/npc/001-1_Tulimshar/bleacher.txt
+++ b/npc/001-1_Tulimshar/bleacher.txt
@@ -19,45 +19,46 @@ L_bleach_menu:
 	next;
 	
 	menu
-		"Cotton shirt", L_cottonshirt,

+		"Cotton shirt", L_cottonshirt,
 		"V-Neck sweater", L_vneck,
 		"Turtleneck sweater", L_tneck,
 		"Cotton shorts", L_shorts,
 		"Cotton skirt", L_skirt,
-		"Tank top ", L_tanktop,

+		"Tank top ", L_tanktop,
 		"Short tank top", L_tanktop_short,
 		"Silk robe", L_robe,
 		"Cotton headband", L_cotton_headband,
 		"Desert hat", L_desert_hat,
 		"Cotton boots", L_cotton_boots,
+		"Cotton gloves", L_cotton_gloves,
 		"Nevermind", -;
 	goto L_close;
 	
-L_cottonshirt:
	set @normal, 1202;

+L_cottonshirt:
	set @normal, 1202;
 	set @dyeBase, 2050;
 	goto L_choose_color;
 	
-L_vneck:
	set @normal, 624;

+L_vneck:
	set @normal, 624;
 	set @dyeBase, 2060;
 	goto L_choose_color;
 	
-L_tneck:
	set @normal, 564;

+L_tneck:
	set @normal, 564;
 	set @dyeBase, 2070;
 	goto L_choose_color;
 	
-L_shorts:
	set @normal, 586;

+L_shorts:
	set @normal, 586;
 	set @dyeBase, 2110;
 	goto L_choose_color;
 	
-L_skirt:
	set @normal, 632;

+L_skirt:
	set @normal, 632;
 	set @dyeBase, 2100;
 	goto L_choose_color;
 	
-L_tanktop:
	set @normal, 688;

+L_tanktop:
	set @normal, 688;
 	set @dyeBase, 2090;
 	goto L_choose_color;
 	
-L_tanktop_short:
	set @normal, 689;

+L_tanktop_short:
	set @normal, 689;
 	set @dyeBase, 2120;
 	goto L_choose_color;
 	
@@ -80,6 +81,11 @@ L_cotton_boots:
 	set @normal, 735;
 	set @dyeBase, 2150;
 	goto L_choose_color;
+
+L_cotton_gloves:
+	set @normal, 741;
+	set @dyeBase, 2160;
+	goto L_choose_color;
 	
 L_choose_color:
 	mes "[Candide]";
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index d53c43a8..16be310b 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -117,7 +117,7 @@ L_Stats:
 	mes "[Ian the Guide]";
         mes "\"Vitality determines how resistant to injuries you are, and how much damage you can take before you die.";
         mes "Intelligence is useful for alchemy and magic, but there are few opportunities for either at the moment.";
-        mes "Luck determines many small things, but, to be honest, I don't think that it is very useful.\"";
+        mes "Luck determines many small things, including the likelihood of both recieving and dealing critical hits\"";
         next;
 	mes "[Ian the Guide]";
         mes "\"I recommend that you practice your dexterity, since some of the more dangerous monsters are very hard to hit otherwise.";