Pārlūkot izejas kodu

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts 7 mēneši atpakaļ
vecāks
revīzija
5c2f62ed75
58 mainītis faili ar 752 papildinājumiem un 645 dzēšanām
  1. 90 90
      locations/Cheatmenu_din.qsrc
  2. 5 5
      locations/Cum_Manage.qsrc
  3. 2 2
      locations/andrey.qsrc
  4. 1 1
      locations/bed2.qsrc
  5. 5 10
      locations/body.qsrc
  6. 1 1
      locations/burger.qsrc
  7. 15 26
      locations/cikl.qsrc
  8. 11 12
      locations/city_clinic.qsrc
  9. 1 2
      locations/city_drugden.qsrc
  10. 1 1
      locations/city_market.qsrc
  11. 1 2
      locations/city_residential.qsrc
  12. 2 2
      locations/clothing.qsrc
  13. 1 1
      locations/clothing_QV.qsrc
  14. 11 11
      locations/cum_cleanup.qsrc
  15. 2 2
      locations/dinSex.qsrc
  16. 4 4
      locations/din_bad.qsrc
  17. 2 2
      locations/din_van.qsrc
  18. 2 3
      locations/dream_events.qsrc
  19. 10 10
      locations/drugs.qsrc
  20. 8 8
      locations/femcyc.qsrc
  21. 3 3
      locations/fight.qsrc
  22. 151 82
      locations/gadforestlost.qsrc
  23. 84 70
      locations/gameover.qsrc
  24. 1 1
      locations/gschool_grounds.qsrc
  25. 6 6
      locations/initg.qsrc
  26. 0 1
      locations/intro_city_select.qsrc
  27. 4 2
      locations/intro_initialization.qsrc
  28. 4 2
      locations/intro_initialization_city.qsrc
  29. 0 1
      locations/intro_sg_select.qsrc
  30. 15 13
      locations/journal_work.qsrc
  31. 1 3
      locations/kamera.qsrc
  32. 4 4
      locations/korrPar.qsrc
  33. 1 1
      locations/lact_bp.qsrc
  34. 2 2
      locations/love.qsrc
  35. 1 1
      locations/medical_din.qsrc
  36. 2 2
      locations/mirror.qsrc
  37. 2 2
      locations/nichApartment.qsrc
  38. 2 2
      locations/nichTanya.qsrc
  39. 5 5
      locations/nichTaras.qsrc
  40. 2 2
      locations/obj_din.qsrc
  41. 2 2
      locations/park_walkevents.qsrc
  42. 1 1
      locations/pav_hotel.qsrc
  43. 2 2
      locations/pav_park.qsrc
  44. 1 1
      locations/pav_shared_apt.qsrc
  45. 2 2
      locations/pornstudio.qsrc
  46. 1 1
      locations/prostitution_functions.qsrc
  47. 85 36
      locations/saveupdater.qsrc
  48. 6 3
      locations/sentence.qsrc
  49. 26 47
      locations/stat.qsrc
  50. 112 102
      locations/stat_display.qsrc
  51. 4 4
      locations/street_event.qsrc
  52. 1 1
      locations/succubus.qsrc
  53. 33 32
      locations/swamp.qsrc
  54. 1 1
      locations/therapist.qsrc
  55. 1 1
      locations/tour_guide.qsrc
  56. 6 6
      locations/traits.qsrc
  57. 1 1
      locations/wakeup.qsrc
  58. 2 2
      locations/willpower.qsrc

+ 90 - 90
locations/Cheatmenu_din.qsrc

@@ -20,25 +20,25 @@ $cheatmenu['setting'] = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<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>'
+	'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>'
 	*nl
-	'More than one job is possible: <a href="exec:				cheatWork						= iif(cheatWork,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatWork					,''Enabled'',''Disabled'')>></a>'
-	'Prevent Non-Drama GAMEOVER: <a href="exec:					Enable_nogameover				= iif(Enable_nogameover,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(Enable_nogameover			,''Enabled'',''Disabled'')>></a>'
-	'Automatically win every fight: <a href="exec:				fight_cheat						= iif(fight_cheat,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(fight_cheat					,''Enabled'',''Disabled'')>></a>'
-	'Automatically resolve non-magical fights: <a href="exec:	autocombat_cheat				= iif(autocombat_cheat,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(autocombat_cheat				,''Enabled'',''Disabled'')>></a>'
+	'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>'
+	'Automatically win every fight: <a href="exec:				cheatVars[''win_fights'']			= iif(cheatVars[''win_fights''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''win_fights'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Automatically resolve non-magical fights: <a href="exec:	cheatVars[''auto_combat'']			= iif(cheatVars[''auto_combat''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''auto_combat'']			, ''Enabled'', ''Disabled'')>></a>'
 	*nl
-	'Random boyfriend/girlfriend events: <a href="exec:			random_bf_gf_cheat				= iif(random_bf_gf_cheat,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(random_bf_gf_cheat			,''Disabled'',''Enabled'')>></a>'
-	'Random robbers in the streets: <a href="exec:				cheat_street_robbers			= iif(cheat_street_robbers,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheat_street_robbers			,''Disabled'',''Enabled'')>></a>'
-	'Random rapists in the streets: <a href="exec:				cheat_street_rapists			= iif(cheat_street_rapists,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheat_street_rapists			,''Disabled'',''Enabled'')>></a>'
+	'Random boyfriend/girlfriend events: <a href="exec:			cheatVars[''random_lovers'']		= iif(cheatVars[''random_lovers''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''random_lovers'']			, ''Disabled'', ''Enabled'')>></a>'
+	'Random robbers in the streets: <a href="exec:				cheatVars[''random_robbers'']		= iif(cheatVars[''random_robbers''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''random_robbers'']		, ''Disabled'', ''Enabled'')>></a>'
+	'Random rapists in the streets: <a href="exec:				cheatVars[''random_rapists'']		= iif(cheatVars[''random_rapists''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''random_rapists'']		, ''Disabled'', ''Enabled'')>></a>'
 	*nl
-	'Auto brush hair on mirror visit: <a href="exec:			autohairbrush					= iif(autohairbrush,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(autohairbrush				,''Enabled'',''Disabled'')>></a>'
-	'Full morning routine enabled: <a href="exec:				enfullmorrout					= iif(enfullmorrout,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(enfullmorrout				,''Enabled'',''Disabled'')>></a>'
-	'Enema realism: <a href="exec:								cheatKlisma						= iif(cheatKlisma,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatKlisma					,''Enabled'',''Disabled'')>></a>'
-	'Peeing: <a href="exec:										cheatPee						= iif(cheatPee,0,1)							& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatPee						,''Disabled'',''Enabled'')>></a>'
+	'Auto brush hair on mirror visit: <a href="exec:			cheatVars[''auto_brush'']			= iif(cheatVars[''auto_brush''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''auto_brush'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Full morning routine enabled: <a href="exec:				cheatVars[''full_morning_rout'']	= iif(cheatVars[''full_morning_rout''], 0, 1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''full_morning_rout'']		, ''Enabled'', ''Disabled'')>></a>'
+	'Enema realism: <a href="exec:								cheatVars[''enema'']				= iif(cheatVars[''enema''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''enema'']					, ''Disabled'', ''Enabled'')>></a>'
+	'Peeing: <a href="exec:										cheatVars[''pee'']					= iif(cheatVars[''pee''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''pee'']					, ''Disabled'', ''Enabled'')>></a>'
 	*nl
-	'Renaming porn movies you star in: <a href="exec:			editpornname					= iif(editpornname,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(editpornname					,''Enabled'',''Disabled'')>></a>'
-	'Remove "once a week" therapist limit: <a href="exec:		therapist_weekly_cheat			= iif(therapist_weekly_cheat,0,1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(therapist_weekly_cheat		,''Enabled'',''Disabled'')>></a>'
+	'Renaming porn movies you star in: <a href="exec:			cheatVars[''rename_porn'']			= iif(cheatVars[''rename_porn''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''rename_porn'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Remove "once a week" therapist limit: <a href="exec:		cheatVars[''therapist_schedule'']	= iif(cheatVars[''therapist_schedule''], 0, 1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''therapist_schedule'']	, ''Enabled'', ''Disabled'')>></a>'
 	*nl
 
 	'<B>Difficulty Setting</B>'
@@ -47,10 +47,10 @@ $cheatmenu['setting'] = {
 	$temp_diff = func('_difficulty', 'getdifficulty')
 	'Difficulty: Currently at <<$temp_diff>>'
 	'<ul>'
-	'<li>set to ' + iif($temp_diff = 'easy peasy', 'easy peasy', '<a href="exec:	FUNC(''_difficulty'',''setdifficulty'',''easy peasy'')	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">easy peasy</a>') + '</li>'
-	'<li>set to ' + iif($temp_diff = 'relaxed', 'relaxed', '<a href="exec:			FUNC(''_difficulty'',''setdifficulty'',''relaxed'')		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">relaxed</a>') + '</li>'
-	'<li>set to ' + iif($temp_diff = 'realistic', 'realistic', '<a href="exec:		FUNC(''_difficulty'',''setdifficulty'',''realistic'')	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">realistic</a>') + '</li>'
-	'<li>set to ' + iif($temp_diff = 'hardcore', 'hardcore', '<a href="exec:		FUNC(''_difficulty'',''setdifficulty'',''hardcore'')	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">hardcore</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'easy peasy', 'easy peasy', '<a href="exec:	FUNC(''_difficulty'',''setdifficulty'',''easy peasy'')		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">easy peasy</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'relaxed', 'relaxed', '<a href="exec:			FUNC(''_difficulty'',''setdifficulty'',''relaxed'')			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">relaxed</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'realistic', 'realistic', '<a href="exec:		FUNC(''_difficulty'',''setdifficulty'',''realistic'')		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">realistic</a>') + '</li>'
+	'<li>set to ' + iif($temp_diff = 'hardcore', 'hardcore', '<a href="exec:		FUNC(''_difficulty'',''setdifficulty'',''hardcore'')		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]">hardcore</a>') + '</li>'
 	'</ul>'
 	killvar '$temp_diff'
 	'</tr></table></b></center>'
@@ -238,8 +238,8 @@ $cheatmenu['index'] = {
 	*nl
 	'<font color="red"><b>WARNING!</b></font>: Teleporting while in an event may break your game. Use at your own risk!'
 	*nl
-	'Hide Console input in objects window: <a href="exec:		cheatConsole			= iif(cheatConsole,0,1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatConsole		,''Enabled'',''Disabled'')>></a>'
-	'Time Cheat in Objects window: <a href="exec:				cheatTime				= iif(cheatTime,0,1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatTime		,''Enabled'',''Disabled'')>></a>'
+	'Hide Console input in objects window: <a href="exec:		cheatVars[''console'']		= iif(cheatVars[''console''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''console'']		, ''Enabled'', ''Disabled'')>></a>'
+	'Time Cheat in Objects window: <a href="exec:				cheatVars[''time'']			= iif(cheatVars[''time''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''time'']			, ''Enabled'', ''Disabled'')>></a>'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''vartracker'']"><b>Variable tracker</b></a>'
 	'</tr></table></b></center>'
@@ -250,8 +250,8 @@ $cheatmenu['index'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['addict'] = {
-	if drugVars['cheat_immune'] = 0:
-		drugVars['cheat_immune'] = 1
+	if cheatVars['drugs_immune'] = 0:
+		cheatVars['drugs_immune'] = 1
 		drugVars['cigarettes_used'] = 0
 		drugVars['cigarettes_need'] = 0
 		drugVars['weed_used'] = 0
@@ -260,13 +260,13 @@ $cheatmenu['addict'] = {
 		drugVars['amphetamine_used'] = 0
 		drugVars['heroin_used'] = 0
 	else
-		drugVars['cheat_immune'] = 0
+		cheatVars['drugs_immune'] = 0
 	end
 }
 
 $cheatmenu['addictive_block'] = {
-	if addictive_cheat = 0:
-		addictive_cheat = 1
+	if cheatVars['no_trait_addictive'] = 0:
+		cheatVars['no_trait_addictive'] = 1
 		drugVars['cigarettes_exp'] = 0
 		drugVars['weed_exp'] = 0
 		drugVars['heroin_exp'] = 0
@@ -276,74 +276,74 @@ $cheatmenu['addictive_block'] = {
 		addictive_exp = 0
 		addictive_trait_lvl = 0
 	else
-		addictive_cheat = 0
+		cheatVars['no_trait_addictive'] = 0
 	end
 }
 
 $cheatmenu['Vibrator'] = {
-	if sleepVars['cheatVib'] = 0:
-		sleepVars['cheatVib'] = 1
+	if cheatVars['sleep_vib'] = 0:
+		cheatVars['sleep_vib'] = 1
 		sleepVars['bedVibrator'] = 1
 	else
-		sleepVars['cheatVib'] = 0
+		cheatVars['sleep_vib'] = 0
 		sleepVars['bedVibrator'] = 0
 	end
 }
 
 $cheatmenu['BimboCloth'] = {
-	if cheatBimbo = 0:
-		cheatBimbo = 1
+	if cheatVars['bimbo'] = 0:
+		cheatVars['bimbo'] = 1
 		bimbo = 0
 		bimbolevel = 0
 		bimbowithdrawal = 0
 	else
-		cheatBimbo = 0
+		cheatVars['bimbo'] = 0
 	end
 }
 
 $cheatmenu['SmartBimbo'] = {
-	if cheatBimbo2 = 0:
-		cheatBimbo2 = 1
+	if cheatVars['smart_bimbo'] = 0:
+		cheatVars['smart_bimbo'] = 1
 		bimbostupidity = 0
 	else
-		cheatBimbo2 = 0
+		cheatVars['smart_bimbo'] = 0
 	end
 }
 
 $cheatmenu['SuccuBimbo'] = {
-	if cheatBimbo3 = 0:
-		cheatBimbo3 = 1
+	if cheatVars['suc_bimbo'] = 0:
+		cheatVars['suc_bimbo'] = 1
 		bimbostupidity = 0
 	else
-		cheatBimbo3 = 0
+		cheatVars['suc_bimbo'] = 0
 	end
 }
 
 $cheatmenu['exhib_block'] = {
-	if exhib_cheat = 0:
-		exhib_cheat = 1
+	if cheatVars['no_trait_exhib'] = 0:
+		cheatVars['no_trait_exhib'] = 1
 		pcs_exhib = 0
 		Exhibitionist_lvl = 0
 	else
-		exhib_cheat = 0
+		cheatVars['no_trait_exhib'] = 0
 	end
 }
 
 $cheatmenu['cumtrait_block'] = {
-	if cumeater_cheat = 0:
-		cumeater_cheat = 1
+	if cheatVars['no_trait_cumeater'] = 0:
+		cheatVars['no_trait_cumeater'] = 1
 		pcs_traits['cumeater'] = 0
 	else
-		cumeater_cheat = 0
+		cheatVars['no_trait_cumeater'] = 0
 	end
 }
 
 $cheatmenu['slutshot'] = {
-	if cheatSlut = 0:
-		cheatSlut = 1
+	if cheatVars['no_periods'] = 0:
+		cheatVars['no_periods'] = 1
 		cycle = 6
 	else
-		cheatSlut = 0
+		cheatVars['no_periods'] = 0
 		cycle = 0
 	end
 }
@@ -359,48 +359,48 @@ $cheatmenu['permanent'] = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td width="90%" cellspacing="0" cellpadding="20" valign="top">'
 
-	'Willpower cost always zero: <a href="exec:					cheatWillpower					= iif(cheatWillpower,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatWillpower					,''Enabled'',''Disabled'')>></a>'
-	'Infinite willpower: <a href="exec:							InfWillpwer						= iif(InfWillpwer,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(InfWillpwer						,''Enabled'',''Disabled'')>></a>'
-	'Always combed: <a href="exec:								cheatHapri						= iif(cheatHapri,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatHapri						,''Enabled'',''Disabled'')>></a>'
-	'Cosmetics never smeared: <a href="exec:					cheatNomakeup					= iif(cheatNomakeup,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNomakeup					,''Enabled'',''Disabled'')>></a>'
-	'Never sweat: <a href="exec:								cheatNoSweat					= iif(cheatNoSweat,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoSweat						,''Enabled'',''Disabled'')>></a>'
-	'Never eat: <a href="exec:									cheatNoEat						= iif(cheatNoEat,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoEat						,''Enabled'',''Disabled'')>></a>'
-	'Never drink: <a href="exec:								cheatNoDrink					= iif(cheatNoDrink,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoDrink						,''Enabled'',''Disabled'')>></a>'
-	'Never sleep: <a href="exec:								cheatNoSleep					= iif(cheatNoSleep,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoSleep						,''Enabled'',''Disabled'')>></a>'
-	'Never unhappy: <a href="exec:								cheatNoMood						= iif(cheatNoMood,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoMood						,''Enabled'',''Disabled'')>></a>'
-	'Never lose or gain weight: <a href="exec:					cheatNoFat						= iif(cheatNoFat,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatNoFat						,''Enabled'',''Disabled'')>></a>'
-	'Never shave legs: <a href="exec:							cheatShaveLegs					= iif(cheatShaveLegs,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatShaveLegs					,''Enabled'',''Disabled'')>></a>'
-	'Bust and butt unaffected by weight: <a href="exec:			bodyVars[''cheat_staticAssets'']= iif(bodyVars[''cheat_staticAssets''],0,1)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(bodyVars[''cheat_staticAssets'']	,''Enabled'',''Disabled'')>></a>'
-	'Allow any clothing for school: <a href="exec:				Enable_sforma					= iif(Enable_sforma,0,1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(Enable_sforma					,''Enabled'',''Disabled'')>></a>'
-	'Never get addicted: <a href="exec:										dynamic $cheatmenu[''addict'']									& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(drugVars[''cheat_immune'']		,''Enabled'',''Disabled'')>></a>'
-	*nl
-	'Enable sleeping with vibrator inserted: <a href="exec:					dynamic $cheatmenu[''Vibrator'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(sleepVars[''cheatVib'']			,''Enabled'',''Disabled'')>></a>'
-	*nl
-	'Bimbo trait and the effects of wearing bimbo clothes: <a href="exec:	dynamic $cheatmenu[''BimboCloth'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatBimbo						,''Disabled'',''Enabled'')>></a>'
-	if cheatBimbo = 0:
-		'  Smart bimbo mode: <a href="exec:									dynamic $cheatmenu[''SmartBimbo'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatBimbo2						,''Enabled'',''Disabled'')>></a>'
-		'  Succubus bimbo mode: <a href="exec:								dynamic $cheatmenu[''SuccuBimbo'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatBimbo3						,''Enabled'',''Disabled'')>></a>'
-	end
-	'Exhibitionist trait: <a href="exec:									dynamic $cheatmenu[''exhib_block'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(exhib_cheat						,''Disabled'',''Enabled'')>></a>'
-	'Addictive personality trait: <a href="exec:							dynamic $cheatmenu[''addictive_block'']							& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(addictive_cheat					,''Disabled'',''Enabled'')>></a>'
-	'Cumeater trait: <a href="exec:											dynamic $cheatmenu[''cumtrait_block'']							& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cumeater_cheat					,''Disabled'',''Enabled'')>></a>'
-	*nl
-	'Set arousal to always be at 50 or more: <a href="exec:		cheatHorny						= iif(cheatHorny,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatHorny						,''Enabled'',''Disabled'')>></a>'
-	'Periods (and pregnancies): <a href="exec:								dynamic $cheatmenu[''slutshot'']								& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatSlut						,''Disabled'',''Enabled'')>></a>'
-	if cheatSlut = 0:
-		'  Automatic cheat on Tampon: <a href="exec:			Enable_auto_tampons				= iif(Enable_auto_tampons,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(Enable_auto_tampons				,''Disabled'',''Enabled'')>></a>'
-		'  Automatic period tracking: <a href="exec:			cyccustom						= iif(cyccustom,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cyccustom						,''Enabled'',''Disabled'')>></a>'
-		'  Impregnation: <a href="exec:							cheat_NoPregnancy				= iif(cheat_NoPregnancy,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheat_NoPregnancy				,''Disabled'',''Enabled'')>></a>'
-		if cheat_NoPregnancy = 0:
-			'    Pregnancy speed multiplier: <a href="exec:		pregspeedcheat					= iif(pregspeedcheat < 3,pregspeedcheat+1,0)& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><b><<pregspeedcheat+1>></b></a>'
-		end
-	end
-	'Lactation: <a href="exec:									cheat_NoLactation				= iif(cheat_NoLactation,0,1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheat_NoLactation				,''Disabled'',''Enabled'')>></a>'
-	'Cum leaking: <a href="exec:								no_cum_leak						= iif(no_cum_leak,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(no_cum_leak						,''Disabled'',''Enabled'')>></a>'
-	'STDs: <a href="exec:										cheatHealth						= iif(cheatHealth,0,1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatHealth						,''Disabled'',''Enabled'')>></a>'
-
-	*nl
-	'No dream chance: <a href="exec: sleepVars[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">'+iif(sleepVars['cheat_nodream_chance'] > 0,'<<sleepVars[''cheat_nodream_chance'']>>%</a>, <a href="exec:sleepVars[''cheat_nodream_chance'']=0 & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Enabled</a>','Disabled</a>')
+	'Willpower cost always zero: <a href="exec:					cheatVars[''willpower'']			= iif(cheatVars[''willpower''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''willpower'']				, ''Enabled'', ''Disabled'')>></a>'
+	'Infinite willpower: <a href="exec:							cheatVars[''inf_willpower'']		= iif(cheatVars[''inf_willpower''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''inf_willpower'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Always combed: <a href="exec:								cheatVars[''always_brushed'']		= iif(cheatVars[''always_brushed''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''always_brushed'']		, ''Enabled'', ''Disabled'')>></a>'
+	'Cosmetics never smeared: <a href="exec:					cheatVars[''makeup_smear'']			= iif(cheatVars[''makeup_smear''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''makeup_smear'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Never sweat: <a href="exec:								cheatVars[''no_sweat'']				= iif(cheatVars[''no_sweat''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_sweat'']				, ''Enabled'', ''Disabled'')>></a>'
+	'Never eat: <a href="exec:									cheatVars[''hunger'']				= iif(cheatVars[''hunger''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''hunger'']				, ''Enabled'', ''Disabled'')>></a>'
+	'Never drink: <a href="exec:								cheatVars[''thirst'']				= iif(cheatVars[''thirst''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''thirst'']				, ''Enabled'', ''Disabled'')>></a>'
+	'Never sleep: <a href="exec:								cheatVars[''sleep'']				= iif(cheatVars[''sleep''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''sleep'']					, ''Enabled'', ''Disabled'')>></a>'
+	'Never unhappy: <a href="exec:								cheatVars[''mood'']					= iif(cheatVars[''mood''], 0, 1)					& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''mood'']					, ''Enabled'', ''Disabled'')>></a>'
+	'Never lose or gain weight: <a href="exec:					cheatVars[''fat'']					= iif(cheatVars[''fat''], 0, 1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''fat'']					, ''Enabled'', ''Disabled'')>></a>'
+	'Never shave legs: <a href="exec:							cheatVars[''no_leghair'']			= iif(cheatVars[''no_leghair''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_leghair'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Bust and butt unaffected by weight: <a href="exec:			cheatVars[''body_staticAssets'']	= iif(cheatVars[''body_staticAssets''], 0, 1)		& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''body_staticAssets'']		, ''Enabled'', ''Disabled'')>></a>'
+	'Allow any clothing for school: <a href="exec:				cheatVars[''school_clothing'']		= iif(cheatVars[''school_clothing''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''school_clothing'']		, ''Enabled'', ''Disabled'')>></a>'
+	'Never get addicted: <a href="exec:										dynamic $cheatmenu[''addict'']												& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''drugs_immune'']			, ''Enabled'', ''Disabled'')>></a>'
+	*nl
+	'Enable sleeping with vibrator inserted: <a href="exec:					dynamic $cheatmenu[''Vibrator'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''sleep_vib'']				, ''Enabled'', ''Disabled'')>></a>'
+	*nl
+	'Bimbo trait and the effects of wearing bimbo clothes: <a href="exec:	dynamic $cheatmenu[''BimboCloth'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''bimbo'']					, ''Disabled'', ''Enabled'')>></a>'
+	if cheatVars['bimbo'] = 0:
+		'  Smart bimbo mode: <a href="exec:									dynamic $cheatmenu[''SmartBimbo'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''smart_bimbo'']			, ''Enabled'', ''Disabled'')>></a>'
+		'  Succubus bimbo mode: <a href="exec:								dynamic $cheatmenu[''SuccuBimbo'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''suc_bimbo'']				, ''Enabled'', ''Disabled'')>></a>'
+	end
+	'Exhibitionist trait: <a href="exec:									dynamic $cheatmenu[''exhib_block'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_trait_exhib'']		, ''Disabled'', ''Enabled'')>></a>'
+	'Addictive personality trait: <a href="exec:							dynamic $cheatmenu[''addictive_block'']										& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_trait_addictive'']	, ''Disabled'', ''Enabled'')>></a>'
+	'Cumeater trait: <a href="exec:											dynamic $cheatmenu[''cumtrait_block'']										& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_trait_cumeater'']		, ''Disabled'', ''Enabled'')>></a>'
+	*nl
+	'Set arousal to always be at 50 or more: <a href="exec:		cheatVars[''always_horny'']			= iif(cheatVars[''always_horny''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''always_horny'']			, ''Enabled'', ''Disabled'')>></a>'
+	'Periods (and pregnancies): <a href="exec:								dynamic $cheatmenu[''slutshot'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_periods'']			, ''Disabled'', ''Enabled'')>></a>'
+	if cheatVars['no_periods'] = 0:
+		'  Automatic cheat on Tampon: <a href="exec:			cheatVars[''auto_tampons'']			= iif(cheatVars[''auto_tampons''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''auto_tampons'']			, ''Enabled'', ''Disabled'')>></a>'
+		'  Automatic period tracking: <a href="exec:			cheatVars[''track_period'']			= iif(cheatVars[''track_period''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''track_period'']			, ''Enabled'', ''Disabled'')>></a>'
+		'  Impregnation: <a href="exec:							cheatVars[''no_pregnancy'']			= iif(cheatVars[''no_pregnancy''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_pregnancy'']			, ''Disabled'', ''Enabled'')>></a>'
+		if cheatVars['no_pregnancy'] = 0:
+			'    Pregnancy speed multiplier: <a href="exec:		cheatVars[''preg_speed'']			= iif(cheatVars[''preg_speed''] < 3, cheatVars[''preg_speed''] + 1, 0)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><b><<cheatVars[''preg_speed''] + 1>></b></a>'
+		end
+	end
+	'Lactation: <a href="exec:									cheatVars[''no_lactation'']			= iif(cheatVars[''no_lactation''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_lactation'']			, ''Disabled'', ''Enabled'')>></a>'
+	'Cum leaking: <a href="exec:								cheatVars[''no_cum_leak'']			= iif(cheatVars[''no_cum_leak''], 0, 1)				& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_cum_leak'']			, ''Disabled'', ''Enabled'')>></a>'
+	'STDs: <a href="exec:										cheatVars[''std'']					= iif(cheatVars[''std''], 0, 1)						& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''std'']					, ''Disabled'', ''Enabled'')>></a>'
+
+	*nl
+	'No dream chance: <a href="exec: cheatVars[''no_dream_chance''] = input(''Enter no dream chance (%)'') & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">' + iif(cheatVars['no_dream_chance'] > 0, '<<cheatVars[''no_dream_chance'']>>%</a>, <a href="exec:cheatVars[''no_dream_chance''] = 0 & dynamic $cheatmenu[$cheatmenu[''this_menu'']]">Enabled</a>', 'Disabled</a>')
 
 	*nl
 	'<font color="red"><b>WARNING!</b></font>: Disabling states may cause some events not to trigger. Use at your own risk!'

