Menu cleaning

locations/obj_din

@@ -123,6 +123,8 @@ end
 if $ARGS[0] = 'skills':
 	clr
 	pl'<center><img src="images/system/icon/stats.png"><br></center>'
+	pl' <a href="exec:gs ''obj_din'', ''stats_gen''">View sexual skills</a>'
+	nl
 	pl 'Attractiveness <<pcs_apprnc>>'
 	pl 'Power <<pcs_stren>>'
 	pl 'Speed ​​<<speed>>'
@@ -133,6 +135,48 @@ if $ARGS[0] = 'skills':
 	pl 'Reaction <<pcs_react>>'
 	pl 'You are <<$body>>.'
 
+	nl
+	!!pl 'Muscles <<$musle>>'
+
+	if pcs_magik > 0:pl 'Magic - <<pcs_magik>>'
+	if pcs_jab > 0:pl 'Jabs - <<pcs_jab>>'
+	if pcs_punch > 0:pl 'Power Strikes - <<pcs_punch>>'
+	if pcs_kick > 0:pl 'Kicks - <<pcs_kick>>'
+	if pcs_def > 0:pl 'Defense - <<pcs_def>>'
+	if pcs_run > 0:pl 'Running skill - <<pcs_run>>'
+	if pcs_vball > 0:pl 'Volleyball skill - <<pcs_vball>>'
+	if pcs_servng > 0:pl 'Waitress skill - <<pcs_servng>>'
+	if pcs_vokal > 0:pl 'Vocal skill - <<pcs_vokal>>'
+	if pcs_danc > 0:pl 'Dancing skill - <<pcs_danc>>'
+	if pcs_dancero > 0:pl 'Erotic dancing skill - <<pcs_dancero>>'
+	if pcs_dancpol > 0:pl 'Pole dancing skill - <<pcs_dancpol>>'
+	if pcs_shoot > 0:pl 'Shooting Accuracy - <<pcs_shoot>>'
+
+	if SchoolAtestat = 0 and StoryLine > 0:
+		if pcs_grades >= 90:
+			pl 'You are an A+ student.'
+		elseif pcs_grades >= 80:
+			pl 'You are a bright student, just not the top of your class.'
+		elseif pcs_grades >= 70:
+			pl 'You are an above average student, but you have to work hard to keep up.'
+		elseif pcs_grades >= 60:
+			pl 'You are the typical average student. You''re good in the fields you like, but can''t be bothered with the rest.'
+		elseif pcs_grades >= 50:
+			pl 'You''re not very good in school, you wish you could be somewhere else and your grades show it.'
+		elseif pcs_grades >= 40:
+			pl 'You are not cut out for school, you skip out most of the time. You wonder how you''re going to manage to get passing grades.'
+		else
+			pl 'You are the class nitwit. You''re still not sure how you got this far in the first place.'
+		end
+
+		if schoolprogul > 1:pl 'Absenteeism in school - <<schoolprogul>> days'
+	end
+end
+
+if $ARGS[0] = 'sex_skills':
+	clr
+	pl'<center><img src="images/system/icon/stats.png"><br></center>'
+	pl'<a href="exec:gs ''obj_din'', ''stats''">Return to skills main page</a>'
 	nl
 	pl '<b>Sexual characteristics</b>'
 	nl
@@ -170,59 +214,6 @@ if $ARGS[0] = 'skills':
 	pl 'Incest preference: <<incest[''pref'']>>'
 	pl 'Incestuous sex: <<incest[''exp'']>>'
 	nl
-	!!pl 'Muscles <<$musle>>'
-
-	if pcs_magik > 0:pl 'Magic - <<pcs_magik>>'
-	if pcs_jab > 0:pl 'Jabs - <<pcs_jab>>'
-	if pcs_punch > 0:pl 'Power Strikes - <<pcs_punch>>'
-	if pcs_kick > 0:pl 'Kicks - <<pcs_kick>>'
-	if pcs_def > 0:pl 'Defense - <<pcs_def>>'
-	if pcs_run > 0:pl 'Running skill - <<pcs_run>>'
-	if pcs_vball > 0:pl 'Volleyball skill - <<pcs_vball>>'
-	if pcs_servng > 0:pl 'Waitress skill - <<pcs_servng>>'
-	if pcs_vokal > 0:pl 'Vocal skill - <<pcs_vokal>>'
-	if pcs_danc > 0:pl 'Dancing skill - <<pcs_danc>>'
-	if pcs_dancero > 0:pl 'Erotic dancing skill - <<pcs_dancero>>'
-	if pcs_dancpol > 0:pl 'Pole dancing skill - <<pcs_dancpol>>'
-	if pcs_shoot > 0:pl 'Shooting Accuracy - <<pcs_shoot>>'
-	if kid > 0:
-		i = 1
-		if kid = 1:
-			pl 'You have a child, a <<$polreb[1]>> named <<$kidname[1]>>. Born <<daykid[1]>>-<<monthkid[1]>>-<<yearkid[1]>>. Aged <<kidage[1]>>'
-		else
-			p 'You have children'
-			:LoopKidCounter
-			if i <= kid:
-				if i > 1: p ','
-				p ' a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>'
-				i += 1
-				jump 'LoopKidCounter'
-			end
-			pl '.'
-		end
-		nl
-	end
- 	if workPTU > 1:pl 'Reputation as a teacher <<teachlevel>>'
-
-	if SchoolAtestat = 0 and StoryLine > 0:
-		if pcs_grades >= 90:
-			pl 'You are an A+ student.'
-		elseif pcs_grades >= 80:
-			pl 'You are a bright student, just not the top of your class.'
-		elseif pcs_grades >= 70:
-			pl 'You are an above average student, but you have to work hard to keep up.'
-		elseif pcs_grades >= 60:
-			pl 'You are the typical average student. You''re good in the fields you like, but can''t be bothered with the rest.'
-		elseif pcs_grades >= 50:
-			pl 'You''re not very good in school, you wish you could be somewhere else and your grades show it.'
-		elseif pcs_grades >= 40:
-			pl 'You are not cut out for school, you skip out most of the time. You wonder how you''re going to manage to get passing grades.'
-		else
-			pl 'You are the class nitwit. You''re still not sure how you got this far in the first place.'
-		end
-
-		if schoolprogul > 1:pl 'Absenteeism in school - <<schoolprogul>> days'
-	end
 end
 
 if $ARGS[0] = 'husb_cheat_count':
