Merge commit 'mainline/master'

Conflicts:
	npc/020-1_Nivalis/_import.txt

4 files changed, 17 insertions, 36 deletions

diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
index 92d4b629..89ef0a63 100644
--- a/npc/020-1_Nivalis/_import.txt
+++ b/npc/020-1_Nivalis/_import.txt
@@ -1,6 +1,5 @@
 map: 020-1.gat
 npc: npc/020-1_Nivalis/_mobs.txt
 npc: npc/020-1_Nivalis/_warps.txt
-npc: npc/020-1_Nivalis/sexchanger.txt
 npc: npc/020-1_Nivalis/soul-menhir.txt
 npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-1_Nivalis/sexchanger.txt b/npc/020-1_Nivalis/sexchanger.txt
deleted file mode 100644
index 168f47a3..00000000
--- a/npc/020-1_Nivalis/sexchanger.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-
-020-1.gat,50,49,0	script	Xanith	136,{
-	mes "[Xanith the Surgeon]";
-	mes "\"No sex changes right now, sorry.\"";
-	close;
-
-	mes "[Xanith the Surgeon]";
-	mes "\"Are you tired of being what you are?\"";
-	next;
-	
-	mes "[Xanith the Surgeon]";
-	mes "\"Would you maybe be interested in a sex change?\"";
-	next;
-	
-	mes "[Server]";
-	mes "\"Warning: All the character in your account will get the sex changed.\"";
-	mes "\"Also you probably will require to restart the client to notice a change.\"";
-	next;
-	
-	menu
-		"Please do, my dear...", L_Change,
-		"Leave alone my family treasure!", -;
-	close;
-
-L_Change:
-//	changesex;
-	close;
-}
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1_Tulimshar/eurni.txt
index 988feca9..1edfc94e 100644
--- a/npc/021-1_Tulimshar/eurni.txt
+++ b/npc/021-1_Tulimshar/eurni.txt
@@ -1,9 +1,8 @@
 //
 
 021-1.gat,141,113,0	script	Eurni	136,{
-	mes "[Eurni the Surgeon]";
-	mes "\"No sex changes right now, sorry.\"";
-	close;
+	if (BaseLevel < 10) goto L_TooYoung;
+	if (zeny < 10000) goto L_No_Money;
 
 	mes "[Eurni the Surgeon]";
 	mes "\"Are you tired of being what you are?\"";
@@ -14,8 +13,7 @@
 	next;
 	
 	mes "[Server]";
-	mes "\"Warning: All the character in your account will get the sex changed.\"";
-	mes "\"Also you probably will require to restart the client to notice a change.\"";
+	mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic, as everything is fine.";
 	next;
 	
 	menu
@@ -24,6 +22,18 @@
 	close;
 
 L_Change:
-//	changesex;
+	if (zeny < 10000) goto L_No_Money;
+	set zeny, zeny - 10000;
+	changesex;
+	close;
+
+L_TooYoung:
+	mes "[Eurni the Surgeon]";
+	mes "\"Move along, kid.\"";
+	close;
+
+L_NoMoney:
+	mes "[Eurni the Surgeon]";
+	mes "\"You don't have enough to pay for my services.\"";
 	close;
 }
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index f807b7fb..ccedc319 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -31,4 +31,5 @@ L_Shortversion:
 
 L_Save:
 	savepoint @map$, @x, @y;
+	return;
 }