+ 5 - 5
locations/Cum_Manage.qsrc

@@ -506,7 +506,7 @@ if $ARGS[0] = 'cumeater_icon':
 	*nl
 	j = 0
 	:cumeater_icon_jump
-	if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatKlisma = 0): gs 'cum_manage', 'cumeater', j
+		if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatVars['enema'] = 1): gs 'cum_manage', 'cumeater', j
 	if j < 17: j += 1 & jump 'cumeater_icon_jump'
 end
 
@@ -563,9 +563,9 @@ if $ARGS[0] = 'cumeater':
 				'You collect the sperm from your <<$part>> with your fingers and lick them, enjoying the tart taste.'
 			end
 
-			if FUNC('Cum_Manage', 'check_innards', cloc) = 1 and cheatKlisma = 1:
+			if FUNC('Cum_Manage', 'check_innards', cloc) = 1 and cheatVars['enema'] = 0:
 				cumspclnt = 15 & gs 'cum_cleanup'
-			elseif (cloc <> 0 and cloc <> 3) or cheatKlisma = 0:
+			elseif (cloc <> 0 and cloc <> 3) or cheatVars['enema'] = 1:
 				gs 'cum_cleanup', 'cleanloc', cloc
 			end
 		end
@@ -905,7 +905,7 @@ if $ARGS[0] = 'cum_stat_display':
 				end
 				$icon_txtiscum = $txtiscum
 				if j <= 4 and pcs_traits['cumeater'] = 1 and $txtiscum = 'cum' _ 
-				and FUNC('Cum_Manage', 'check_private', i) = 1 and ((i <> 0 and i <> 3) or FUNC('Cum_Manage', 'check_innards', i) = 1 or cheatKlisma = 0):
+				and FUNC('Cum_Manage', 'check_private', i) = 1 and ((i <> 0 and i <> 3) or FUNC('Cum_Manage', 'check_innards', i) = 1 or cheatVars['enema'] = 1):
 					$txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 				end
 				if $txtperson ! '':
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'cum_decay':
 !! ARGS[1] forced cum leak (sex intercourse) in values like 20-100
 
 	cumforced = ARGS[1]
-	if ((menu_off = 1 or cumdectime+15 > totminut) and cumforced = 0) or no_cum_leak = 1: exit
+	if (cumforced = 0 and (menu_off = 1 or cumdectime + 15 > totminut)) or cheatVars['no_cum_leak'] = 1: exit
 
 	if arrsize('sparrvol') > 0:
 		cumsumvag = 0

+ 2 - 2
locations/andrey.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'apply':
 
 		act 'Don''t take the job':gt 'shop_pussycats', 'start'
 
-		if ((work = 0 and young_shop_work = 0 and cheatWork = 0) or (young_shop_work = 0 and cheatWork = 1)):
+		if young_shop_work = 0 and (work = 0 and cheatVars['work'] = 0 or cheatVars['work'] = 1):
 			*nl
 			
 			act 'Take the evening job':
@@ -325,7 +325,7 @@ if $ARGS[0] = 'punish':
 		act 'Agree': gt 'andrey', 'fired2'
 	end
 
-	if cheatWork = 1:
+	if cheatVars['work'] = 1:
 		act 'Reset missed days (Cheat)':
 			young_shop_miss = 0
 			gt 'shop_pussycats', 'start'

+ 1 - 1
locations/bed2.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'wear_buttplug_decider':
 end
 
 if $ARGS[0] = 'wear_vibe_decider':
-	if mc_inventory['vibe'] = 1 and sleepVars['cheatVib'] = 1:
+	if mc_inventory['vibe'] = 1 and cheatVars['sleep_vib'] = 1:
 		if sleepVars['bedVibrator'] = 0:
 			'Should you always remove your vibrator before bed? Currently - <a href="exec:sleepVars[''bedVibrator''] = 1 & gs ''stat'' & gt ''bed2'', ''main''">NO</a>.'
 		elseif sleepVars['bedVibrator'] = 1:

+ 5 - 10
locations/body.qsrc

@@ -326,7 +326,7 @@ if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Update_StatBuffs'
 
 	!!pcs_mass['body'] Handling; the first part is because during a reset fat is not used and should be cleared
-	if bodyresetflag = 1 or cheatNoFat = 1:
+	if bodyresetflag = 1 or cheatVars['fat'] = 1:
 		fat = 0
 	else
 		if pregChem >= 800 and (pregChem - 800)*(pregChem - 800) >= bodyVars['pchem_next']:
@@ -401,14 +401,9 @@ if $ARGS[0] = 'Update_Body':
 			vital_deg -= 1000
 			pcs_mass['body'] = 1
 		else
-			if Enable_nogameover = 0:
-				over = 3
-				gt 'gameover'
-				exit
-			else
-				pl '<font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
-				pcs_mass['body'] = 1
-			end
+			gs 'gameover', 'check', 3
+			pl '<font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
+			pcs_mass['body'] = 1
 		end
 	end
 
@@ -618,7 +613,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 	end
 
 
-	if salobustdo = 0 and bodyVars['cheat_staticAssets'] = 0:
+	if salobustdo = 0 and cheatVars['body_staticAssets'] = 0:
 		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
 
 		!!===============    MAGIC    ===============!!

+ 1 - 1
locations/burger.qsrc

@@ -711,7 +711,7 @@ if $ARGS[0] = 'boss':
 						act 'Leave':gt 'burger', 'start'
 					end
 
-					if (work = 0 and BurgerQW['Secretary'] = 0 and cheatWork = 0) or (BurgerQW['Secretary'] = 0 and cheatWork = 1):
+					if BurgerQW['Secretary'] = 0 and (work = 0 and cheatVars['work'] = 0 or cheatVars['work'] = 1):
 						act 'Ask about the work':
 							*clr & cla
 							minut += 1

+ 15 - 26
locations/cikl.qsrc

@@ -209,11 +209,7 @@ nymphosex_flag = 0
 !!------------------------------------------------------------------------------------------------------------
 
 !!bimbo flag set in stat_display if bimbo clothing, shoes and makeup are worn at same time
-if succubusflag = 0 or CheatBimbo2 = 1: 
-	if cheatBimbo = 0 and bimbo_flag = 1: 
-		bimbo += 1
-	end
-end
+if cheatVars['bimbo'] = 0 and bimbo_flag = 1 and (succubusflag = 0 or cheatVars['smart_bimbo'] = 1): bimbo += 1
 
 !!Once bimbolevel is set to 1, must use the withdrawal in stat to return to 0
 if bimbo > 0 or bimbolevel > 0:
@@ -234,18 +230,18 @@ if bimbo >= 40: bimbo = 40
 
 !!Bimbo levels. They use custom variables so they won''t permanently change character stats
 if bimbolevel = 0: supnatvnesh = 0 & bimbostupidity = 0
-if CheatBimbo2 = 0:
+if cheatVars['smart_bimbo'] = 0:
 	if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 6)
 	if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 4)
 	if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = (pcs_intel / 3)
-elseif CheatBimbo2 = 1:
+elseif cheatVars['smart_bimbo'] = 1:
 	if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = 0
 	if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = 0
 	if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = 0
 end
 
 !!A Succubus cannot be a Bimbo
-if succubusflag = 1 and CheatBimbo3 = 0:
+if succubusflag = 1 and cheatVars['suc_bimbo'] = 0:
 	if bimbolevel > 0 and bimbo > 0: bimbowithdrawal = 40
 elseif bimbolevel >= 1:
 !!Checks flag and adds withdrawal if 0
@@ -281,7 +277,7 @@ if pcs_traits['buttslut_exp'] <= 0 and pcs_traits['buttslut_lvl'] = 3: pcs_trait
 !!	Exhibitionism
 !!------------------------------------------------------------------------------------------------------------
 
-if pcs_exhib > 0 or exhibitionist_lvl > 0:
+if cheatVars['no_trait_exhib'] = 0 and (pcs_exhib > 0 or exhibitionist_lvl > 0):
 	if pcs_exhib < 10:
 		pcs_exhib -= 1
 	elseif pcs_exhib < 50:
@@ -368,7 +364,7 @@ gs 'fertility', 'daily_update'
 
 if pcs_breath = 1:pcs_breath = 0
 
-if cheatNoEat = 1 and dounspell = 1:fat += 15
+if cheatVars['hunger'] = 1 and dounspell = 1: fat += 15
 
 !!Trauma decay
 if mood_trauma > 0: mood_trauma -= 1
@@ -420,8 +416,8 @@ else
 	isprok_lastday = 0
 end
 
-if Enable_auto_tampons = 0 and isprok = 1:  isprok  = 0 & 'You threw away your used tampon.'
-if Enable_auto_tampons = 0 and isprokp = 1: isprokp = 0 & 'You threw away your used sanitary pad.'
+if cheatVars['auto_tampons'] = 1 and isprok = 1:  isprok  = 0 & 'You threw away your used tampon.'
+if cheatVars['auto_tampons'] = 1 and isprokp = 1: isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if lactation['nipgrowth'] > 0:
 	tmp = rand(0,2)
@@ -435,20 +431,13 @@ end
 if preg = 1:
 	pregtime = pregchem / 24
 
-	if pregtimes = 0:pregtimes = 1
+	if pregtimes = 0: pregtimes = 1
 
