Merge commit 'mainline/master'

Conflicts:
	conf/magic.conf

10 files changed, 70 insertions, 20 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.";
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index 185351b5..e85bbc85 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -1,10 +1,27 @@
 // 002-3 Desert mines mobs
 
-002-3.gat,38,38,9,9	monster	Red Slime	1008,10,0,0,Mob002-3::On1008
-002-3.gat,82,92,9,9	monster	Black Scorpion	1009,10,0,0,Mob002-3::On1009
+002-3.gat,45,38,30,19	monster	Yellow Slime	1007,5,0,0,Mob002-3::On1007
+002-3.gat,91,41,17,20	monster	Snake	1010,3,0,0,Mob002-3::On1010
+002-3.gat,71,35,25,17	monster	Red Slime	1008,4,0,0,Mob002-3::On1008
+002-3.gat,69,100,8,5	monster	Spider	1012,2,0,0,Mob002-3::On1012
+002-3.gat,68,57,26,24	monster	Black Scorpion	1009,5,0,0,Mob002-3::On1009
+002-3.gat,45,61,11,28	monster	Red Slime	1008,5,0,0,Mob002-3::On1008
+002-3.gat,38,76,15,22	monster	Black Scorpion	1009,4,0,0,Mob002-3::On1009
+002-3.gat,58,78,6,17	monster	Red Slime	1008,2,0,0,Mob002-3::On1008
+002-3.gat,89,68,11,32	monster	Black Scorpion	1009,4,0,0,Mob002-3::On1009
+002-3.gat,83,93,19,17	monster	Red Slime	1008,4,0,0,Mob002-3::On1008
+002-3.gat,72,77,21,14	monster	Red Slime	1008,3,0,0,Mob002-3::On1008
+002-3.gat,67,91,11,12	monster	Black Scorpion	1009,2,0,0,Mob002-3::On1009
+002-3.gat,58,95,6,13	monster	Snake	1010,2,0,0,Mob002-3::On1010
+002-3.gat,63,100,2,5	monster	Black Scorpion	1009,1,0,0,Mob002-3::On1009
 
 
 002-3.gat,0,0,0	script	Mob002-3	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
 On1008:
 	set @mobID, 1008;
 	callfunc "MobPoints";
@@ -15,5 +32,15 @@ On1009:
 	callfunc "MobPoints";
 	break;
 
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/002-3_Desert_mines/_warps.txt b/npc/002-3_Desert_mines/_warps.txt
index 8f5b51c2..d750d5cd 100644
--- a/npc/002-3_Desert_mines/_warps.txt
+++ b/npc/002-3_Desert_mines/_warps.txt
@@ -1,4 +1,4 @@
 // 002-3 Desert mines warps
 
-002-3.gat,38,30	warp	CaveExit	2,-1,002-1.gat,25,95
 002-3.gat,68,98	warp	toLevel2	-1,-1,002-4.gat,34,98
+002-3.gat,37,29	warp	Exit	-1,-1,002-1.gat,25,95
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt
index 71c0a901..eaf9788d 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
@@ -240,7 +240,6 @@ L_Shield_state_3:
 	close;
 
 S_NohMask_Ask:
-	next;
 	menu
 		"I'll keep that in mind.", -,
 		"Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt
index 14eac5b9..bfd8bc46 100644
--- a/npc/009-2_Hurnscald/selim.txt
+++ b/npc/009-2_Hurnscald/selim.txt
@@ -29,6 +29,7 @@ L_clothes_choice:
 		"Cotton headband", L_headband,
 		"Desert hat", L_desert_hat,
 		"Cotton boots", L_cottonboots,
+		"Cotton gloves", L_cottongloves,
 		"I'm fine for now, thanks.", -;
 	close;
 
@@ -100,6 +101,12 @@ L_cottonboots:
 	set @name$, "cotton boots";
 	goto L_picked_item;
 
+L_cottongloves:
+	set @del, 741;
+	set @new, 2160;
+	set @name$, "cotton gloves";
+	goto L_picked_item;
+
 L_picked_item:
 	if (countitem(@del) == 0) goto L_havenone;
 L_colour:
diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index f943ac8f..f357074c 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -31,4 +31,4 @@
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000
+009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,741:-1
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index d17fc3b8..6e09af99 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -236,14 +236,25 @@ L_do_divorce:
         if (zeny < @divorce_cost)
            goto L_divorce_nomoney;
 
+	
+	if divorce(0) goto L_DidDivorce;
+
+        mes "[Wedding Officiator]";
+        mes "The officiator searches through her records for your partner.";
+        mes "\"I can't find your partner's record, you'll have to come back later.\"";
+	next;
+
+        mes "[Server]";
+        mes "You can only divorce if both you and your partner are logged in at the same time.";
+	close;
+
+L_DidDivorce:
         set zeny, zeny - @divorce_cost;
-        divorce;
 
         mes "[Wedding Officiator]";
         mes "After collecting her fee, Wendy licks her quill and writes down some notes.";
         mes "Then she sighs heavily.";
         mes "\"You are divorced now.  Thank you for your business.\"";
-        next;
         close;
 
 L_No_Room_For_Rings:
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt
index fa7d8fe6..f1b452b5 100644
--- a/npc/020-2_Nivalis/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
@@ -1,7 +1,7 @@
 // Snow town shops
 
 // Clothes shop
-020-2.gat,27,26,0	shop	Taylor	137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000
+020-2.gat,27,26,0	shop	Taylor	137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,741:-1
 // Weapons shop
 020-2.gat,25,65,0	shop	Bracco	135,1201:50,521:1000,522:100,545:20000,529:5
 // Potions shop
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
index cf2dbbe2..51fd1139 100644
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ b/npc/021-1_Tulimshar/north_shops.txt
@@ -3,10 +3,10 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-8,DesertHat :-6
+021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,ChainmailShirt :-1,SilkRobe :-5,DesertHat :-4
 
 // Some general stuff
-021-1.gat,128,36,0	shop	Imec	162,CoinBag :-4,EmptyBottle :-10,CasinoCoins :10,CottonCloth :-10
+021-1.gat,128,36,0	shop	Imec	162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6
 
 // A snobby store that won't sell to the player
 021-1.gat,138,29,0	script	Latoy	106,{