@@ -274,7 +265,8 @@ if $ARGS[0] = 'stats_gen':
 	pl'<a href="exec:gs ''obj_din'', ''stats''">Return to statistics main page</a>'
 	nl
 	if opPRE = 0:pl 'It has been <<daystart>> days since the game started.'
-	if BuyHous = 2 and ArendHouseSL >0:pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.'
+	nl
+	if BuyHous = 2 and ArendHouseSL >0:pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.' & nl
 
 	if BuyHous = 2 and ArendHouseSL >0:
 		pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.'
@@ -291,7 +283,44 @@ if $ARGS[0] = 'stats_gen':
 			!from purse, drawer or both
 			if karta >= 6000: *P ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & gs ''obj_din'', ''stats''">bank account</a>'
 		end
+		nl
 	end
+	
+	if kid > 0:
+		i = 1
+		if kid = 1:
+			pl 'You have a child, a <<$polreb[1]>> named <<$kidname[1]>>. Born <<daykid[1]>>-<<monthkid[1]>>-<<yearkid[1]>>. Aged <<kidage[1]>>'
+		else
+			p 'You have children'
+			:LoopKidCounter
+			if i <= kid:
+				if i > 1: p ','
+				p ' a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>'
+				i += 1
+				jump 'LoopKidCounter'
+			end
+			pl '.'
+		end
+		nl
+	end
+ 	if workPTU > 1:pl 'Reputation as a teacher <<teachlevel>>'
+	nl
+	if nastjaQW > 0:pl 'Friendship with Nastya <<nastjaqw>>'
+	if tanya > 0:pl 'Friendship with Tanya <<tanya>>'
+	if kat > 0:pl 'Friendship with Kate <<kat>>'
+	if vika > 0:pl 'Friendship with Vika <<vika>>'
+	if Irina > 0:pl 'Friendship with Irene <<Irina>>'
+	if Tamara > 0:pl 'Friendship with Tamara <<Tamara>>'
+	if alla > 0:pl 'Friendship with Alla <<alla>>'
+	if masha > 0:pl 'Friendship with Masha <<masha>>'
+	if Givi > 0:pl 'Friendship with Givi K. <<Givi>>'
+	if Ashot > 0:pl 'Friendship with Ashot <<Ashot>>'
+	if Dmitry > 0:pl 'Friendship with Dima <<Dmitry>>'
+	if afra > 0:pl 'Friendship with blacks <<afra>>'
+	if trenerepa > 0:pl'Friendship with Mikhail Nikolaevich  <<trenerepa>>'
+
+	!!!WD: Formatting
+	if (Irina + Givi + Ashot + Tamara + Dmitry + afra + gosh + vika + kat + nastjaqw + tanya) > 0:nl
 end
 
 if $ARGS[0] = 'stats_achievements':
@@ -302,23 +331,6 @@ if $ARGS[0] = 'stats_achievements':
 	if KikWinPro > 0 or KikLossPro > 0 or KikDrawPro > 0:
 		pl 'Professional Kickboxing Record:Win (Victory KO) - Loss (Defeat KO) - Draw'
 		pl '<<KikWinPro>> (<<KikWinProKO>>KO) - <<KikLossPro>> (<<KikLossProKO>>KO) - <<KikDrawPro>>'
-		nl
-		if nastjaQW > 0:pl 'Friendship with Nastya <<nastjaqw>>'
-		if tanya > 0:pl 'Friendship with Tanya <<tanya>>'
-		if kat > 0:pl 'Friendship with Kate <<kat>>'
-		if vika > 0:pl 'Friendship with Vika <<vika>>'
-		if Irina > 0:pl 'Friendship with Irene <<Irina>>'
-		if Tamara > 0:pl 'Friendship with Tamara <<Tamara>>'
-		if alla > 0:pl 'Friendship with Alla <<alla>>'
-		if masha > 0:pl 'Friendship with Masha <<masha>>'
-		if Givi > 0:pl 'Friendship with Givi K. <<Givi>>'
-		if Ashot > 0:pl 'Friendship with Ashot <<Ashot>>'
-		if Dmitry > 0:pl 'Friendship with Dima <<Dmitry>>'
-		if afra > 0:pl 'Friendship with blacks <<afra>>'
-		if trenerepa > 0:pl'Friendship with Mikhail Nikolaevich  <<trenerepa>>'
-
-		!!!WD: Formatting
-		if (Irina + Givi + Ashot + Tamara + Dmitry + afra + gosh + vika + kat + nastjaqw + tanya) > 0:nl
 	end
 
 	if Win > 0 or Loss > 0:pl 'Wins in fights <<Win>>, losses in fights <<Loss>>' & nl