-	elseif preg = 2 and pregminut < totminut:
-	if Enable_nogameover = 0 :
-		cla
-		*clr
-		over = 4
-		MSG '<center><b>A horrible pain shoots through your body.</b></center>'
-		xgt 'gameover'
-		exit
-	else
-		MSG'<font color=red><B>You should die for giving birth unprepared, but Cheat Mode keeps you Alive.</B></font>'
-		pregminut = totminut + 1440
-	end
+elseif preg = 2 and pregminut < totminut:
+	gs 'gameover', 'check', 4
+	msg '<font color=red><B>You should die for giving birth unprepared, but Cheat Mode keeps you Alive.</B></font>'
+	pregminut = totminut + 1440
+	
 elseif preg = 0:
 	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A14'
 	gs 'shortgs', 'remove_array_element', 'npc_pregtalk','A16'
@@ -677,7 +666,7 @@ if shantbog > 0:
 end
 
 petersexday = 0
-if cheatKlisma = 0:
+if cheatVars['enema'] = 1:
 	klismaday = daystart
 	klismaday1 = 1
 else

+ 11 - 12
locations/city_clinic.qsrc

@@ -646,10 +646,10 @@ if $ARGS[0] = 'ven1':
 	menu_off = 1
 	money -= 10000
 	gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
-    'You lie down, almost crying, mulling over the doctor''s words again and again in your head. You know it''s not fair, but you can''t allow these images to go public and decide to pay him to delete the footage.'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
+	'You lie down, almost crying, mulling over the doctor''s words again and again in your head. You know it''s not fair, but you can''t allow these images to go public and decide to pay him to delete the footage.'
 	'You pull the money from your purse and give it to him, hoping he''ll stay true to his word...'
-    act 'Return to the lobby': gt 'city_clinic','start'
+	act 'Return to the lobby': gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven2':
@@ -657,23 +657,22 @@ if $ARGS[0] = 'ven2':
 	menu_off = 1
 	money += 3000
 	gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
-    'You lie down, almost crying, mulling over the doctor''s words again and again in your head. After a while, you decide that you want the money. You probably won''t be recognized, and even if you are, you can always pretend you didn''t know you were being filmed.'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
+	'You lie down, almost crying, mulling over the doctor''s words again and again in your head. After a while, you decide that you want the money. You probably won''t be recognized, and even if you are, you can always pretend you didn''t know you were being filmed.'
 	'The doctor seems somewhat surprised to hear your answer, but gives you the money as promised. "Don''t worry," he grins. "Most of my subscribers don''t live in the city. Maybe a hundred, tops. What are the odds of you running into one of them over the coming weeks?"'
-    act 'Leave his office': gt 'city_clinic','start'
+	act 'Leave his office': gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven3':
 	*clr & cla
 	menu_off = 1
-	over = 9
 	gs 'stat'
-    '<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-    'The only thing you want to do now is get out of here! You can file a complaint later...'
-    '"Stop her! Stop her right now, she''s dangerous!" the doctor yells as you head for the door, trying to escape. Unfortunately for you, several staff members happened to be in the hallway as you tried to make your escape, who instantly spring to their colleague''s aid.'
+	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
+	'The only thing you want to do now is get out of here! You can file a complaint later...'
+	'"Stop her! Stop her right now, she''s dangerous!" the doctor yells as you head for the door, trying to escape. Unfortunately for you, several staff members happened to be in the hallway as you tried to make your escape, who instantly spring to their colleague''s aid.'
 	'The doctor is only a few steps behind you, planting a syringe in your neck and injecting you before you can tell them what''s happening. As your vision goes blurry and your body goes limp, you can hear the doctor. "That was close... Not well in the head... Has fits of violent rage... Drug addiction! I can take it from here."'
 	'He scoops you up in his arms and carries your limp body back to his office. "Yet another overdose victim, so sad..." he mumbles to himself once the door is closed.'
-    act 'Continue': gt 'gameover'
+	act 'Continue': gt 'gameover', 'force', 9
 end
 
 if $ARGS[0] = 'drPP':
@@ -1127,7 +1126,7 @@ if $ARGS[0] = 'glavdoc':
 	end
 
 	! WD: Uninitialised ~ 'workshop' use 'workhosp'
-	if (work = 0 and workhosp = 0 and cheatWork = 0) or (workhosp = 0 and cheatWork = 1):
+	if workhosp = 0 and (work = 0 and cheatVars['work'] = 0 or cheatVars['work'] = 1):
 		act 'Take the job':
 			cla
 			workhosp = 1

+ 1 - 2
locations/city_drugden.qsrc

@@ -346,7 +346,6 @@ if $ARGS[0] = 'drugslut':
 		if drugVars['heroin_whore'] > 5:
 			act 'Submit to your fate':
 				*clr & cla
-				over = 8
 
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/crackwhore.jpg"></center>'
 				'Your ever increasing dependence on drugs has taken its toll on you. Your will was slowly being worn down by always having to go to Bobka to beg for your next dosage... and he supplies it readily, considering it an investment. When he thinks you''re ready, he offers you permanent lodging in the drug den.'
@@ -384,7 +383,7 @@ if $ARGS[0] = 'drugslut':
 									'The brothel owner is starting to lose his patience with you. Even his customers, who already have fairly low standards, no longer seem to be very interested in you. Lucky for you, some them of them can''t afford any better.'
 									'Occasionally, when you get ready to offer your broken down holes up again to yet another customer, you wonder... was there anything you could''ve done differently?'
 
-									act 'Continue':gt 'gameover'
+									act 'Continue': gt 'gameover', 'force', 8
 								end
 							end
 						end

+ 1 - 1
locations/city_market.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'start' or $loc_arg = 'start':
 		end
 	end
 
-	if (work = 0 or cheatWork = 1) and workrin = 0:
+	if workrin = 0 and (work = 0 or cheatVars['work'] = 1):
 		nl
 		'A messily written ad hangs from one of the stalls. "Need female market stall staff. Paychecks big."'
 

+ 1 - 2
locations/city_residential.qsrc

@@ -49,8 +49,7 @@ end
 gs 'stat'
 
 if gopdeath = 1 and vsehsdaladay ! daystart:
-	over = 6
-	gt 'gameover'
+	gt 'gameover', 'force', 6
 end
 
 if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15 and cumloc[11] = 0:

+ 2 - 2
locations/clothing.qsrc

@@ -1478,7 +1478,7 @@ if $ARGS[0] = 'view_clothing_item':
 		$swimwear_description
 	end
 
-	if CloBimbo = 1 and cheatbimbo = 0:'This item is considered bimbo clothing.'
+	if CloBimbo = 1 and cheatVars['bimbo'] = 0: 'This item is considered bimbo clothing.'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 
@@ -1899,7 +1899,7 @@ if $ARGS[0] = 'wear':
 	PCloStyle2 = CloStyle2
 	PCloStyle3 = CloStyle3
 	PCloInhibit = CloInhibit
-	if cheatbimbo = 0:
+	if cheatVars['bimbo'] = 0:
 		PCloBimbo = CloBimbo
 	end
 

+ 1 - 1
locations/clothing_QV.qsrc

@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'change':
 		end
 	end
 
-	if CloBimbo = 1 and cheatBimbo = 0:'This item is considered bimbo clothing.'
+	if CloBimbo = 1 and cheatVars['bimbo'] = 0: 'This item is considered bimbo clothing.'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 

+ 11 - 11
locations/cum_cleanup.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'cleanloc':
 	if l < arrsize('$sparrnam'):
 		if sparrloc[l] = ARGS[1]:
 			if sparrloc[l] = 0 or sparrloc[l] = 3:
-				if mc_inventory['enema_kit'] = 1 or cheatKlisma = 0:
+				if mc_inventory['enema_kit'] = 1 or cheatVars['enema'] = 0:
 					cumsumvag -= iif(sparrloc[l]=0,sparrvol[l],0)
 					cumsumass -= iif(sparrloc[l]=3,sparrvol[l],0)
 					sparrvol[l] = 0
@@ -276,8 +276,8 @@ elseif $ARGS[0] = '':
 			if sparrloc[l] = 0:
 				!! cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
 				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 _ 
-				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
-				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
+				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
+				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					cumsumbod -= sparrvol[l] & cumsumvag -= sparrvol[l]
 					sparrslc[l] = 0 & sparrvol[l] = 0
 					isprok = 0 & vibratorIN = 0
@@ -285,8 +285,8 @@ elseif $ARGS[0] = '':
 			!! ass
 			elseif sparrloc[l] = 3:
 				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 or cumspclnt = 7 _ 
-				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
-				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
+				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
+				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					cumsumbod -= sparrvol[l] & cumsumass -= sparrvol[l]
 					sparrslc[l] = 0 & sparrvol[l] = 0
 					analplugin = 0 & analplugout = 0
@@ -301,17 +301,17 @@ elseif $ARGS[0] = '':
 		if tmp ! -1 and tmp < arrsize('toclean') and sparrvol[l] > 0:
 			!! vagina
 			if sparrloc[l] = 0:
-				if cumsumvag*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and isprok = 0 and vibratorIN = 0 _ 
-				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
-				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
+				if cumsumvag * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and isprok = 0 and vibratorIN = 0 _ 
+				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
+				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					gs 'cum_cleanup', 'cleandeposit', l
 					if cumspclnt = 3: isprok = 0 & vibratorIN = 0
 				end
 			!! ass
 			elseif sparrloc[l] = 3:
-				if (cumsumass*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and analplugin = 0) or cumspclnt = 7 _ 
-				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
-				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
+				if (cumsumass * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and analplugin = 0) or cumspclnt = 7 _ 
+				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
+				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					gs 'cum_cleanup', 'cleandeposit', l
 					if cumspclnt = 3 or cumspclnt = 7: analplugin = 0
 				end

+ 2 - 2
locations/dinSex.qsrc

@@ -32,7 +32,7 @@ end
 $penis_desc = $dick_girth + ', ' + $penis_desc
 
 if $ARGS[0] = 'std_trigger':
-	if cheatHealth = 1 or rand(pcs_health/10, pcs_health) > 600: exit
+	if cheatVars['std'] = 1 or rand(pcs_health/10, pcs_health) > 600: exit
 	if npc_rel[$boy] > rand(80,90): exit
 	if npc_love[$boy] > rand(40,60): exit
 	if npc_sexual[$boy]+npc_sex[$boy] > 0 and rand(10) > 5: exit
@@ -90,7 +90,7 @@ if $ARGS[0] = 'disease_picker':
 end
 
 if $ARGS[0] = 'std_trigger_oral':
-	if cheatHealth = 1 or rand(pcs_health/10, pcs_health) > 300: exit
+	if cheatVars['std'] = 1 or rand(pcs_health/10, pcs_health) > 300: exit
 	if npc_rel[$boy] > rand(80,90): exit
 	if npc_love[$boy] > rand(40,60): exit
 	if npc_sexual[$boy]+npc_sex[$boy] > 0 and rand(10) > 5: exit

+ 4 - 4
locations/din_bad.qsrc

