Merge remote-tracking branch 'Lusticon/master'

locations/Cheatmenu_din.qsrc

@@ -1,5 +1,6 @@
 # Cheatmenu_din
-settingmode = 69
+if settingmode = 0: settingmode = 69
+menu_off = 1
 cls
 
 $cheatmenu['empty'] = {
@@ -10,6 +11,17 @@ $cheatmenu['empty'] = {
 !! Gameplay Settings
 !!----------------------------------------------------------------------------------------------------------------------------
 
+$cheatmenu['music'] = {
+	if music_on = 0:
+		music_on = 1
+		music_loop = 1
+	else
+		music_on = 0
+		music_loop = 0
+		close all
+	end
+}
+
 $cheatmenu['setting'] = {
 	cls
 	$cheatmenu['this_menu'] = 'setting'
@@ -21,7 +33,7 @@ $cheatmenu['setting'] = {
 	'<td cellspacing="0" cellpadding="20" valign="top">'
 
 	'AutoSave: <a href="exec:									disable_autosave					= iif(disable_autosave, 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(disable_autosave						, ''Disabled'', ''Enabled'')>></a>'
-	'Music: <a href="exec:										music_on							= iif(music_on, 0, 1)							& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(music_on								, ''Enabled'', ''Disabled'')>></a>'
+	'Music: <a href="exec:												dynamic $cheatmenu[''music'']												& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(music_on								, ''Enabled'', ''Disabled'')>></a>'
 	*nl
 	'More than one job is possible: <a href="exec:				cheatVars[''work'']					= iif(cheatVars[''work''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''work'']					, ''Enabled'', ''Disabled'')>></a>'
 	'Prevent Non-Drama GAMEOVER: <a href="exec:					cheatVars[''gameover'']				= iif(cheatVars[''gameover''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''gameover'']				, ''Enabled'', ''Disabled'')>></a>'
@@ -429,11 +441,10 @@ $cheatmenu['therapist_reset'] = {
 	dynamic $RestTherapyVariables
 	gs 'stat'
 	dynamic $cheatmenu['state']
-	cls
 }
 
 $cheatmenu['cycle'] = {
-	*clr
+	cls
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -446,6 +457,8 @@ $cheatmenu['cycle'] = {
 		'<a href="exec:Cycle = 1 & gs ''stat'' & dynamic $cheatmenu[''state'']">Follicular</a>'
 		'<a href="exec:Cycle = 2 & Ovulate = 24+rand(0,20) & EggRH = 160 + 160+rand(0, 5) & gs ''stat'' & dynamic $cheatmenu[''state'']">Ovulation</a>'
 		'<a href="exec:Cycle = 3 & gs ''stat'' & dynamic $cheatmenu[''state'']">Luteal</a>'
+	else
+		dynamic $cheatmenu['state']
 	end
 }
 
@@ -539,7 +552,7 @@ $cheatmenu['state'] = {
 	'<a href="exec:dynamic $cheatmenu[''force_preg''] & gs ''stat''">Force random pregnancy</a>'
 	'<a href="exec:dynamic $cheatmenu[''remove_preg''] & gs ''stat''">Remove pregnancy</a>'
 	'<a href="exec:gs''cum_cleanup'',''reset'' & dynamic $cheatmenu[''state''] & gs ''stat''">Remove all cum</a>'
-	'<a href="exec:dynamic $cheatmenu[''cycle''] & gs ''stat''">Set stage of menstrual cycle</a>'
+	if cycle ! 5: '<a href="exec:dynamic $cheatmenu[''cycle''] & gs ''stat''">Set stage of menstrual cycle</a>'
 
 	if lactation['active'] <= 0:
 		'You are not lactating'
@@ -590,7 +603,6 @@ $cheatmenu['set_preg_body'] = {
 	gs 'body', 'softreset'
 	gs 'stat'
 	dynamic $cheatmenu['bodyMod']
-	cls
 }
 
 $cheatmenu['set_body_class'] = {
@@ -598,7 +610,6 @@ $cheatmenu['set_body_class'] = {
 	gs 'body', 'softreset'
 	gs 'stat'
 	dynamic $cheatmenu['bodyMod']
-	cls
 }
 
 $cheatmenu['bodyMod'] = {

locations/obj_din.qsrc

@@ -241,6 +241,7 @@ end
 
 if $ARGS[0] = 'menu_exit':
 	settingmode = 0
+	menu_off = 0
 	killvar 'cheatmenu'
 	killvar 'menu_page'
 end

locations/pav_pool.qsrc

@@ -390,10 +390,13 @@ if $ARGS[0] = 'pool':
 	elseif hour >= 20 and hour < 21:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool5.jpg"></center>'
 		'It''s rather late and the pool will be closing soon, so you''re mostly alone and can enjoy the pool all to yourself.'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool5.jpg"></center>'
+		'It''s late and the pool is closing.'
 	end
 
 	'The pool is rather old, but still has a certain charm to it. The wall to wall windows allow for a nice atmosphere during the day and there is an upper balcony where people often watch from above.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">female locker room</a>.'
+	'From here you can access the female locker room.'
 	if hour >= 8 and hour < 21:
 		act 'Climb into the pool':
 			*clr & cla
@@ -459,6 +462,7 @@ if $ARGS[0] = 'pool':
 
 		act 'Sit with your feet in the water': gt 'pav_pool_events', 'feetwater' 
 	end
+	act 'Go to female locker room': minut += 1 & gt 'pav_pool', 'lockerfemale'
 end
 
 if $ARGS[0]= 'poolwater':