@@ -806,7 +806,7 @@ $d_cycreport_update = {
 	elseif succubusflag = 1:
 		$cycreport_txt = 'As a succubus you no longer menstruate.'
 	else
-		if cyccustom = 1:
+		if cheatVars['track_period'] = 1:
 			if preg = 1 and knowpreg = 1:
 				$cycreport_txt = 'You are pregnant. Your due date is around <<$pregduedate>>.'
 				if $wombthfath <> 'unknown' and $wombthfath <> '':
@@ -897,7 +897,7 @@ $d_cycreport_update = {
 				temp = daystart-daylastperiod
 				$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 			end
-		elseif cyccustom = 0:
+		elseif cheatVars['track_period'] = 0:
 			if $cycreport_txt ! 'In labour':
 				if thinkpreg = 1 or knowpreg = 1:
 					if knowpreg = 0: $temp = ' think you'
@@ -924,7 +924,7 @@ $d_cycreport_upduedate = {
 	implant_calc = daystart - lastovulation + 5
 	
 	!! Human gastation period: 280 days
-	gastation_time = 280 / (1 + pregspeedcheat)
+	gastation_time = 280 / (1 + cheatVars['preg_speed'])
 	
 	temp = gastation_time - implant_calc
 	pregdueday = day
@@ -1037,7 +1037,7 @@ $d_pregmovement = {
 				end
 			end
 		else
-			if cyccustom = 1:
+			if cheatVars['track_period'] = 1:
 				if pregchem < 4000:
 					if kid <= 0 :
 						'You feel a weird and strange fluttering sensation around inside your stomach. Perhaps you should see the doctor?'

+ 2 - 2
locations/din_van.qsrc

@@ -1523,7 +1523,7 @@ end
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
-	if last_pee + 59 < totminut and cheatPee = 0:
+	if last_pee + 59 < totminut and cheatVars['pee'] = 0:
 		act 'Go pee (0:04)':
 			*clr & cla
 			menu_off = 1
@@ -1608,7 +1608,7 @@ end
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
 if $ARGS[0] = 'pblc_pee':
-	if last_pee + 59 < totminut and cheatPee = 0:
+	if last_pee + 59 < totminut and cheatVars['pee'] = 0:
 		act 'Go pee (0:04)':
 			*clr & cla
 			menu_off = 1

+ 2 - 3
locations/dream_events.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events_priority[] = 'gs ''dream_events'', ''succubus_dream'' '
 		end
 
-		if rand(1, 100) <= sleepVars['cheat_nodream_chance']:
+		if rand(1, 100) <= cheatVars['no_dream_chance']:
 			!nodream chance cheat
 			$sleep_events[] = 'gs ''dream_events'', ''no_dream'' '
 		else
@@ -46,10 +46,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				!erotic dream
 				$sleep_events[] = 'gs ''dream_events'', ''erotic_dream_switch'' '
 			end
+			if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
 		end
 
-		if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
-
 		gt 'dream_events', 'mod_sleepevents'
 	end
 

+ 10 - 10
locations/drugs.qsrc

@@ -57,8 +57,8 @@ elseif $ARGS[0] = 'pain_relief':
 
 elseif $ARGS[0] = 'smoke':
 	if $ARGS[1] = 'hourly_events':
-		if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0: drugVars['cigarettes_need'] += 1
-		if drugVars['cigarettes_need'] > 10 and InSleep = 0 and pcs_mood > 20 and drugVars['cheat_immune'] = 0: pcs_mood -= pcs_mood / 10
+		if drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0: drugVars['cigarettes_need'] += 1
+		if drugVars['cigarettes_need'] > 10 and InSleep = 0 and pcs_mood > 20 and cheatVars['drugs_immune'] = 0: pcs_mood -= pcs_mood / 10
 
 		if drugVars['cigarettes_need'] > 300:
 			drugVars['cigarettes_need'] = 0
@@ -70,7 +70,7 @@ elseif $ARGS[0] = 'smoke':
 			if mc_inventory['cigarettes'] <= 0: mc_inventory['cigarettes'] = 0 & msg 'That was your last cigarette.'
 		end
 
-		if drugVars['cheat_immune'] = 1:
+		if cheatVars['drugs_immune'] = 1:
 			drugVars['cigarettes_used'] += 1
 			if drugVars['cigarettes_used'] > 20 and drugVars['cigarettes_exp'] = 0: drugVars['cigarettes_exp'] = 1
 		end
@@ -106,7 +106,7 @@ elseif $ARGS[0] = 'joint':
 			if mc_inventory['joints'] <= 0: mc_inventory['joints'] = 0 & msg 'That was your last joint.'
 		end
 
-		if drugVars['cheat_immune'] = 0:
+		if cheatVars['drugs_immune'] = 0:
 			drugVars['weed_used'] += 1
 			if drugVars['weed_used'] > 5 and drugVars['weed_exp'] = 0: drugVars['weed_exp'] = 1
 		end
@@ -163,7 +163,7 @@ elseif $ARGS[0] = 'heroin':
 			drugVars['heroin_penalty'] += 1
 		end
 	else
-		if drugVars['cheat_immune'] = 0:
+		if cheatVars['drugs_immune'] = 0:
 			drugVars['heroin_used'] += 1
 			if drugVars['heroin_used'] > 1 and drugVars['heroin_exp'] = 0: drugVars['heroin_exp'] = 1
 		end
@@ -198,9 +198,9 @@ elseif $ARGS[0] = 'cocaine':
 			end
 		end
 	elseif $ARGS[1] = 'stat':
-		if drugVars['cheat_immune'] = 1:
+		if cheatVars['drugs_immune'] = 1:
 			if drugVars['cocaine_addict'] ! 0: drugVars['cocaine_addict'] = 0
-		elseif drugVars['cocaine_system'] >= 30 and drugVars['cocaine_addict'] = 0 and drugVars['cheat_immune'] = 0:
+		elseif drugVars['cocaine_system'] >= 30 and drugVars['cocaine_addict'] = 0 and cheatVars['drugs_immune'] = 0:
 			drugVars['cocaine_addict'] = 1
 		elseif drugVars['cocaine_system'] = 0 and drugVars['cocaine_addict'] = 1:
 			drugVars['cocaine_addict'] = 0
@@ -210,7 +210,7 @@ elseif $ARGS[0] = 'cocaine':
 			mc_inventory['cocaine'] -= 1
 			if mc_inventory['cocaine'] <= 0: mc_inventory['cocaine'] = 0 & msg 'That was your last line of cocaine.'
 		end
-		if drugVars['cheat_immune'] = 0:
+		if cheatVars['drugs_immune'] = 0:
 			drugVars['cocaine_used'] += 1
 			if drugVars['cocaine_used'] > 3 and drugVars['cocaine_exp'] = 0: drugVars['cocaine_exp'] = 1
 		end
@@ -299,7 +299,7 @@ elseif $ARGS[0] = 'amphetamine':
 				mc_inventory['amphetamine'] -= 1
 				if mc_inventory['amphetamine'] <= 0: mc_inventory['amphetamine'] = 0 & msg 'That was your last amphetamine pill.'
 			end
-			if drugVars['cheat_immune'] = 0: 
+			if cheatVars['drugs_immune'] = 0: 
 				drugVars['amphetamine_used'] += 1
 				if drugVars['amphetamine_used'] > 5 and drugVars['amphetamine_exp'] = 0: drugVars['amphetamine_exp'] = 1
 			end
@@ -407,7 +407,7 @@ elseif $ARGS[0] = 'alcohol':
 			pain['relief'] = 15
 		end
 	else
-		if drugVars['cheat_immune'] = 0: 
+		if cheatVars['drugs_immune'] = 0: 
 			drugVars['alcohol_used'] += 1
 			if drugVars['alcohol_used'] > 15 and drugVars['alcohol_exp'] = 0: drugVars['alcohol_exp'] = 1
 		end	

+ 8 - 8
locations/femcyc.qsrc

@@ -59,7 +59,7 @@
 !!	cumsumbod : sum of cum on body
 !!	cumsumvag : sum of cum on vagina
 !!	cumtime[] : array to store how many times someone came in Sveta. More cumtime means more possibility to be the father.
-!!	cyccustom : custom cycle flag variable. Either 0 or 1. Activates custom cycle reports during pregnancy.
+!!	cheatVars['track_period'] : custom cycle flag variable. Either 0 or 1. Activates custom cycle reports during pregnancy.
 !!	cycle : current state of svetas cycle, can be 0 to 5. 0 to 4 are usual mentruation cycles including fertilization. 5 is for the status 'pregnant'.
 !!	daykid : Birthday of the baby/kid
 !!	daylastperiod : daylastperiod is for Svetas knowledge on when she began her last period
@@ -100,7 +100,7 @@
 !!	preg : Pregnancy flag. 0 = not pregnant, 1 = pregnant, 2 = delivery
 !!	PregChem : Progress of the pregnancy in hours.
 !!	pregminut : total minutes + 1440 minutes. The time Sveta has from the first uterine contraction to labour. Usually Sveta dies during labour if this time is surpassed.
-!!	pregspeedcheat : Cheat variable for faster pregnancies.
+!!	cheatVars['preg_speed'] : Cheat variable for faster pregnancies.
 !!	rcntorgzm : determine wether Sveta had an orgasm withhin the last hour or not (1 or 0)
 !!	rcntorgzmtmp : temp variable to rewrite to rcntorgzm
 !!	RecovH : Recovery counter in hours. RecovH is the amount of recover hours before Svetas fertility cycle resets after having a baby.
@@ -443,7 +443,7 @@ if $ARGS[0] = '':
 		killvar 'cumarrtemp'
 	end
 	!!	Breastcycle. Every breast related change with lactation happens in here.
-	if cheat_NoLactation > 0:
+	if cheatVars['no_lactation'] > 0:
 		gs 'lact_lib','lactate_optout'
 	else
 		gs 'lact_lib','breastcycle'
@@ -651,7 +651,7 @@ if $ARGS[0] = 'cyc2':
 
 		egg_idx = 0
 		egg_sz = UnfertEgg
-		if cheat_NoPregnancy = 1:egg_idx = egg_sz
+		if cheatVars['no_pregnancy'] = 1: egg_idx = egg_sz
 		:FertLoop
 		if egg_idx < egg_sz:
 !!{fert_thresh is the chance this specific egg is fertilized. Its modified by being on the pill, being sterilized, the brood curse, and so on. If it computes to less than the cum total calculated above, the egg is fertilized by a father randomly drawn from the lotto array.}
@@ -856,7 +856,7 @@ if $ARGS[0] = 'cyc3':
 			else
 				cycle = 0
 				killvar 'abortionbirthdate'
-				if cyccustom = 1: daylastperiod = daystart
+				if cheatVars['track_period'] = 1: daylastperiod = daystart
 				firstmens = daystart
 				temprand = rand(0,10)
 				if temprand = 0 and pillcon < 10000:
@@ -871,7 +871,7 @@ if $ARGS[0] = 'cyc3':
 			end
 		end
 	else
-		if preg = 1:PregChem += 1 + pregspeedcheat
+		if preg = 1: PregChem += (1 + cheatVars['preg_speed'])
 		if rand(0,100) < 100: LutH += 1
 	end
 end
@@ -881,7 +881,7 @@ end
 if $ARGS[0] = 'cyc4':
 	if RecovH <= 0:
 		cycle = 1
-		if cyccustom = 1:
+		if cheatVars['track_period'] = 1:
 			knowpregloss = 0
 			knowpregrecover = 0
 		end
@@ -921,7 +921,7 @@ if $ARGS[0] = 'preg':
 			$childtype[nextbaby-1] = 'identical twin'
 		end
 	end
-	PregChem += (1+pregspeedcheat)
+	PregChem += (1 + cheatVars['preg_speed'])
 	temprand = rand(-400,800)
 	temprand -= (babyembryo-1)*588
 	if PregChem > 6573 + temprand and preg ! 2:

+ 3 - 3
locations/fight.qsrc

@@ -432,7 +432,7 @@ end
 
 if $ARGS[0] = 'result_check':
 !!cheat to auto-win fights check
-	if fight_cheat = 1:
+	if cheatVars['win_fights'] = 1:
 		xgt 'ender', 'win'
 		gt $loc, $loc_arg
 		exit
@@ -1111,8 +1111,8 @@ if $ARGS[0] = 'sta':
 	if defenceActM > 0:'<b><font color = green><<defenceActM>> Mana recovery protection</font></b>'
 	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
 
-	if autocombat_cheat = 0: act 'Continue':gt'fight','start'
-	if autocombat_cheat = 1: gt'fight','start'
+	if cheatVars['auto_combat'] = 0: act 'Continue': gt'fight', 'start'
+	if cheatVars['auto_combat'] = 1: gt 'fight', 'start'
 end
 
 --- fight ---------------------------------

+ 151 - 82
locations/gadforestlost.qsrc

@@ -619,142 +619,211 @@ if $ARGS[0] = 'wolves':
 		'Instincts take over and you begin running without a second thought.'
 
 		if $ARGS[1] = 'forest_edge':
-			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
-				foresteventrand = rand(1,7)
+			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70:
+				foresteventrand = rand(0, 19)
 			else
-				foresteventrand = rand(1,6)
+				foresteventrand = rand(1, 19)
 			end
-			if foresteventrand <= 3:
-				gs 'exp_gain', 'bushcraft', rand(1,3)
+
+			if foresteventrand = 0:
+				gs 'exp_gain', 'bushcraft', rand(1, 2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			elseif foresteventrand <= 10:
+				gs 'exp_gain', 'bushcraft', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still in the forest.'
-			elseif foresteventrand <= 6:
-				gs 'exp_gain', 'bushcraft', rand(1,5)
+			else
+				gs 'exp_gain', 'bushcraft', rand(1, 5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer in the forest.'
-			elseif foresteventrand <= 7:
-				gs 'exp_gain', 'bushcraft', rand(1,2)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
-				*nl
-				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
 			end
+
 			act 'Continue':
-				if foresteventrand <= 3: gt 'gadforest','forest_edge'
-				if foresteventrand <= 4: gt 'gadfield','field'
-				if foresteventrand <= 5: gt 'gadroad'
-				if foresteventrand <= 6: gt 'gadriver','start'
-				if foresteventrand <= 7:over = 11 & gt 'gameover'
+				if foresteventrand = 0:
+					gs 'gameover', 'check', 11
+					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
+					gt 'gadforestlost', 'forest_edge'
+				elseif foresteventrand <= 10:
+					gt 'gadforestlost', 'forest_edge'
+				elseif foresteventrand <= 13:
+					gt 'gadforestlost', 'forest_edge'
+				elseif foresteventrand <= 15:
+					gt 'gadfield', 'field'
+				elseif foresteventrand <= 17:
+					gt 'gadroad'
+				else
+					gt 'gadriver', 'start'
+				end
 			end
+
 		elseif $ARGS[1] = 'forest_outskirts':
-			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
-				foresteventrand = rand(1,10)
+			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70:
+				foresteventrand = rand(0, 19)
 			else
-				foresteventrand = rand(1,9)
+				foresteventrand = rand(1, 19)
 			end
-			if foresteventrand <= 5:
-				gs 'exp_gain', 'bushcraft', rand(1,3)
+
+			if foresteventrand = 0:
+				gs 'exp_gain', 'bushcraft', rand(1, 2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			elseif foresteventrand <= 14:
+				gs 'exp_gain', 'bushcraft', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
-			elseif foresteventrand <= 9:
-				gs 'exp_gain', 'bushcraft', rand(1,5)
+			else
+				gs 'exp_gain', 'bushcraft', rand(1, 5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
-			elseif foresteventrand <= 10:
-				gs 'exp_gain', 'bushcraft', rand(1,2)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
-				*nl
-				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
 			end
+
 			act 'Continue':
-				if foresteventrand <= 3: gt 'gadforestlost', 'forest_outskirts'
-				if foresteventrand <= 5: gt 'gadforest','forest_edge'
-				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
-				if foresteventrand <= 7: gt 'gadfield','field'
-				if foresteventrand <= 8: gt 'gadroad'
-				if foresteventrand <= 9: gt 'gadriver','start'
-				if foresteventrand <= 10:over = 11 & gt 'gameover'
+				if foresteventrand = 0:
+					gt 'gameover', 'check', 11
+					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
+					gt 'gadforestlost', 'forest_outskirts'
+				elseif foresteventrand <= 9:
+					gt 'gadforestlost', 'forest_outskirts'
+				elseif foresteventrand <= 14:
+					gt 'gadforestlost', 'forest_edge'
+				elseif foresteventrand = 15:
+					gt 'gadforest', 'forest_outskirts'
+				elseif foresteventrand = 16:
+					gt 'gadforest', 'forest_edge'
+				elseif foresteventrand = 17:
+					gt 'gadfield', 'field'
+				elseif foresteventrand = 18:
+					gt 'gadroad'
+				else
+					gt 'gadriver', 'start'
+				end
 			end
+
 		elseif $ARGS[1] = 'forest_center':
-			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
-				foresteventrand = rand(1,13)
+			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70:
+				foresteventrand = rand(0, 19)
 			else
-				foresteventrand = rand(1,2)
+				foresteventrand = rand(1, 19)
 			end
-			if foresteventrand <= 6:
-				gs 'exp_gain', 'bushcraft', rand(1,3)
+
+			if foresteventrand = 0:
+				gs 'exp_gain', 'bushcraft', rand(1, 2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			elseif foresteventrand <= 13:
+				gs 'exp_gain', 'bushcraft', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
-			elseif foresteventrand <= 12:
-				gs 'exp_gain', 'bushcraft', rand(1,5)
+			else
+				gs 'exp_gain', 'bushcraft', rand(1, 5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer lost as you recognize your surroundings.'
-			elseif foresteventrand <= 13:
-				gs 'exp_gain', 'bushcraft', rand(1,2)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
-				*nl
-				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
 			end
+
 			act 'Continue':
-				if foresteventrand <= 2: gt 'gadforestlost', 'forest_outskirts'
-				if foresteventrand <= 6: gt 'gadforestlost', 'forest_center'
-				if foresteventrand <= 7: gt 'gadforest','forest_edge'
-				if foresteventrand <= 8: gt 'gadforest','forest_outskirts'
-				if foresteventrand <= 9: gt 'gadforest','forest_center'
-				if foresteventrand <= 10: gt 'gadfield','field'
-				if foresteventrand <= 11: gt 'gadroad'
-				if foresteventrand <= 12: gt 'gadriver','start'
-				if foresteventrand <= 13:over = 11 & gt 'gameover'
+				if foresteventrand = 0:
+					gt 'gameover', 'check', 11
+					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
+					gt 'gadforestlost', 'forest_center'
+				elseif foresteventrand <= 8:
+					gt 'gadforestlost', 'forest_center'
+				elseif foresteventrand <= 11:
+					gt 'gadforestlost', 'forest_outskirts'
+				elseif foresteventrand <= 13:
+					gt 'gadforestlost', 'forest_edge'
+				elseif foresteventrand = 14:
+					gt 'gadforest','forest_center'
+				elseif foresteventrand = 15:
+					gt 'gadforest','forest_outskirts'
+				elseif foresteventrand = 16:
+					gt 'gadforest','forest_edge'
+				elseif foresteventrand = 17:
+					gt 'gadfield','field'
+				elseif foresteventrand = 18:
+					gt 'gadroad'
+				else
+					gt 'gadriver','start'
+				end
 			end
+
 		elseif $ARGS[1] = 'swamp':
-			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70 and Enable_nogameover = 0:
-				foresteventrand = rand(1,14)
+			if pcs_bushcraft < 80 and pcs_agil < 70 and pcs_stren < 70:
+				foresteventrand = rand(0, 19)
 			else
-				foresteventrand = rand(1,13)
+				foresteventrand = rand(1, 19)
 			end
-			if foresteventrand <= 8:
-				gs 'exp_gain', 'bushcraft', rand(1,3)
+
+			if foresteventrand = 0:
+				gs 'exp_gain', 'bushcraft', rand(1, 2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
+				*nl
+				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
+			elseif foresteventrand <= 8:
+				gs 'exp_gain', 'bushcraft', rand(1, 3)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end2.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, but unfortunately are still lost in the forest.'
-			elseif foresteventrand <= 13:
-				gs 'exp_gain', 'bushcraft', rand(1,5)
+			else
+				gs 'exp_gain', 'bushcraft', rand(1, 5)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/run_end1.jpg"></center>'
 				*nl
 				'You are successful in escaping the wolves, and also are no longer in the forest.'
-			elseif foresteventrand <= 14:
-				gs 'exp_gain', 'bushcraft', rand(1,2)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/horror.jpg"></center>'
-				*nl
-				'The wolves are simply too fast and you cannot lose them. Suddenly you feel a sharp pain as a wolf bites your leg.'
 			end
+
 			act 'Continue':
-				if foresteventrand <= 4: gt 'gadforest','forest_edge'
-				if foresteventrand <= 6: gt 'gadforest','forest_outskirts'
-				if foresteventrand <= 8: gt 'gadforest','forest_center'
-				if foresteventrand <= 9: gt 'gadfield','field'
-				if foresteventrand <= 10: gt 'gadroad'
-				if foresteventrand <= 11: gt 'gadriver','start'
-				if foresteventrand <= 12: gt 'swamp_yard','start'
-				if foresteventrand <= 13: gt 'swamp_woods','start'
-				if foresteventrand <= 14:over = 11 & gt 'gameover'
+				if foresteventrand = 0:
+					gt 'gameover', 'check', 11
+					msg '<font color=red><B>You should die in this forest, but Cheat Mode keeps you Alive.</B></font>'
+					gt 'gadforestlost', 'swamp'
+				elseif foresteventrand <= 4:
+					gt 'gadforestlost','swamp'
+				elseif foresteventrand <= 6:
+					gt 'gadforestlost','forest_center'
+				elseif foresteventrand <= 8:
+					gt 'gadforestlost','forest_outskirts'
+				elseif foresteventrand <= 10:
+					gt 'gadforestlost','forest_edge'
+				elseif foresteventrand = 11:
+					gt 'gadforest','swamp'
+				elseif foresteventrand = 12:
+					gt 'gadforest','forest_center'
+				elseif foresteventrand = 13:
+					gt 'gadforest','forest_outskirts'
+				elseif foresteventrand = 14:
+					gt 'gadforest','forest_edge'
+				elseif foresteventrand = 15:
+					gt 'gadfield','field'
+				elseif foresteventrand = 16:
+					gt 'gadroad'
+				elseif foresteventrand = 17:
+					gt 'gadriver','start'
+				elseif foresteventrand = 18:
+					gt 'swamp_yard','start'
+				else
+					gt 'swamp_woods','start'
+				end
 			end
 		end
 	end

+ 84 - 70
locations/gameover.qsrc

@@ -1,83 +1,97 @@
 # gameover
 
-$loc = 'gameover'
-$loc_arg = ''
-$menu_loc = 'gameover'
-$menu_arg = ''
-menu_off = 0
-gs 'stat'
-
-'<center><b><font color="maroon">GAME OVER</font></b></center>'
-
-if over = 1:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
-	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
-
-elseif over = 2:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/over.jpg"></center>'
-	if $start_type[1] = 'tg':
-		'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
-		*nl
-		'Hint:'
-		'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV and visiting a psychotherapist.'
-	else
-		'You go mad and start to run around town naked screaming, "I am THE PLAYER!". The police are quickly alerted, and you are arrested. Your mother can only send you to a mental hospital, hoping you''ll recover. There you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family. You can''t help but wonder how different your life would have been if you did not follow the whisper from the twisted mouse clicker?'
-		*nl
-		'Hint:'
-		'When your mood is low, your mind weakens and finally breaks. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV or visiting the psychotherapist.'
+if $ARGS[0] = 'check':
+	if cheatVars['gameover'] = 0:
+		gt 'gameover', 'screen', '<<ARGS[1]>>'
 	end
+elseif $ARGS[0] = 'force':
+	gt 'gameover', 'screen', '<<ARGS[1]>>'
+end
+
+
+
+
+if $ARGS[0] = 'screen':
+	gs 'shortgs', 'setloc', 'gameover', 'screen'
+	menu_off = 0
+	gs 'stat'
+
+	'<center><b><font color="maroon">GAME OVER</font></b></center>'
 
-elseif over = 3:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
-	'You die of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
+	if over = 1 or $ARGS[1] = '1':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
+		'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
 
-elseif over = 4:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/birth.jpg"></center>'
-	'You die from complications during childbirth.'
+	elseif over = 2 or $ARGS[1] = '2':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/over.jpg"></center>'
+		if $start_type['magic'] = 'tg':
+			'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
+			*nl
+			'Hint:'
+			'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV and visiting a psychotherapist.'
+		else
+			'You go mad and start to run around town naked screaming, "I am THE PLAYER!". The police are quickly alerted, and you are arrested. Your mother can only send you to a mental hospital, hoping you''ll recover. There you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family. You can''t help but wonder how different your life would have been if you did not follow the whisper from the twisted mouse clicker?'
+			*nl
+			'Hint:'
+			'When your mood is low, your mind weakens and finally breaks. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV or visiting the psychotherapist.'
+		end
 
-elseif over = 5:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/toilet.jpg"></center>'
-	'You try to run, but immediately find yourself in a strange place surrounded by walls with obscene graffiti. you couldn''t move even if you tried. Suddenly, the door opens and some fat guy comes in. He undoes his pants and turns his back to you, his ass hovering in the air just above you. Then you realize, the witch kept her promise and turned you into a toilet at the station.'
-	'So you spend the rest of your days swallowing shit, until 50 years later when the train station is in need of repair and you are just broken up, taken out and thrown in a landfill.'
+	elseif over = 3 or $ARGS[1] = '3':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
+		'You die of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
 
-elseif over = 6:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/stab.jpg"></center>'
-	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys," says a shadowy figure. You look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you see is the ground rushing towards you.'
+	elseif over = 4 or $ARGS[1] = '4':
+		msg '<center><b>A horrible pain shoots through your body.</b></center>'
+		'<center><img <<$set_imgh>> src="images/system/2_endings/birth.jpg"></center>'
+		'You die from complications during childbirth.'
 
-elseif over = 7:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
-	'The last thing you see is a police baton flying at your face. You are beaten to death, and your early demise wi written up as an accident. You are dragged out by the morgue attendants, and the pathologist notes that you died from a blow to the head. Soon, your body is handed over to your parents...'
+	elseif over = 5 or $ARGS[1] = '5':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/toilet.jpg"></center>'
+		'You try to run, but immediately find yourself in a strange place surrounded by walls with obscene graffiti. you couldn''t move even if you tried. Suddenly, the door opens and some fat guy comes in. He undoes his pants and turns his back to you, his ass hovering in the air just above you. Then you realize, the witch kept her promise and turned you into a toilet at the station.'
+		'So you spend the rest of your days swallowing shit, until 50 years later when the train station is in need of repair and you are just broken up, taken out and thrown in a landfill.'
 
-elseif over = 8:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/crackwhore8.jpg"></center>'
-	'"At some point, you question your life decisions." You try to understand why you made the choices you did as yet another explosion of cum fills your mouth. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
+	elseif over = 6 or $ARGS[1] = '6':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/stab.jpg"></center>'
+		'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys," says a shadowy figure. You look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you see is the ground rushing towards you.'
 
-elseif over = 9:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/overdose.jpg"></center>'
-	'Your last moments are those of bliss, your mind is so hazed by the drugs you don''t even know you are dying. You body is found surrounded by the drugs that ended your life.'
+	elseif over = 7 or $ARGS[1] = '7':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/deadgirl.jpg"></center>'
+		'The last thing you see is a police baton flying at your face. You are beaten to death, and your early demise wi written up as an accident. You are dragged out by the morgue attendants, and the pathologist notes that you died from a blow to the head. Soon, your body is handed over to your parents...'
 
-elseif over = 10:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/over10.jpg"></center>'
-	'You fall into a quagmire while trying to find a way out of the swamp. It sucks you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
+	elseif over = 8 or $ARGS[1] = '8':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/crackwhore8.jpg"></center>'
+		'"At some point, you question your life decisions." You try to understand why you made the choices you did as yet another explosion of cum fills your mouth. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
+
+	elseif over = 9 or $ARGS[1] = '9':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/overdose.jpg"></center>'
+		'Your last moments are those of bliss, your mind is so hazed by the drugs you don''t even know you are dying. You body is found surrounded by the drugs that ended your life.'
+
+	elseif over = 10 or $ARGS[1] = '10':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/over10.jpg"></center>'
+		'You fall into a quagmire while trying to find a way out of the swamp. It sucks you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
+
+	elseif over = 11 or $ARGS[1] = '11':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/over11.jpg"></center>'
+		'Apparently, you learned nothing from when your mother used to read you the tale of Little Red Riding Hood. Otherwise, you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
 
-elseif over = 11:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/over11.jpg"></center>'
-	'Apparently, you learned nothing from when your mother used to read you the tale of Little Red Riding Hood. Otherwise, you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
+	elseif over = 12 or $ARGS[1] = '12':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/over12.jpg"></center>'
+		'Your body is found a few months later by some hunters. No one ever finds out what happened to you.'
+
+	elseif over = 13 or $ARGS[1] = '13':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/fade.jpg"></center>'
+		'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
+		!! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
+
+	elseif over = 14 or $ARGS[1] = '14':
+		'<center><img <<$set_imgh>> src="images/system/2_endings/prison.jpg"></center>'
+		'You spend the rest of you life going in and out of prison, wasting whatever potential you might have had.'
+	end
 
-elseif over = 12:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/over12.jpg"></center>'
-	'Your body is found a few months later by some hunters. No one ever finds out what happened to you.'
+	dynamic 'act ''End?'': gt ''gameover'', ''endscreen'', ''<<$ARGS[1]>>'' '
 
-elseif over = 13:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/fade.jpg"></center>'
-	'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
-	!! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
 
-elseif over = 14:
-	'<center><img <<$set_imgh>> src="images/system/2_endings/prison.jpg"></center>'
-	'You spend the rest of you life going in and out of prison, wasting whatever potential you might have had.'
 end
-act 'End?':gt 'gameover', 'endscreen'
 
 if $ARGS[0] = 'endscreen':
 	showstat 0
@@ -89,7 +103,7 @@ if $ARGS[0] = 'endscreen':
 	cls
 	cla
 !!there is no point having this optional 8, I say just delete this as I reworded the first bit to be more generic for drugs.
-	if over = 8:
+	if $ARGS[1] = '8':
 		*nl & *nl
 		'<center><h1>end</h1></center>'
 		'<center><h1>Special ending - heroin whore!</h1></center>'
@@ -100,15 +114,15 @@ if $ARGS[0] = 'endscreen':
 		'<center><h1>end</h1></center>'
 	end
 
-	act 'Return to main menu':gt 'start'
-	act 'Load a savegame':opengame
-	act 'Load last auto-save':gt 'gameover', 'load_autosave'
+	act 'Return to main menu': gt 'start'
+	act 'Load a savegame': opengame
+	act 'Load last auto-save': gt 'gameover', 'load_autosave'
 end
 
 if $ARGS[0] = 'load_autosave':
-	if mid($start_type,1,4) = 'city':
+	if $start_type['loc'] = 'city':
 		opengame 'autosave_city_<<$week[week]>>.sav'
-	elseif mid($start_type,1,3) = 'uni':
+	elseif $start_type['loc'] = 'uni':
 		opengame 'autosave_uni_<<$week[week]>>.sav'
 	else
 		opengame 'autosave_sg_<<$week[week]>>.sav'

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'main':
 !!	act 'Go to the Principals Office': gt
 
 	if week < 6 and hour >= 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
-		if PCloStyle2 = 4 or Enable_sforma = 1:
+		if PCloStyle2 = 4 or cheatVars['school_clothing'] = 1:
 			if hour = 6:
 				if minut < 30:
 					'It''s too early for school now.'

+ 6 - 6
locations/initg.qsrc

@@ -29,15 +29,15 @@ if $ARGS[0] = 'get_game_set':
 	*nl 'All the game environment variable will be written on the main window in the next step, and you have to copy paste them via the clipboard into a text file, so you could restore it in your next game.'
 	act 'Continue' :
 		*clr & cla
-		'Enable_nogameover = <<Enable_nogameover>>'
+		'cheatVars[''gameover''] = <<cheatVars[''gameover'']>>'
 		'music_on = <<music_on>>'
 		'music_loop = <<music_loop>>'
 		'disable_autosave = <<disable_autosave>>'
-		'autohairbrush = <<autohairbrush>>'
-		'enfullmorrout = <<enfullmorrout>>'
-		'cyccustom = <<cyccustom>>'
-		'cheatKlisma = <<cheatKlisma>>'
-		'editpornname = <<editpornname>>'
+		'cheatVars[''auto_brush''] = <<cheatVars[''auto_brush'']>>'
+		'cheatVars[''full_morning_rout''] = <<cheatVars[''full_morning_rout'']>>'
+		'cheatVars[''track_period''] = <<cheatVars[''track_period'']>>'
+		'cheatVars[''enema''] = <<cheatVars[''enema'']>>'
+		'cheatVars[''rename_porn''] = <<cheatVars[''rename_porn'']>>'
 		'difficulty = <<difficulty>>'
 
 		'usePopUps = <<usePopUps>>'

+ 0 - 1
locations/intro_city_select.qsrc

@@ -1626,7 +1626,6 @@ elseif $ARGS[0] = 'slut':
 		!!----- TRIATS -----!!
 		pcs_traits['commando_lvl'] = 2
 		pcs_traits['cumeater'] = 1
-		!		cumeater_cheat = 1		& !Still needed??
 
 		!!----- SEX STATS -----!!
 		pcs_exhib = 40

+ 4 - 2
locations/intro_initialization.qsrc

@@ -174,10 +174,12 @@ else
 end
 
 if difficulty = 4:
-	cyccustom = 0
+	cheatVars['track_period'] = 0
 else
-	cyccustom = 1
+	cheatVars['track_period'] = 1
 end
+cheatVars['enema'] = 1
+cheatVars['auto_tampons'] = 1
 
 !! give everyone some shampoo
 mc_inventory['shampoo'] +=  10

+ 4 - 2
locations/intro_initialization_city.qsrc

@@ -185,10 +185,12 @@ else
 end
 
 if difficulty = 4:
-	cyccustom = 0
+	cheatVars['track_period'] = 0
 else
-	cyccustom = 1
+	cheatVars['track_period'] = 1
 end
+cheatVars['enema'] = 1
+cheatVars['auto_tampons'] = 1
 
 !! give everyone some shampoo
 mc_inventory['shampoo'] +=  10

+ 0 - 1
locations/intro_sg_select.qsrc

@@ -1914,7 +1914,6 @@ elseif $ARGS[0] = 'slut':
 		!!----- TRIATS -----!!
 		pcs_traits['commando_lvl'] = 2
 		pcs_traits['cumeater'] = 1
-	!	cumeater_cheat = 1		& !is this still needed??
 
 		!!----- SEX STATS -----!!
 		pcs_exhib += 40

+ 15 - 13
locations/journal_work.qsrc

@@ -28,16 +28,19 @@ if $ARGS[0] = 'start':
 	if arrsize('evt_event') ! 0: gs 'emp_functions', 'disp_evt', 2
 	
 	if workPTU > 2: 'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
-	if (work = 1 or cheatWork = 1) and workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between 11:00 and 12:00. Your wages are received on the 25th of each month, but you can earn tips from customers.'
-	if (work = 1 or cheatWork = 1) and workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between 09:00 and 10:00. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by 09:00. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and tanwork > 0: 'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 16:00 Monday to Friday. Your salary is paid once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. Your salary is paid once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. Your salary is paid once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and workFabrika = 1: 'You work as a seamstress in the factory in Pavlovsk. You work every week day and your salary is automatically transferred on the 25th of each month.'
-	!!if (work = 1 or cheatWork = 1) and TourGuide = 1: 'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b>.'
+	if work = 1 or cheatVars['work'] = 1:
+		if workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between 11:00 and 12:00. Your wages are received on the 25th of each month, but you can earn tips from customers.'
+		if workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
+		if worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between 09:00 and 10:00. Salary is automatically transferred on the 25th of each month.'
+		if workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by 09:00. Salary is automatically transferred on the 25th of each month.'
+		if tanwork > 0: 'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
+		if young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 16:00 Monday to Friday. Your salary is paid once a week on Fridays.'
+		if young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. Your salary is paid once a week on Fridays.'
+		if young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. Your salary is paid once a week on Fridays.'
+		if workFabrika = 1: 'You work as a seamstress in the factory in Pavlovsk. You work every week day and your salary is automatically transferred on the 25th of each month.'
+		if gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
+!!		if TourGuide = 1: 'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b>.'
+	end
 	if workrin = 1: 'You are working in Arthur''s tent at the market as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:
 		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
@@ -45,11 +48,10 @@ if $ARGS[0] = 'start':
 		'You can find out more about becoming a maid at the Pavlovsk hotel if you visit the manager between 12:00 and 14:00.'
 	end
 	if postjobQW = 2 or postjobQW = 4: 'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b>.'
-	if (work = 1 or cheatWork = 1) and gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
 	if stripwork >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. No salary as you earn tips.'
 	if stripwork1 >= 1: 'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. No salary as you earn tips.'
-	!!if stripbarwork >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
-	!!if stripbarwork1 >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
+!!	if stripbarwork >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
+!!	if stripbarwork1 >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
 	if film > 0: 'You are working as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4: 'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
 	if bumtolik >= 5: 'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'

+ 1 - 3
locations/kamera.qsrc

@@ -94,9 +94,7 @@ act 'Greet her':
 						gs 'stat'
 						
 						act 'Rudely tell her to get lost':
-							over = 7
-							gt 'gameover'
-							exit
+							gt 'gameover', 'force', 7
 						end
 
 						act 'Kiss her pussy through her panties':

+ 4 - 4
locations/korrPar.qsrc

@@ -145,10 +145,10 @@ end
 
 !! Natasha Belova quest checks
 !!gs 'natbel_init', 'quests'
-if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
-    *nl
-    'You could go to Natasha''s apartment and get her to carry your books to school.'
-    act 'Go to Natasha''s apartment': gt 'natbel_cp_1', 'carrybooks'
+if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or cheatVars['school_clothing'] = 1):
+	*nl
+	'You could go to Natasha''s apartment and get her to carry your books to school.'
+	act 'Go to Natasha''s apartment': gt 'natbel_cp_1', 'carrybooks'
 end
 
 if func('homes_properties', 'is_current_home') = 0:

+ 1 - 1
locations/lact_bp.qsrc

@@ -453,7 +453,7 @@ end
 !!	for manual milk expression in bathrooms etc. please use this function.
 
 if $ARGS[0] = 'massage':
-	if (($location_type ! 'bathroom' and pcs_inhib >= 30) or $location_type = 'bathroom' and mc_inventory['breast_pump'] = 0) and (pcs_horny >= 10 or lactation['active'] > 0) and cheat_NoLactation = 0:
+	if (($location_type ! 'bathroom' and pcs_inhib >= 30) or $location_type = 'bathroom' and mc_inventory['breast_pump'] = 0) and (pcs_horny >= 10 or lactation['active'] > 0) and cheatVars['no_lactation'] = 0:
 		if lactation['active'] > 0 and lactation['pc_aware'] > 0:
 			act 'Milk your breasts': gt 'lact_bp','man_milking'
 		else

+ 2 - 2
locations/love.qsrc

@@ -29,10 +29,10 @@ if $ARGS[0] = 'mother':
 	'<<$loverdesc[lover_number]>> drives you to the home of his parents. You get out and take the elevator. The door opens after only knocking once. It seems clear that they were waiting for you. You enter the apartment and are greeted by an elderly gray-haired woman dressed in trousers and a shirt. You are told to switch into a pair of slippers and are then led down a hallway into another room where the elderly woman invites you to sit down at a table.'
 	'<<$loverdesc[lover_number]>> pulls out a chair for you and you sit down. His mother places herself in front of the two of you. She looks at you with disgust in her eyes, looking like an overgrown insect, clearly thinking you are not a girl for her son. "So, darling, what do you do for a living?"'
 
-	if (work = 1 or cheatWork = 1) and workKafe['job'] = 1:'"I am a waitress in a cafe."'
+	if workKafe['job'] = 1 and (work = 1 or cheatVars['work'] = 1):'"I am a waitress in a cafe."'
 	if func('uniutil', 'student', 'enrolled'):'"I study at the university."'
 	if university['diploma'] > 0:'"I graduated from university."'
-	if work = 0 and cheatWork = 0 and workKafe['job'] ! 1:'"I''m unemployed."'
+	if work = 0 and cheatVars['work'] = 0 and workKafe['job'] ! 1:'"I''m unemployed."'
 
 	if modelfoto_nude > 30:
 		loverrelation[lover_number] = 0

+ 1 - 1
locations/medical_din.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'abortion':
 	!! I am not sure, why is it here this cycle, but I leave it so (rachels)
 	pcs_hydra += 20
 	
-	if broodcurse > 0: over = 13 & gt'gameover'
+	if broodcurse > 0: gt 'gameover', 'force', 13
 elseif $ARGS[0] = 'remove_preg':
 	pregtime = 0
 	pregtalk = 0

+ 2 - 2
locations/mirror.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 		end
 		! ----- hair
 
-		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
+		if cheatVars['auto_brush'] = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
 		!!!!!!!! Maruda Hair Mod
 		if mc_inventory['scrunchies'] < 1:hscrunchw = 0
@@ -242,7 +242,7 @@ if $ARGS[0] = 'start':
 			if dyefade = 0: '<br>Your hair dye has faded and looks terrible.'
 		end
 
-		if autohairbrush = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
+		if cheatVars['auto_brush'] = 1 and pcs_hairbsh = 0 : xgt 'mirror', 'brush'
 
 		!!!!!!!! Maruda Hair Mod
 		if mc_inventory['scrunchies'] < 1:hscrunchw = 0

+ 2 - 2
locations/nichApartment.qsrc

@@ -449,7 +449,7 @@ if $ARGS[0] = 'agreed_to_job':
 			'You promise her to do so before putting your clothes back on.'
 		end
 		act 'Leave the apartment':gt 'city_center'
-	elseif (work = 0 or cheatWork = 0) and $clothingworntype = 'gm_maid':
+	elseif (work = 0 or cheatVars['work'] = 0) and $clothingworntype = 'gm_maid':
 		'When Tanya opens the door she takes a few seconds to admire your look. "Wow, <<$pcs_nickname>>, this uniform really suits you. How does it feel?"'
 		act 'Great':
 			cla
@@ -471,7 +471,7 @@ if $ARGS[0] = 'agreed_to_job':
 		'Tanya looks a little bit disappointed but then she smirks at you. "Oh, I understand. You are wearing this outfit for me and not for my parents."'
 		'Not giving you a chance to say a word, she leads you to her room and pushes you on her bed.'
 		act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
-	elseif (work = 0 or cheatWork = 0):
+	elseif (work = 0 or cheatVars['work'] = 0):
 		'When Tanya opens the door she looks a little be disappointed.'
 		'"<<$pcs_nickname>>, I told you that you need to wear a maid uniform when you meet my parents. Remember?"'
 		'She bites down on her lip. "But since you are here we could have some fun as well."'

+ 2 - 2
locations/nichTanya.qsrc

@@ -1955,7 +1955,7 @@ if $ARGS[0] = 'hire':
 	nichWork = 1
 	'Her offer sounds too good to be true: Living with her, here, in this huge luxury apartment, right in the city center? And big paycheck every month for basically doing nothing? You know your answer immediately: "Okay."'
 	'"Okay?", she asks, making sure she didn''t misunderstand.'
-	if work = 1 and cheatWork = 0:
+	if work = 1 and cheatVars['work'] = 0:
 		'"Yes, I''ll take your offer... but I have to go and quit my current job first."'
 	else
 		'"Yes, I''ll take your offer. If your stepfather wants to hire m-" You are cut off by Tanya''s fierce hug and kiss.'
@@ -1967,7 +1967,7 @@ if $ARGS[0] = 'hire':
 	'"Where would I get a maid uniform?"'
 	'"I think they sell them at G&M. One of their shops is at the mall nearby. But make sure you don''t buy an outfit that''s too skimpy. Nicholas wouldn''t mind but my mother surely would."'
 
-	if hour <= 21 and (work = 0 or cheatWork = 1):
+	if hour <= 21 and (work = 0 or cheatVars['work'] = 1):
 		'"Actually we could go shopping for a uniform right now. The mall is still open and we would even make it back in time to present you to my parents. What do you say?"'
 
 		act 'Go shopping together':

+ 5 - 5
locations/nichTaras.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'abdIntro':
 		act 'Call for help':
 			'You scream for help as loud as you possibly can. Nothing happens. Did anybody hear you at all?'
 		end
-		if pcs_sleep <= 40 or cheatNoSleep ! 0:
+		if pcs_sleep <= 40 or cheatVars['sleep'] ! 0:
 			act 'Try to sleep':
 				nichAbdStage = 20
 				gt 'nichTaras','abdIntro'
@@ -307,7 +307,7 @@ elseif $ARGS[0] = 'dungeon':
 		if $ARGS[2] = '':
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeonBed.jpg"></center>'
 			'You crawl over to the bed. Being tied up you have a hard time climbing on the mattress. It isn''t very comfortable but still better than the cold ground.'
-			if pcs_sleep < 80 or cheatNoSleep ! 0:
+			if pcs_sleep < 80 or cheatVars['sleep'] ! 0:
 				act 'Sleep':
 					gt 'nichTaras','dungeon', 'bed', 'sleep'
 				end
@@ -337,7 +337,7 @@ elseif $ARGS[0] = 'dungeon':
 				minut += 240
 				pcs_sleep = min(100 , pcs_sleep + 60)
 				gs 'stat'
-				if pcs_sleep < 80 or cheatNoSleep ! 0:
+				if pcs_sleep < 80 or cheatVars['sleep'] ! 0:
 					act 'Sleep':
 						gt 'nichTaras','dungeon', 'bed', 'sleep'
 					end
@@ -477,7 +477,7 @@ elseif $ARGS[0] = 'session':
 				minut += 60
 				gs 'stat'
 			end
-			if pcs_sleep < 80 or cheatNoSleep ! 0:
+			if pcs_sleep < 80 or cheatVars['sleep'] ! 0:
 				act 'Sleep':
 					nichTarasSessionStage = 11
 					gt 'nichTaras','session'
@@ -546,7 +546,7 @@ elseif $ARGS[0] = 'session':
 						minut += 60
 						gs 'stat'
 					end
-					if pcs_sleep < 80 or cheatNoSleep ! 0:
+					if pcs_sleep < 80 or cheatVars['sleep'] ! 0:
 						act 'Sleep':
 							nichTarasSessionStage = 21
 							gt 'nichTaras','session'

+ 2 - 2
locations/obj_din.qsrc

@@ -2241,13 +2241,13 @@ if $ARGS[0] = 'old':
 	killobj
 	oldobjmenu = 1
 	addobj '<center>Refresh</center>'
-	if cheatConsole = 0: addobj '<center>Console</center>'
+	if cheatVars['console'] = 0: addobj '<center>Console</center>'
 	addobj '<center>Toggle Debug Variables</center>'
 	addobj '<center>Add Debug Variable</center>'
 	addobj '<center>Delete Debug Variable</center>'
 	addobj '<center>Switch HTML</center>'
 	addobj '<center>Toggle Call Trace</center>'
-	if cheatTime = 1:
+	if cheatVars['time'] = 1:
 		addobj '<center>-1 Hour</center>'
 		addobj '<center>+1 Hour</center>'
 	end

+ 2 - 2
locations/park_walkevents.qsrc

@@ -1046,7 +1046,7 @@ if $ARGS[0] = 'run':
 							gs 'exercise', 'tier2', 30, 'run'
 						end
 						daybegskver = daystart
-						if rand(1,25) < 8 and cheat_street_rapists ! 1:
+						if rand(0, 24) < 7 and cheatVars['random_rapists'] ! 1:
 							!! if rand(1,3) = 1: gangrape, else single rapist
 							!! not added yet because don''t have single rapist event written yet
 							$temp['rape_type'] = 'gang'
@@ -1080,7 +1080,7 @@ if $ARGS[0] = 'run':
 							end
 							'Halfway through your run, you pull up your top and expose your breasts. The cool night air against your warm skin causes you to shiver and almost immediately your nipples start to harden.'
 							*nl
-							if rand(1,25) < 8 and cheat_street_rapists ! 1:
+							if rand(0, 24) < 7 and cheatVars['random_rapists'] ! 1:
 								act'Continue':
 									!! if rand(1,3) = 1: gangrape, else single rapist
 									!! not added yet because don''t have single rapist event written yet

+ 1 - 1
locations/pav_hotel.qsrc

@@ -1071,7 +1071,7 @@ if $ARGS[0] = 'PregBDSM' :
 									abortionbirthdate = daystart
 									unintendedabort = 1
 									knowpregloss = 2
-									if broodcurse > 0: over = 13 & gt'gameover'									
+									if broodcurse > 0: gt 'gameover', 'force', 13
 									gs 'stat'
 									act 'Wait for the doctor':
 										*clr & cla

+ 2 - 2
locations/pav_park.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'start':
 	gs 'music_actions', 'music_icon'
 
 	if month >= 6 and month <=8:
-		if (emp_job_status[1] = 0  or emp_job_status[1] = 4) and (work = 0 or cheatWork = 1):
+		if (emp_job_status[1] = 0  or emp_job_status[1] = 4) and (work = 0 or cheatVars['work'] = 1):
 			if hour >= 8 and hour <= 18:
 				act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
 			end
@@ -495,7 +495,7 @@ end
 
 if mc_inventory['joints'] > 0 and drugVars['weed_high'] = 0: act 'Smoke a joint': minut += 10 & gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatNoSleep ! 0):
+if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatVars['sleep'] ! 0):
 	!! Will add a call that will tell if the player has a place to stay at in a given town/city.
 	pavlovsk_home = func('homes_properties', 'has_access', 'shared_apartment') or func('homes_properties', 'has_access', 'meynold_household') or func('homes_properties', 'has_access', 'parents_home') or func('homes_properties', 'has_access', 'lyceum_dorm')
 	if pavlovsk_home = 0 and workPTU <= 2 and HotelRoom < 1:

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -208,7 +208,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
-	if NatbelQW['QWstage'] >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
+	if NatbelQW['QWstage'] >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or cheatVars['school_clothing'] = 1):
 		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
 	end
 	

+ 2 - 2
locations/pornstudio.qsrc

@@ -1071,12 +1071,12 @@ if $ARGS[0] = 'postvideo':
 			$pornfilmstory[film] = '<<$pfname>>''s debut into the world of porn. Watch as she jerks silver fox Egor Kluyev off and ends up with his cum all over her '+iif(age < 20,'teen','')+' tits.'
 		end
 	else
-		if $pstory = '' and editpornname = 1:
+		if $pstory = '' and cheatVars['rename_porn'] = 1:
 			$pornfilmstory[film] = input('You can enter the story for the film. This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
 		else
 			$pornfilmstory[film] = $pstory
 		end
-		if editpornname = 1:
+		if cheatVars['rename_porn'] = 1:
 			$porntitle[film] = input("Enter the name of the film. <i>This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
 		end
 	end

+ 1 - 1
locations/prostitution_functions.qsrc

@@ -1034,7 +1034,7 @@ if $ARGS[0] = 'abortion':
 
 	pcs_hydra += 20
 
-	if broodcurse > 0: over = 13 & gt'gameover'
+	if broodcurse > 0: gt 'gameover', 'force', 13
 end
 
 !!---------- Random Name -----------------------------------------------------------------------------------------

+ 85 - 36
locations/saveupdater.qsrc

@@ -2902,43 +2902,92 @@ if temp_current_save_version < 00090204:
 	killvar 'dynamicCommand'
 	killvar 'bomzstartqwestdi'
 	killvar 'workbomzdi'
-	$cheatWork = ''
-	$cheatWillpower = ''
-	$cheatHapri = ''
-	$no_cum_leak = ''
-	$cyccustom = ''
-	$cheatKlisma = ''
-	$cheatNomakeup = ''
-	$cheatNoSweat = ''
-	$cheatNoEat = ''
-	$cheatNoDrink = ''
-	$cheatNoSleep = ''
-	$cheatNoMood = ''
-	$cheatNoFat = ''
-	$bodyVars['cheat_staticAssets_text'] = ''
-	$cheatHealth = ''
-	$cheatPee = ''
-	$drugVars['cheat_immune_text'] = ''
-	$InfWillpwer = ''
-	$cheatSlut = ''
-	$cheatHorny = ''
-	$sleepVars['cheatVib'] = ''
-	$fight_cheat = ''
-	$autocombat_cheat = ''
-	$cheat_NoPregnancy = ''
-	$cheat_NoLactation = ''
-	$cheatBimbo = ''
-	$cheatBimbo2 = ''
-	$cheatBimbo3 = ''
-	$cheatcumtrait = ''
-	$cheatexhib = ''
-	$cheataddictive = ''
-	$cheatConsole = ''
-	$cheatTime = ''
-	$random_bf_gf_cheat = ''
-	$cheat_street_robbers = ''
-	$cheat_street_rapists = ''
 
+
+	if bodyVars['cheat_staticAssets'] ! 0:
+		cheatVars['body_staticAssets'] = bodyVars['cheat_staticAssets']
+		gs 'shortgs', 'remove_array_element', '$bodyVars', 'cheat_staticAssets'
+	end
+	gs 'shortgs', 'remove_array_element', '$bodyVars', 'cheat_staticAssets_text'
+
+	if drugVars['cheat_immune'] ! 0:
+		cheatVars['drugs_immune'] = drugVars['cheat_immune']
+		gs 'shortgs', 'remove_array_element', '$drugVars', 'cheat_immune'
+	end
+	gs 'shortgs', 'remove_array_element', '$drugVars', 'cheat_immune_text'
+
+	if sleepVars['cheatVib'] ! 0:	cheatVars['sleep_vib']	= sleepVars['cheatVib']
+	gs 'shortgs', 'remove_array_element', '$sleepVars', 'cheatVib'
+
+	if sleepVars['cheat_nodream_chance'] ! 0:	cheatVars['no_dream_chance']	= sleepVars['cheat_nodream_chance']
+	gs 'shortgs', 'remove_array_element', '$sleepVars', 'cheat_nodream_chance'
+
+
+
+	if cheatConsole				! 0 or $cheatConsole			! '':		cheatVars['console']			= cheatConsole				& killvar 'cheatConsole'
+	if cheatwork				! 0 or $cheatwork				! '':		cheatVars['work']				= cheatwork					& killvar 'cheatwork'
+	if cheatWillpower			! 0 or $cheatWillpower			! '':		cheatVars['willpower']			= cheatWillpower			& killvar 'cheatWillpower'
+	if InfWillpwer				! 0 or $InfWillpwer				! '':		cheatVars['inf_willpower']		= InfWillpwer				& killvar 'InfWillpwer'
+	if cheatHapri				! 0 or $cheatHapri				! '':		cheatVars['always_brushed']		= cheatHapri				& killvar 'cheatHapri'
+	if autohairbrush			! 0 or $autohairbrush			! '':		cheatVars['auto_brush']			= autohairbrush				& killvar 'autohairbrush'
+	if no_cum_leak				! 0 or $no_cum_leak				! '':		cheatVars['no_cum_leak']		= no_cum_leak				& killvar 'no_cum_leak'
+	if cyccustom				! 0 or $cyccustom				! '':		cheatVars['track_period']		= cyccustomkillvar			& killvar 'cyccustom'
+	if cheatNomakeup			! 0 or $cheatNomakeup			! '':		cheatVars['makeup_smear']		= cheatNomakeup				& killvar 'cheatNomakeup'
+	if cheatNoSweat				! 0 or $cheatNoSweat			! '':		cheatVars['no_sweat']			= cheatNoSweat				& killvar 'cheatNoSweat'
+	if cheatNoEat				! 0 or $cheatNoEat				! '':		cheatVars['hunger']				= cheatNoEat				& killvar 'cheatNoEat'
+	if cheatNoDrink				! 0 or $cheatNoDrink			! '':		cheatVars['thirst']				= cheatNoDrink				& killvar 'cheatNoDrink'
+	if cheatNoSleep				! 0 or $cheatNoSleep			! '':		cheatVars['sleep']				= cheatNoSleep				& killvar 'cheatNoSleep'
+	if cheatNoMood				! 0 or $cheatNoMood				! '':		cheatVars['mood']				= cheatNoMood				& killvar 'cheatNoMood'
+	if cheatNoFat				! 0 or $cheatNoFat				! '':		cheatVars['fat']				= cheatNoFat				& killvar 'cheatNoFat'
+	if cheatHealth				! 0 or $cheatHealth				! '':		cheatVars['std']				= cheatHealth				& killvar 'cheatHealth'
+	if cheatPee					! 0 or $cheatPee				! '':		cheatVars['pee']				= cheatPee					& killvar 'cheatPee'
+	if cheatSlut				! 0 or $cheatSlut				! '':		cheatVars['no_periods']			= cheatSlut					& killvar 'cheatSlut'
+	if cheatHorny				! 0 or $cheatHorny				! '':		cheatVars['always_horny']		= cheatHorny				& killvar 'cheatHorny'
+	if fight_cheat				! 0 or $fight_cheat				! '':		cheatVars['win_fights']			= fight_cheat				& killvar 'fight_cheat'
+	if autocombat_cheat			! 0 or $autocombat_cheat		! '':		cheatVars['auto_combat']		= autocombat_cheat			& killvar 'autocombat_cheat'
+	if cheat_NoPregnancy		! 0 or $cheat_NoPregnancy		! '':		cheatVars['no_pregnancy']		= cheat_NoPregnancy			& killvar 'cheat_NoPregnancy'
+	if pregspeedcheat			! 0 or $pregspeedcheat			! '':		cheatVars['preg_speed']			= pregspeedcheat			& killvar 'pregspeedcheat'
+	if cheat_NoLactation		! 0 or $cheat_NoLactation		! '':		cheatVars['no_lactation']		= cheat_NoLactation			& killvar 'cheat_NoLactation'
+	if cheatBimbo				! 0 or $cheatBimbo				! '':		cheatVars['bimbo']				= cheatBimbo				& killvar 'cheatBimbo'
+	if cheatBimbo2				! 0 or $cheatBimbo2				! '':		cheatVars['smart_bimbo']		= cheatBimbo2				& killvar 'cheatBimbo2'
+	if cheatBimbo3				! 0 or $cheatBimbo3				! '':		cheatVars['suc_bimbo']			= cheatBimbo3				& killvar 'cheatBimbo3'
+	if cheatTime				! 0 or $cheatTime				! '':		cheatVars['time']				= cheatTime					& killvar 'cheatTime'
+	if random_bf_gf_cheat		! 0 or $random_bf_gf_cheat		! '':		cheatVars['random_lovers']		= random_bf_gf_cheat		& killvar 'random_bf_gf_cheat'
+	if cheat_street_robbers		! 0 or $cheat_street_robbers	! '':		cheatVars['random_robbers']		= cheat_street_robbers		& killvar 'cheat_street_robbers'
+	if cheat_street_rapists		! 0 or $cheat_street_rapists	! '':		cheatVars['random_rapists']		= cheat_street_rapists		& killvar 'cheat_street_rapists'
+	if Enable_nogameover		! 0 or $Enable_nogameover		! '':		cheatVars['gameover']			= Enable_nogameover			& killvar 'Enable_nogameover'
+	if cheatShaveLegs			! 0 or $cheatShaveLegs			! '':		cheatVars['no_leghair']			= cheatShaveLegs			& killvar 'cheatShaveLegs'
+	if editpornname				! 0 or $editpornname			! '':		cheatVars['rename_porn']		= editpornname				& killvar 'editpornname'
+	if enfullmorrout			! 0 or $enfullmorrout			! '':		cheatVars['full_morning_rout']	= enfullmorrout				& killvar 'enfullmorrout'
+	if Enable_sforma			! 0 or $Enable_sforma			! '':		cheatVars['school_clothing']	= Enable_sforma				& killvar 'Enable_sforma'
+	if therapist_weekly_cheat	! 0 or $therapist_weekly_cheat	! '':		cheatVars['therapist_schedule']	= therapist_weekly_cheat	& killvar 'therapist_weekly_cheat'
+
+
+	if addictive_cheat	! 0 or $addictive_cheat		! '' or cheataddictive	! '':
+		cheatVars['no_trait_addictive']	= addictive_cheat
+		killvar 'addictive_cheat'
+		killvar 'cheataddictive'
+	end
+	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or cheatcumtrait	! '':
+		cheatVars['no_trait_cumeater']	= cumeater_cheat
+		killvar 'cumeater_cheat'
+		killvar 'cheatcumtrait'
+	end
+	if exhib_cheat		! 0 or $exhib_cheat			! '' or cheatexhib		! '':
+		cheatVars['no_trait_exhib']		= exhib_cheat
+		killvar 'exhib_cheat'
+		killvar 'cheatexhib'
+	end
+
+
+	if $cheatKlisma ! '':
+		if cheatKlisma = 0: cheatVars['enema'] = 1
+		killvar 'cheatKlisma'
+	end
+	if $Enable_auto_tampons ! '':
+		if Enable_auto_tampons = 0: cheatVars['auto_tampons'] = 1
+		killvar 'Enable_auto_tampons'
+	end
 end
 
 

+ 6 - 3
locations/sentence.qsrc

@@ -624,10 +624,13 @@ if $ARGS[0] = 'police_arrest3':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/judge.jpg"></center>'
-	if policeQW['arrest_court'] = 1:
-		'You are taken out of holding and over to the courthouse to await your hearing. The judge reviews your case, "It seems you believe you are above the law, I assure you, you are not. I sentence you to one year in prison." You break down into tears as you are hauled away to serve your time.'
-		act 'Continue': over = 14 & gt 'gameover'
+	'You are taken out of holding and over to the courthouse to await your hearing. The judge reviews your case, "It seems you believe you are above the law, I assure you, you are not. I sentence you to one year in prison." You break down into tears as you are hauled away to serve your time.'
+	act 'Continue':
+		gs 'gameover', 'check', 14
+		msg '<font color=red><B>You should thrown in jail, but Cheat Mode keeps you Free.</B></font>'
 		!!can we make this in big red letters and then it is a game over not sure how to code that.
+		policeQW['arrest_gameover_flag'] = 0
+		gt $loc, $loc_arg
 	end
 end
 

+ 26 - 47
locations/stat.qsrc

@@ -38,9 +38,9 @@ if $start_type[1] ! 'nomagic': magik_exp = orgasm + magik_adj
 
 if insleep = 0: gs 'stat_sklattrib'
 
-if cheatHealth = 1: dynamic $cheatmenu['std_cure']
+if cheatVars['std'] = 1: dynamic $cheatmenu['std_cure']
 
-if InfWillpwer = 1: pcs_willpwr = willpowermax
+if cheatVars['inf_willpower'] = 1: pcs_willpwr = willpowermax
 
 if stat['vaginal'] = 0 and stat['vaginal_fist'] = 0 and stat['vaginal_dildo'] = 0 and stat['vaginal_strap'] = 0:
 	stat['think_virgin'] = 1
@@ -71,25 +71,19 @@ if cosmetic_tattoo > 0:
 end
 
 !!!CHEATS!!!
-if cheatWork = 1:work = 0
-if cheatWorkKiskis = 1:young_shop_miss = 0
-if cheatHapri = 1:pcs_hairbsh = 1
+if cheatVars['work'] = 1: work = 0
+if cheatWorkKiskis = 1: young_shop_miss = 0
+if cheatVars['always_brushed'] = 1: pcs_hairbsh = 1
 ! Moved from cheats to settings under 'Enema realism'
-if cheatKlisma = 0:klismaday = daystart & klismaday1 = 1
-if cheatNomakeup = 1 and cosmetic_tattoo = 0:
-	if pcs_makeup = 0: pcs_makeup = 1
-end
-if cheatNoSweat = 1 and pcs_sweat > 0: pcs_sweat = 0
-if cheatNoEat = 1:
-	if pcs_energy < 60: pcs_energy = 60
-end
-if cheatShaveLegs = 1:
+if cheatVars['enema'] = 1: klismaday = daystart & klismaday1 = 1
+if cheatVars['makeup_smear'] = 1 and cosmetic_tattoo = 0 and pcs_makeup = 0: pcs_makeup = 1
+if cheatVars['no_sweat'] = 1 and pcs_sweat > 0: pcs_sweat = 0
+if cheatVars['hunger'] = 1 and pcs_energy < 60: pcs_energy = 60
+if cheatVars['no_leghair'] = 1:
 	if pcs_leghair > 0: pcs_leghair = 0
 end
-if cheatNoDrink = 1:
-	if pcs_hydra < 60: pcs_hydra = 60
-end
-if cheatNoSleep = 1:
+if cheatVars['thirst'] = 1 and pcs_hydra < 60: pcs_hydra = 60
+if cheatVars['sleep'] = 1:
 	if pcs_sleep < 35: pcs_sleep = 35
 end
 
@@ -126,7 +120,7 @@ if pcs_vag > 36: pcs_vag = 36
 if pcs_throat > 36: pcs_throat = 36
 if pcs_ass > 36: pcs_ass = 36
 
-if cheatSlut = 1 or succubusflag = 1:
+if cheatVars['no_periods'] = 1 or succubusflag = 1:
 	!!Succubus cannot get pregnant
 	mesec = 0
 	FocH = 0
@@ -149,7 +143,7 @@ if succubusflag = 1 and succublvl > 2 and rape > rape_count:
 	pcs_mood = 100
 end
 
-if pcs_horny < 50 and cheatHorny = 1: pcs_horny = 50
+if pcs_horny < 50 and cheatVars['always_horny'] = 1: pcs_horny = 50
 
 manamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 
@@ -681,7 +675,7 @@ end
 if succubusflag = 1:
 	if pcs_energy < 0:
 		if fat >= 1:
-			if cheatNoFat = 0: fat -= 2
+			if cheatVars['fat'] = 0: fat -= 2
 			pcs_energy += 8 + succublvl
 		else
 			pcs_energy += 8 + succublvl
@@ -713,16 +707,11 @@ if pcs_energy < 0:
 		vital_deg -= 1
 		pcs_energy += 8
 	elseif pcs_mass['body'] = 0 and pcs_stren + pcs_vital <= 0:
-		if Enable_nogameover = 0 :
-			over = 3
-			if $loc ! 'gameover': gt 'gameover'
-			exit
-		else
-			$stat_msg += '<BR><font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
-			fat = 1
-		end
+		gs 'gameover', 'check', 3
+		$stat_msg += '<br><font color=red><b>You starved to death, but Cheat Mode keeps you Alive.</b></font>'
+		fat = 1
 	elseif pcs_mass['body'] > 0:
-		if cheatNoFat = 0: fat -= 1
+		if cheatVars['fat'] = 0: fat -= 1
 		pcs_energy += 8
 	end
 end
@@ -741,27 +730,17 @@ if pcs_mood <= 0:
 end
 
 if pcs_health < 0:
-	if Enable_nogameover = 0 :
-		over = 1
-		if $loc ! 'gameover': gt 'gameover'
-		exit & !nogameover by illume
-	else
-		$stat_msg += '<BR><font color=red><B>You died from injuries, but Cheat Mode keeps you Alive.</B></font>'
-		pcs_health = 0
-	end
+	gs 'gameover', 'check', 1
+	$stat_msg += '<br><font color=red><b>You died from injuries, but Cheat Mode keeps you Alive.</b></font>'
+	pcs_health = 0
 end
 
 if pcs_willpwr <= 0 :
 	!this will set willpower to 0 correctly; then check mana =1 for insane-gameover(pcs_willpwr=0&mana=1).
 	if pcs_mood <= 1:
-		if Enable_nogameover = 0 :
-			over = 2
-			if $loc ! 'gameover': gt 'gameover'
-			exit & !nogameover by illume
-		else
-			$stat_msg += '<BR><font color=red><B>You are insane, but Cheat Mode keeps you Alive.</B></font>'
-			!pcs_mood already checked for >=1 in line 1113 if pcs_mood <= 0, no need to set another one
-		end
+		gs 'gameover', 'check', 2
+		$stat_msg += '<br><font color=red><b>You are insane, but Cheat Mode keeps you Alive.</b></font>'
+		!pcs_mood already checked for >=1 in line 1113 if pcs_mood <= 0, no need to set another one
 	end
 	pcs_willpwr = 0
 end
@@ -839,7 +818,7 @@ if pillcon ! birth_control['old_pillcon'] or pillcon2 ! birth_control['old_pillc
 gs 'cum_manage', 'cum_decay'
 
 !!Mood
-if cheatNoMood = 0:
+if cheatVars['mood'] = 0:
 	maxmood = 100 - moodmodifier
 	if pcs_mood > 100:
 		pcs_mood = 100

+ 112 - 102
locations/stat_display.qsrc

@@ -204,7 +204,7 @@ end
 
 !!---------------- Messages for Icons/Texts (Start)--------------------------
 
-if cheatNoSweat = 0:
+if cheatVars['no_sweat'] = 0:
 	if pcs_sweat < 0:
 		pcs_sweat = 0
 	elseif pcs_sweat > 69:
@@ -792,7 +792,7 @@ if $clothingworntype = 'nude':
 	end
 	$stat_clothes_style = 'nude'
 elseif $clothingworntype = 'danilovich_outfits':
-	if PCloBimbo = 1 and cheatBimbo = 0:
+	if PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You are wearing a gym outfit a bimbo would wear'
 		$stat_clothes_tooltip = 'Bimbo gym outfit.'
@@ -811,16 +811,16 @@ elseif $clothingworntype = 'danilovich_outfits':
 		$stat_clothes_style = 'exercise'
 	end
 elseif PCloswimwear = 1:
-	if (PCloInhibit >= 50 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	if (PCloInhibit >= 50 or PCloThinness = 6) and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist swimsuit a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo swimsuit.'
 		$stat_clothes_style = 'swimsuit_eb'
-	elseif (PCloInhibit >= 50 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 50 or PCloThinness = 6) and (PCloBimbo = 0 or cheatVars['bimbo'] = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist swimsuit.'
 		$stat_clothes_tooltip = 'Exhibitionist swimsuit.'
 		$stat_clothes_style = 'swimsuit_e'
-	elseif PCloBimbo = 1 and cheatBimbo = 0:
+	elseif PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You are wearing a swimsuit a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo swimsuit.'
@@ -843,25 +843,25 @@ elseif PCloswimwear = 1:
 		$stat_clothes_style = 'swimsuit'
 	end
 elseif $clothingworntype = 'gm_office':
-	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
+	if PCloStyle = 4 and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing an office dress a bimbo or a prostitute would wear'
 		$stat_clothes_tooltip = 'Prostitute/Bimbo office dress.'
 		$stat_clothes_style = 'office_pb'
-	elseif PCloStyle = 4 and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif PCloStyle = 4 and (PCloBimbo = 0 or cheatVars['bimbo'] = 1):
 		$stat_clothes_msg = 'You''re wearing an office dress a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute office dress.'
 		$stat_clothes_style = 'office_p'
-	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist office dress a bimbo would wear'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo office office dress.'
 		$stat_clothes_style = 'office_eb'
-	elseif (PCloInhibit >= 40 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and (PCloBimbo = 0 or cheatVars['bimbo'] = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist office dress.'
 		$stat_clothes_tooltip = 'Exhibitionist office dress.'
 		$stat_clothes_style = 'office_e'
-	elseif PCloBimbo = 1 and cheatBimbo = 0:
+	elseif PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You are wearing an office dress a bimbo would wear'
 		$stat_clothes_tooltip = 'Bimbo office dress.'
@@ -884,16 +884,16 @@ elseif $clothingworntype = 'gm_office':
 		$stat_clothes_style = 'office'
 	end
 elseif PCloStyle2 = 4:
-	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
+	if PCloStyle = 4 and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing a school uniform a prostitute or bimbo would wear.'
 		$stat_clothes_tooltip = 'Prostitute/Bimbo school uniform'
 		$stat_clothes_style = 'uniform_pb'
-	elseif PCloStyle = 4 and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif PCloStyle = 4 and (PCloBimbo = 0 or cheatVars['bimbo'] = 1):
 		$stat_clothes_msg = 'You''re wearing a school uniform a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute school uniform.'
 		$stat_clothes_style = 'uniform_p'
-	elseif PCloBimbo = 1 and cheatBimbo = 0:
+	elseif PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You''re wearing a school uniform a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo school uniform.'
@@ -921,7 +921,7 @@ elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = '1':
 	$stat_clothes_msg = 'You are wearing an old hessian sack the hunters gave you.'
 	$stat_clothes_style = 'clothes'
 else
-	if PCloStyle = 4 and PCloBimbo = 1 and cheatBimbo = 0:
+	if PCloStyle = 4 and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, prostitute outfit</font>'
 		$stat_clothes_msg = 'You''re wearing an outfit a bimbo, prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute/Bimbo outfit.'
@@ -930,7 +930,7 @@ else
 		$stat_clothes_msg = 'You''re wearing an outfit a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute outfit.'
 		$stat_clothes_style = 'clothes_p'
-	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo, exhibitionist outfit</font>'
 		$stat_clothes_msg = 'You''re wearing exhibitionist clothes a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo outfit.'
@@ -939,7 +939,7 @@ else
 		$stat_clothes_msg = 'You are wearing exhibitionist clothes.'
 		$stat_clothes_tooltip = 'Exhibitionist outfit.'
 		$stat_clothes_style = 'clothes_e'
-	elseif PCloBimbo = 1 and cheatBimbo = 0:
+	elseif PCloBimbo = 1 and cheatVars['bimbo'] = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are wearing a bimbo outfit</font>'
 		$stat_clothes_msg = 'You are wearing bimbo clothes.'
 		$stat_clothes_tooltip = 'Bimbo outfit.'
@@ -1142,33 +1142,37 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You are feeling a tingling sensation between your legs.''"><img title="You are feeling a bit aroused." height = <<set_siconht>> src="images/system/icons/status/arousal_low.png"></a></td>'
 	end
 
-	if cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 0:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 1 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: mc_inventory[''food_sandwich''] = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! '' and mc_inventory['food_sandwich'] = 1 and menu_off = 1:
-		$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
+	if cheatVars['hunger'] = 0 and $stat_hunger_msg ! '':
+		if mc_inventory['food_sandwich'] = 0:
+			$statusIconBarTab += '<td><a href="exec: msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
+		elseif mc_inventory['food_sandwich'] = 1 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec: mc_inventory[''food_sandwich''] = 0 & pcs_energy += 40 & cumspclnt = 2 & gs ''cum_cleanup'' & fat += 1 & gs ''stat''"><img title="Click to eat your sandwich." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
+		elseif mc_inventory['food_sandwich'] = 1 and menu_off = 1:
+			$statusIconBarTab += '<td><a href="exec: $stat_hunger_msg"><img title="Your sandwich has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_food.png"></a></td>'
+		end
 	end
 
-	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['food_water'] = 0 and mc_inventory['refill_bottle'] < 2:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['refill_bottle'] > 1 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: mc_inventory[''refill_bottle''] -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and mc_inventory['food_water'] > 0 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and (mc_inventory['food_water'] > 0 or mc_inventory['refill_bottle'] > 1) and menu_off = 1:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+	if cheatVars['thirst'] = 0 and $stat_thirst_msg ! '':
+		if mc_inventory['food_water'] = 0 and mc_inventory['refill_bottle'] < 2:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+		elseif mc_inventory['refill_bottle'] > 1 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec: mc_inventory[''refill_bottle''] -= 1 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your refillable water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+		elseif mc_inventory['food_water'] > 0 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec: bottle = 0 & pcs_hydra += 100 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat''"><img title="Click to drink from your water bottle." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+		elseif (mc_inventory['food_water'] > 0 or mc_inventory['refill_bottle'] > 1) and menu_off = 1:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="Your water bottle has to wait until you can spare a minute." height = <<set_siconht>> src="images/system/icons/status/need_drink.png"></a></td>'
+		end
 	end
 
-	if cheatNoSleep= 0 and $stat_sleep_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_sleep.png"></a></td>'
+	if cheatVars['sleep'] = 0 and $stat_sleep_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/need_sleep.png"></a></td>'
 
 	$statusIconBarTab += '</tr><tr>'
 
 	!!Row 3: Pregnancy, cum, lactation, STD...
 
-	if menu_off = 0 and cheatSlut = 0:
+	if menu_off = 0 and cheatVars['no_periods'] = 0:
 		$statusIconBarTab += '<td><a href="exec:dynamic $d_cycreport_choice"><img title="Click to open the cycle menu." height = <<set_siconht>> src="images/system/icons/status/vagina.png"></a></td>'
-	elseif menu_off = 1 and cheatSlut = 0:
+	elseif menu_off = 1 and cheatVars['no_periods'] = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/vagina.png"></a></td>'
 	end
 	
@@ -1194,7 +1198,7 @@ if cheatStatusIcons = 0:
 !!TMI				elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
 !!pregnancy spoiler		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
 !!				$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vunknown.png"></a></td>'
-	elseif thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
+	elseif thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatVars['no_periods'] = 0 and mesec = 0:
 		if abortionbirthdate = 0 and daystart - daylastperiod > 28:
 			if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
 				$stat_bleed_msg = 'Your period is late by <<daystart - daylastperiod - 28>> days.'
@@ -1254,20 +1258,24 @@ if cheatStatusIcons = 0:
 
 	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = <<set_siconht>> src="images/system/icons/status/visible_cum.png"></a></td>'
 
-	if stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-	elseif stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 1:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-	elseif stat_cumloc_check = 2 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+	if pcs_traits['cumeater'] = 1 and cheatVars['no_trait_cumeater'] = 0:
+		if stat_cumloc_check = 1 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+		elseif stat_cumloc_check = 1 and menu_off = 1:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+		elseif stat_cumloc_check = 2:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+		end
 	end
 
-	if stat_cumloc_check = 1 and mc_inventory['makeup_wipes'] > 0 and menu_off = 0:
-		$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-	elseif stat_cumloc_check = 1 and mc_inventory['makeup_wipes'] > 0 and menu_off = 1:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-	elseif stat_cumloc_check = 2 and mc_inventory['makeup_wipes'] > 0:
-		$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+	if mc_inventory['makeup_wipes'] > 0:
+		if stat_cumloc_check = 1 and menu_off = 0:
+			$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+		elseif stat_cumloc_check = 1 and menu_off = 1:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+		elseif stat_cumloc_check = 2:
+			$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
+		end
 	end
 
 	stat_STD_count = 0
@@ -1460,13 +1468,13 @@ if cheatStatusIcons = 0:
 	!!Row 5: Drugs and other short term stuff
 
 	if mc_inventory['cigarettes'] > 0:
-		$stat_smoker_msg = 'You have <<mc_inventory[''cigarettes'']>> cigarette' + iif(mc_inventory['cigarettes'] = 1, '', 's') + iif(drugVars['cigarettes_need'] > 0 and drugVars['cheat_immune'] = 0, ' and you want to smoke.' , '.')
+		$stat_smoker_msg = 'You have <<mc_inventory[''cigarettes'']>> cigarette' + iif(mc_inventory['cigarettes'] = 1, '', 's') + iif(drugVars['cigarettes_need'] > 0 and cheatVars['drugs_immune'] = 0, ' and you want to smoke.' , '.')
 		$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = <<set_siconht>> src="images/system/icons/status/cigarettes.png"></a></td>'
 	end
 
-	if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] > 0:
+	if drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="You really need to smoke, click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
-	elseif drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] <= 0:
+	elseif drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0 and drugVars['cigarettes_need'] > 20 and mc_inventory['cigarettes'] <= 0:
 		$statusIconBarTab += '<td><a href="exec:msg ''You really need to smoke, but you have no cigarettes.''"><img title="You really need to smoke, but you have no cigarettes." height = <<set_siconht>> src="images/system/icons/status/craving_nicotine.png"></a></td>'
 	elseif mc_inventory['cigarettes'] > 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="Click to smoke a cigarette." height = <<set_siconht>> src="images/system/icons/status/smoke_cigarette.png"></a></td>'
@@ -1543,9 +1551,9 @@ if enable_show_status = 0:
 	if ETOmenu = 1:
 		$stat_extra_msg += '<BR><b><<$pcs_health>></b>'
 		$stat_extra_msg += '<BR><b><<$pcs_willpwr>></b>'
-		if cheatNoEat = 0: $stat_extra_msg += '<BR><b><<$pcs_energy>></b>'
-		if cheatNoDrink = 0: $stat_extra_msg += '<BR><b><<$pcs_hydra>></b>'
-		if cheatNoSleep = 0: $stat_extra_msg += '<BR><b><<$pcs_sleep>></b>'
+		if cheatVars['hunger'] = 0: $stat_extra_msg += '<BR><b><<$pcs_energy>></b>'
+		if cheatVars['thirst'] = 0: $stat_extra_msg += '<BR><b><<$pcs_hydra>></b>'
+		if cheatVars['sleep'] = 0: $stat_extra_msg += '<BR><b><<$pcs_sleep>></b>'
 	elseif Enable_scalepic = 0:
 		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="200">'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 2, pcs_horny, pcs_horny)+'</TD><TD>&nbsp;Arousal</TD></TR>'
@@ -1555,9 +1563,9 @@ if enable_show_status = 0:
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD>&nbsp;Willpower</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD>&nbsp;Stamina</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_mood, pcs_mood)+'</TD><TD>&nbsp;Mood</TD></TR>'
-		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_energy, pcs_energy)+'</TD><TD>&nbsp;Hunger</TD></TR>'
-		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_hydra, pcs_hydra)+'</TD><TD>&nbsp;Thirst</TD></TR>'
-		if cheatNoSleep = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_sleep, pcs_sleep)+'</TD><TD>&nbsp;Sleep</TD></TR>'
+		if cheatVars['hunger'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_energy, pcs_energy)+'</TD><TD>&nbsp;Hunger</TD></TR>'
+		if cheatVars['thirst'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_hydra, pcs_hydra)+'</TD><TD>&nbsp;Thirst</TD></TR>'
+		if cheatVars['sleep'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_sleep, pcs_sleep)+'</TD><TD>&nbsp;Sleep</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
 	else
 		gs 'indik', '2', pcs_horny, pcs_horny
@@ -1583,17 +1591,17 @@ if enable_show_status = 0:
 		gs 'indik', '1', pcs_mood, pcs_mood
 		$stat_extra_msg += '<BR><<$ind>> Mood'
 
-		if cheatNoEat = 0:
+		if cheatVars['hunger'] = 0:
 			gs 'indik', '1', pcs_energy, pcs_energy
 			$stat_extra_msg += '<BR><<$ind>> Hunger'
 		end
 
-		if cheatNoDrink = 0:
+		if cheatVars['thirst'] = 0:
 			gs 'indik', '1', pcs_hydra, pcs_hydra
 			$stat_extra_msg += '<BR><<$ind>> Thirst'
 		end
 
-		if cheatNoSleep = 0:
+		if cheatVars['sleep'] = 0:
 			gs 'indik', '1', pcs_sleep, pcs_sleep
 			$stat_extra_msg += '<BR><<$ind>> Sleep'
 		end
@@ -1834,7 +1842,7 @@ killvar 'stat_extra_msg'
 if enable_extra_msg = 1:
 	if opPRE = 0: $stat_msg += '<BR><<$pcs_makeup>> and your hair is <<$pcs_hairbsh>>.' & !$stat_msg += '<BR>'
 
-	if thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
+	if thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatVars['no_periods'] = 0 and mesec = 0:
 		if abortionbirthdate = 0 and daystart - daylastperiod > 28:
 			if (daystart - daylastperiod > 28) and (daystart - daylastperiod <= 35):
 				$stat_msg += '<BR><font color = #AB052A><b>Your period is late by <<daystart - daylastperiod - 28>> days.</b></font>'
@@ -1888,9 +1896,9 @@ if enable_extra_msg = 1:
 		$stat_msg += '</font>'
 	end
 
-	if $cycreport_txt ! '' and menu_off = 0 and cheatSlut = 0:
+	if $cycreport_txt ! '' and menu_off = 0 and cheatVars['no_periods'] = 0:
 		$stat_msg += '<BR><a href="exec:dynamic $d_cycreport_choice"><<$cycreport_txt>></a><br>'
-	elseif $cycreport_txt ! '' and menu_off = 1 and cheatSlut = 0:
+	elseif $cycreport_txt ! '' and menu_off = 1 and cheatVars['no_periods'] = 0:
 		$stat_msg += '<BR><a href="exec:gs ''obj_din'', ''menu_disabled''"><<$cycreport_txt>></a><br>'
 	end
 
@@ -1901,34 +1909,34 @@ if enable_extra_msg = 1:
 	if drugVars['breastcream_dose'] = 1: $stat_msg += '<BR><font color = #DB7093>Your breasts are feeling hot and tingly.</font>'
 	if drugVars['aphrodisiac_timer'] > 0: $stat_msg += '<BR><font color = #DB7093>You are feeling hot, and every move causes your groin to tingle.</font>'
 
-	if cheatNoEat = 0 and $stat_hunger_msg ! '' and pcs_energy < 5:
-		$stat_msg += '<BR><font color="red"><b><<$stat_hunger_msg>></b></font>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! ''  and pcs_energy < 10:
-		$stat_msg += '<BR><font color="red"><<$stat_hunger_msg>></font>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! ''  and pcs_energy < 20:
-		$stat_msg += '<BR><<$stat_hunger_msg>>'
-	elseif cheatNoEat = 0 and $stat_hunger_msg ! ''  and pcs_energy < 30:
-		$stat_msg += '<BR><<$stat_hunger_msg>>'
+	if cheatVars['hunger'] = 0 and $stat_hunger_msg ! '' and pcs_energy < 30:
+		if pcs_energy < 5:
+			$stat_msg += '<br><font color="red"><b><<$stat_hunger_msg>></b></font>'
+		elseif pcs_energy < 10:
+			$stat_msg += '<br><font color="red"><<$stat_hunger_msg>></font>'
+		else
+			$stat_msg += '<br><<$stat_hunger_msg>>'
+		end
 	end
 
-	if cheatNoDrink = 0 and $stat_thirst_msg ! '' and pcs_hydra < 5:
-		$stat_msg += '<BR><font color="red"><b><<$stat_thirst_msg>></b></font>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and pcs_hydra < 10:
-		$stat_msg += '<BR><font color="red"><<$stat_thirst_msg>></font>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and pcs_hydra < 20:
-		$stat_msg += '<BR><<$stat_thirst_msg>>'
-	elseif cheatNoDrink = 0 and $stat_thirst_msg ! '' and pcs_hydra < 30:
-		$stat_msg += '<BR><<$stat_thirst_msg>>'
+	if cheatVars['thirst'] = 0 and $stat_thirst_msg ! '' and pcs_hydra < 30:
+		if pcs_hydra < 5:
+			$stat_msg += '<br><font color="red"><b><<$stat_thirst_msg>></b></font>'
+		elseif pcs_hydra < 10:
+			$stat_msg += '<br><font color="red"><<$stat_thirst_msg>></font>'
+		else
+			$stat_msg += '<br><<$stat_thirst_msg>>'
+		end
 	end
 
-	if cheatNoSleep= 0 and $stat_sleep_msg ! '' and pcs_sleep < 5:
-		$stat_msg += '<BR><font color="red"><b><<$stat_sleep_msg>></b></font>'
-	elseif cheatNoSleep= 0 and $stat_sleep_msg ! '' and pcs_sleep < 10:
-		$stat_msg += '<BR><font color="red"><<$stat_sleep_msg>></font>'
-	elseif cheatNoSleep= 0 and $stat_sleep_msg ! '' and pcs_sleep < 20:
-		$stat_msg += '<BR><<$stat_sleep_msg>>'
-	elseif cheatNoSleep= 0 and $stat_sleep_msg ! '' and pcs_sleep < 30:
-		$stat_msg += '<BR><<$stat_sleep_msg>>'
+	if cheatVars['sleep'] = 0 and $stat_sleep_msg ! '' and pcs_sleep < 30:
+		if pcs_sleep < 5:
+			$stat_msg += '<br><font color="red"><b><<$stat_sleep_msg>></b></font>'
+		elseif pcs_sleep < 10:
+			$stat_msg += '<br><font color="red"><<$stat_sleep_msg>></font>'
+		else
+			$stat_msg += '<br><<$stat_sleep_msg>>'
+		end
 	end
 
 	if pcs_horny >= 50:
@@ -1943,7 +1951,7 @@ if enable_extra_msg = 1:
 		end
 	end
 
-	if drugVars['cigarettes_used'] >= 20 and drugVars['cheat_immune'] = 0:
+	if drugVars['cigarettes_used'] >= 20 and cheatVars['drugs_immune'] = 0:
 		if drugVars['cigarettes_need'] > 0:
 			if mc_inventory['cigarettes'] > 0:
 				$stat_msg += '<BR><a href="exec:gs ''drugs'',''smoke''"><font color="red"><b>You want to smoke. You have <<mc_inventory[''cigarettes'']>> cigarettes left.</b></font></a><BR>'
@@ -1964,22 +1972,24 @@ if enable_extra_msg = 1:
 	if drugVars['cigarettes_day'] = daystart and drugVars['cigarettes_hour'] = hour and drugVars['cigarettes_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
 	if drugVars['weed_day'] = daystart and drugVars['weed_hour'] = hour and drugVars['weed_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
 	
-	if cheatNoSweat = 0 and pcs_sweat > 59:
-		$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b><br>'
-	elseif cheatNoSweat = 0 and pcs_sweat > 49:
-		$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b>'
-	elseif cheatNoSweat = 0 and pcs_sweat > 39:
-		$stat_msg += '<br><font color="red"><<$stat_sweat_msg>></font>'
-	elseif cheatNoSweat = 0 and pcs_sweat > 29:
-		$stat_msg += '<br><font color="red"><<$stat_sweat_msg>></font>'
-	elseif cheatNoSweat = 0 and pcs_sweat > 19:
-		$stat_msg += '<br><font color="brown"><<$stat_sweat_msg>></font>'
-	elseif cheatNoSweat = 0 and pcs_sweat > 9 and deodorant_on = 1:
-		$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font>'
-	elseif cheatNoSweat = 0 and arrsize('sparrvol') = 0:
-		$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font></b>'
-	elseif cheatNoSweat = 0 and deodorant_on = 1:
-		$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font></b>'
+	if cheatVars['no_sweat'] = 0:
+		if pcs_sweat > 59:
+			$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b><br>'
+		elseif pcs_sweat > 49:
+			$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b>'
+		elseif pcs_sweat > 39:
+			$stat_msg += '<br><font color="red"><<$stat_sweat_msg>></font>'
+		elseif pcs_sweat > 29:
+			$stat_msg += '<br><font color="red"><<$stat_sweat_msg>></font>'
+		elseif pcs_sweat > 19:
+			$stat_msg += '<br><font color="brown"><<$stat_sweat_msg>></font>'
+		elseif pcs_sweat > 9 and deodorant_on = 1:
+			$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font>'
+		elseif arrsize('sparrvol') = 0:
+			$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font></b>'
+		elseif deodorant_on = 1:
+			$stat_msg += '<br><b><font color="green"><<$stat_sweat_msg>></font></b>'
+		end
 	end
 
 	!!	breast status

+ 4 - 4
locations/street_event.qsrc

@@ -142,7 +142,7 @@ if hour >= 21 or hour <= 5:
 end
 
 if $ARGS[1] = 'extras':
-	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour and random_bf_gf_cheat = 0:
+	if rand(0, 100) < streetev_bf and pcs_lover < 3 and streetbfhour ! hour and cheatVars['random_lovers'] = 0:
 		streetbfhour = hour
 		vnerand = rand(0, 1200)
 		lesbian_lover = (rand(1,100) <= 25 - (20/(lesbian + 1)))
@@ -247,7 +247,7 @@ if $ARGS[1] = 'main':
 		end
 	end
 
-	if streetrand < streetev_rape and hour <= 3 and streetev_day ! daystart and cheat_street_rapists = 0:
+	if streetrand < streetev_rape and hour <= 3 and streetev_day ! daystart and cheatVars['random_rapists'] = 0:
 		*clr & cla
 		menu_off = 1
 		gs 'exp_gain', 'prcptn', rand(1,2)
@@ -313,7 +313,7 @@ if $ARGS[1] = 'main':
 
 	streetrand = rand(0, 1000)
 	if daystart >= 10 and (hour < 6 or hour >= 20) and streetev_day ! daystart and streetev_rob_day ! daystart and bag = 1:
-		if streetrand < streetev_rob and cheat_street_robbers = 0:
+		if streetrand < streetev_rob and cheatVars['random_robbers'] = 0:
 			*clr & cla
 			menu_off = 1
 			streetev_day = daystart
@@ -396,7 +396,7 @@ if $ARGS[1] = 'main':
 	streetrand = rand(0, 1000)
 
 	if  daystart >= 10 and hour >= 6 and hour < 20 and streetev_day ! daystart and bag = 1 and streetev_hijack_day ! daystart:
-		if streetrand < streetev_hijack and cheat_street_robbers = 0:
+		if streetrand < streetev_hijack and cheatVars['random_robbers'] = 0:
 			*clr & cla
 			menu_off = 1
 			gs'stat'

+ 1 - 1
locations/succubus.qsrc

@@ -92,7 +92,7 @@ end
 
 !!Succubus Level & hunger calcs
 if $ARGS[0] = 'cikl':
-	cheatHealth = 1
+	cheatVars['std'] = 1
 	dynamic $cheatmenu['std_cure']
 
 !!	Hunger handling

+ 33 - 32
locations/swamp.qsrc

@@ -88,42 +88,43 @@ if $ARGS[0] = 'stuck':
 				swamp_check = pcs_stren
 				swamprand = rand(0,75)
 			end
-			if swamp_stuck = 10 and Enable_nogameover = 0:
-				over = 10
-				gt 'gameover'
-			else
-				if swamp_check > swamprand:
-					'<center><H4>Swamp</H4></center>'
-					if $clothingworntype ! 'nude' and PCloSkirt = 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
-					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
-					elseif $clothingworntype = 'nude':
-						swamprand = rand(0,3)
-						if swamprand = 0:
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0..jpg"></center>'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(1,3)+'.jpg"></center>'
-						end
-					end
-					*nl
-					'Your efforts are not vain as you begin to feel the mud''s hold loosen. Then, with another burst of strength, you free yourself and sigh in relief.'
 
-					act 'Success!':gt 'swamp_yard','start'
-				else
-					'<center><H4>Swamp</H4></center>'
-					if $clothingworntype ! 'nude' and PCloSkirt = 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
-					elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
-					elseif $clothingworntype = 'nude':
-						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
+			if swamp_stuck = 10:
+				gs 'gameover', 'check', 10
+				msg '<font color=red><B>You should die in this swamp, but Cheat Mode keeps you Alive.</B></font>'
+			end
+
+			if swamp_check > swamprand:
+				'<center><H4>Swamp</H4></center>'
+				if $clothingworntype ! 'nude' and PCloSkirt = 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
+				elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
+				elseif $clothingworntype = 'nude':
+					swamprand = rand(0,3)
+					if swamprand = 0:
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0..jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.' + rand(1,3) + '.jpg"></center>'
 					end
-					*nl
-					'Your efforts are for nothing. The mud''s hold feels as tight as ever. In fact, you feel yourself sinking even deeper.'
+				end
+				*nl
+				'Your efforts are not vain as you begin to feel the mud''s hold loosen. Then, with another burst of strength, you free yourself and sigh in relief.'
 
-					act 'Failure':gt 'swamp','stuck'
+				act 'Success!': gt 'swamp_yard', 'start'
+			else
+				'<center><H4>Swamp</H4></center>'
+				if $clothingworntype ! 'nude' and PCloSkirt = 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+				elseif $clothingworntype ! 'nude' and PCloSkirt > 0:
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+				elseif $clothingworntype = 'nude':
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.' + rand(4,5) + '.jpg"></center>'
 				end
+				*nl
+				'Your efforts are for nothing. The mud''s hold feels as tight as ever. In fact, you feel yourself sinking even deeper.'
+
+				act 'Failure': gt 'swamp', 'stuck'
 			end
 		end
 		if month >= 4 and month <= 10:

+ 1 - 1
locations/therapist.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = '':
 	
 	gs 'stat'
 
-	if therapist_weekly_block = 0 or therapist_weekly_cheat > 0:
+	if therapist_weekly_block = 0 or cheatVars['therapist_schedule'] > 0:
 		gs 'therapist', 'hypnoGreet'
 	else
 		*nl

+ 1 - 1
locations/tour_guide.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'tourstart':
 		'Like any teenager your only questions are about breaks and days off. The manager smiles, not surprised, and tells you that working is voluntary. If you do not show up then obviously you will not make any money that day, but otherwise no daily commitment is required from you. Breaks will be allowed if there are no groups to lead at that time and you will be given a small lunch everyday that you choose to work.'
 		act 'Accept the position':
 			gs 'emp_job_array', 'emp_tourist_guide'
-			if cheatWork = 1:
+			if cheatVars['work'] = 1:
 				!TourGuide = 1
 				gs 'emp_functions','emp_booking'
 				gt 'pav_park', 'start'

+ 6 - 6
locations/traits.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'menu':
 
 
 	*nl & '<center><b>Exhibitionist</b></center>'
-	if Exhibitionist_lvl = 0 and exhib_cheat = 0:
+	if Exhibitionist_lvl = 0 and cheatVars['no_trait_exhib'] = 0:
 		'You do not have this trait.'
 		'To gain this trait, you must have low enough inhibition and choose to expose your breasts in public.'
 		'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day unless you expose yourself.'
@@ -89,7 +89,7 @@ if $ARGS[0] = 'menu':
 
 
 	*nl & '<center><b>Addictive Personality</b></center>'
-	if addictive_trait_lvl = 0 and addictive_cheat = 0:
+	if addictive_trait_lvl = 0 and cheatVars['no_trait_addictive'] = 0:
 		'You do not have this trait.'
 		'To gain this trait, you have to use 2 different types of drugs several times. At the moment, you have <<addictive_exp>> out of 2 points towards level 1.'
 	elseif addictive_trait_lvl = 1:
@@ -108,11 +108,11 @@ if $ARGS[0] = 'menu':
 
 
 	*nl & '<center><b>Cumeater</b></center>'
-	if pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
+	if pcs_traits['cumeater'] = 0 and cheatVars['no_trait_cumeater'] = 0:
 		'You do not have this trait.'
 		'To gain this trait, you must swallow cum 10 times.'
 		'You have swallowed cum <<stat[''swallow'']>> times.'
-	elseif pcs_traits['cumeater'] = 0 and cumeater_cheat = 1:
+	elseif pcs_traits['cumeater'] = 0 and cheatVars['no_trait_cumeater'] = 1:
 		'You do not have this trait.'
 	else
 		'You have this trait.'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'menu':
 end
 
 if $ARGS[0] = 'hourly':
-	if stat['swallow'] >= 10 and pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
+	if stat['swallow'] >= 10 and pcs_traits['cumeater'] = 0 and cheatVars['no_trait_cumeater'] = 0:
 		pcs_traits['cumeater'] = 1
 		msg 'You have gained the trait "Cumeater"'
 	end
@@ -312,7 +312,7 @@ end
 
 if $ARGS[0] = 'addictive_personality':
 	!!Addictive Personality Trait
-	if addictive_cheat = 0:
+	if cheatVars['no_trait_addictive'] = 0:
 		addictive_exp = drugVars['cigarettes_exp'] + drugVars['weed_exp'] + drugVars['heroin_exp'] + drugVars['cocaine_exp'] + drugVars['alcohol_exp'] + drugVars['amphetamine_exp']
 
 		if addictive_exp = 2 and addictive_trait_lvl < 1:

+ 1 - 1
locations/wakeup.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'get_out':
 		end
 	end
 
-	if enfullmorrout = 1 and hour >= 4 and hour < 12:
+	if cheatVars['full_morning_rout'] = 1 and hour >= 4 and hour < 12:
 		act 'Full morning routine (01:00)':
 			minut += 15
 			fullmorrout = 1

+ 2 - 2
locations/willpower.qsrc

@@ -929,11 +929,11 @@ if $ARGS[0] = 'difficulty':
 	if $ARGS[1] = 'force':
 		will_cost = will_cost*(200-pcs_persuas)/100
 	end
-	if cheatWillpower = 1: will_cost = 0
+	if cheatVars['willpower'] = 1: will_cost = 0
 end
 
 if $ARGS[0] = 'pay':
-	if will_cost < 1 and cheatWillpower = 0: will_cost = 1
+	if will_cost < 1 and cheatVars['willpower'] = 0: will_cost = 1
 	pcs_willpwr -= will_cost
 	if $ARGS[1] = 'force':
 		if willpowermax < 150: