Merge remote-tracking branch 'Anjuna/master'

locations/Cheatmenu_din.qsrc

@@ -359,13 +359,13 @@ $cheatmenu['cheat_NoLactation'] = {
 }
 
 $cheatmenu['Vibrator'] = {
-	if sleepQW['cheatVib'] = 0:
-		sleepQW['cheatVib'] = 1
-		sleepQW['bedVibrator'] = 1
+	if sleepVars['cheatVib'] = 0:
+		sleepVars['cheatVib'] = 1
+		sleepVars['bedVibrator'] = 1
 		dynamic $cheatmenu['permanent']
-	elseif sleepQW['cheatVib'] = 1:
-		sleepQW['cheatVib'] = 0
-		sleepQW['bedVibrator'] = 0
+	elseif sleepVars['cheatVib'] = 1:
+		sleepVars['cheatVib'] = 0
+		sleepVars['bedVibrator'] = 0
 		dynamic $cheatmenu['permanent']
 	end
 }
@@ -548,8 +548,8 @@ $cheatmenu['permanent'] = {
 	if cheatSlut = 1: $cheatSlut = 'Disabled'
 	if cheatHorny = 0: $cheatHorny = 'Currently OFF'
 	if cheatHorny = 1: $cheatHorny = 'Currently ON'
-	if sleepQW['bedVibrator'] = 0: $sleepQW['cheatVib'] = 'Currently OFF'
-	if sleepQW['bedVibrator'] = 1: $sleepQW['cheatVib'] = 'Currently ON'
+	if sleepVars['bedVibrator'] = 0: $sleepVars['cheatVib'] = 'Currently OFF'
+	if sleepVars['bedVibrator'] = 1: $sleepVars['cheatVib'] = 'Currently ON'
 	if fight_cheat = 0: $fight_cheat = 'Currently OFF'
 	if fight_cheat = 1: $fight_cheat = 'Currently ON'
 	if autocombat_cheat = 0: $autocombat_cheat = 'Currently OFF'
@@ -615,7 +615,7 @@ $cheatmenu['permanent'] = {
 
 	*nl
 
-	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$sleepQW[''cheatVib'']>></a>'
+	'Enable sleeping with vibrator inserted: <a href="exec:dynamic $cheatmenu[''Vibrator'']"><<$sleepVars[''cheatVib'']>></a>'
 
 	*nl
 
@@ -650,10 +650,10 @@ $cheatmenu['permanent'] = {
 		'Automatic cheat on Tampon: <a href="exec:Enable_auto_tampons =  1 & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end
 	*nl
-	if sleepQW['cheat_nodream_chance'] > 0:
-		'No dream chance: <a href="exec:sleepQW[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<sleepQW[''cheat_nodream_chance'']>>%</a>, <a href="exec:sleepQW[''cheat_nodream_chance'']=0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
+	if sleepVars['cheat_nodream_chance'] > 0:
+		'No dream chance: <a href="exec:sleepVars[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']"><<sleepVars[''cheat_nodream_chance'']>>%</a>, <a href="exec:sleepVars[''cheat_nodream_chance'']=0 & dynamic $cheatmenu[''permanent'']">Currently ON</a>'
 	else
-		'No dream chance: <a href="exec:sleepQW[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
+		'No dream chance: <a href="exec:sleepVars[''cheat_nodream_chance'']=input(''Enter no dream chance (%)'') & dynamic $cheatmenu[''permanent'']">Currently OFF</a>'
 	end & !1.2.3 new function
 	*nl
 	'Hide Console input in objects window: <a href="exec:dynamic $cheatmenu[''consolecheat'']"><<$cheatConsole>></a>'

locations/bed2.qsrc

@@ -39,9 +39,9 @@ if $ARGS[0] = 'bed2' or $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	if pcs_sleep <= 80:
 		if $clothingworntype = 'nude':
-			act 'Go to bed': gt 'pre_sleep_events'
+			act 'Go to bed': gs 'shortgs', 'auto_save' & gt 'pre_sleep_events'
 		else
-			act 'Undress and go to bed': gt 'pre_sleep_events'
+			act 'Undress and go to bed': gs 'shortgs', 'auto_save' & gt 'pre_sleep_events'
 		end
 	end
 

locations/korrPar.qsrc

@@ -449,8 +449,8 @@ elseif motherWorry = 1 and locat['Fam_inGad'] > 0:
 	motherWorry = 0
 end
 
-if sleepQW['notathomesleep'] > 7 and hour >= 16 and hour < 21 and locat['Mom_athome'] = 1:
-	sleepQW['notathomesleep'] = 0
+if sleepVars['notathomesleep'] > 7 and hour >= 16 and hour < 21 and locat['Mom_athome'] = 1:
+	sleepVars['notathomesleep'] = 0
 	*clr & cla
 	*pl $korrParMomHeader
 	if npc_rel['A29'] < 40:

locations/placer_sex.qsrc

@@ -1430,7 +1430,7 @@ if $args[0] = 'sleep':
 	end
 	*clr & cla
 	clr
-	sleepQW['notathomesleep'] = 0
+	sleepVars['notathomesleep'] = 0
 	pcs_health += 5
 	pcs_hairbsh = 0
 	InSleep = 1

locations/pre_sleep.qsrc

@@ -23,9 +23,9 @@ if $ARGS[0] = 'pre_sleep2':
 		$lastwornbratype['bed'] = $braworntype
 		lastwornbranumber['bed'] = brawornnumber
 	end
-	if bedPanty = 2:
+	if sleepVars['bedPanty'] = 2:
 		gs 'underwear', 'remove'
-	elseif bedPanty = 1:
+	elseif sleepVars['bedPanty'] = 1:
 		gs 'underwear', 'wear'
 	end
 	if $clothingworntype ! 'nude':
@@ -33,16 +33,6 @@ if $ARGS[0] = 'pre_sleep2':
 		gs 'clothing', 'strip'
 	end
 
-	if disable_autosave = 0:
-		if mid($start_type,1,4) = 'city':
-			savegame 'autosave_city.sav'
-		elseif mid($start_type,1,3) = 'uni':
-			savegame 'autosave_uni.sav'
-		else
-			savegame 'autosave_sg.sav'
-		end
-	end
-
 	gt 'pre_sleep', 'prepare_sleep'
 end
 
@@ -123,7 +113,7 @@ if $ARGS[0] = 'prepare_sleep':
 	end
 
 	*nl
-	if bedPanty = 1:
+	if sleepVars['bedPanty'] = 1:
 		if $pantyworntype = 'none' and $braworntype = 'none':
 			'You put on your bra and panties.'
 		elseif $pantyworntype ! 'none' and $braworntype = 'none':
@@ -133,7 +123,7 @@ if $ARGS[0] = 'prepare_sleep':
 		else
 			'You change your bra and panties.'
 		end
-	elseif bedPanty = 2:
+	elseif sleepVars['bedPanty'] = 2:
 		if $pantyworntype ! 'none' or $braworntype ! 'none':
 			'You remove your bra and panties.'
 		elseif $pantyworntype ! 'none' and $braworntype = 'none':

locations/saveupdater.qsrc

@@ -2151,27 +2151,25 @@ if temp_current_save_version < 00090003:
 	!! Sleep update.
 	killvar 'varsleep'
 
-	if bedPanty			> 0: sleepVars['bedPanty']				= bedPanty			& killvar 'bedPanty'
-	if bedAnal			> 0: sleepVars['bedAnal']				= bedAnal			& killvar 'bedAnal'
-	if bedVibrator		> 0: sleepVars['bedVibrator']			= bedVibrator		& killvar 'bedVibrator'
-	if cheatVib			> 0: sleepVars['cheatVib']				= cheatVib			& killvar 'cheatVib'
-	if notathomesleep	> 0: sleepVars['notathomesleep']		= notathomesleep	& killvar 'notathomesleep'
-	if Enable_nodream 	> 0: sleepVars['cheat_nodream_chance']	= Enable_nodream	& killvar 'Enable_nodream'
+	if bedPanty       > 0: sleepVars['bedPanty']             = bedPanty       & killvar 'bedPanty'
+	if bedAnal        > 0: sleepVars['bedAnal']              = bedAnal        & killvar 'bedAnal'
+	if bedVibrator    > 0: sleepVars['bedVibrator']          = bedVibrator    & killvar 'bedVibrator'
+	if cheatVib       > 0: sleepVars['cheatVib']             = cheatVib       & killvar 'cheatVib'
+	if notathomesleep > 0: sleepVars['notathomesleep']       = notathomesleep & killvar 'notathomesleep'
+	if Enable_nodream > 0: sleepVars['cheat_nodream_chance'] = Enable_nodream & killvar 'Enable_nodream'
 	
 	sleepVars['events_active'] = 1
 	sleepVars['dreams_active'] = 1
 
-	if budilnikOn		> 0: alarmVars['alarmOn']		= budilnikOn	& killvar 'budilnikOn'
-	if timer			> 0: alarmVars['timerH']		= timer			& killvar 'timer'
-	if timerM			> 0: alarmVars['timerM']		= timerM		& killvar 'timerM'
-	if timerEnd			> 0: alarmVars['timerEndH']		= timerEnd		& killvar 'timerEnd'
-	if timerEndM		> 0: alarmVars['timerEndM']		= timerEndM		& killvar 'timerEndM'
-	if alarm_holiday	> 0: alarmVars['alarm_holiday']	= alarm_holiday	& killvar 'alarm_holiday'
-end
+	if budilnikOn       > 0: alarmVars['alarmOn']       = budilnikOn    & killvar 'budilnikOn'
+	if timer            > 0: alarmVars['timerH']        = timer         & killvar 'timer'
+	if timerM           > 0: alarmVars['timerM']        = timerM        & killvar 'timerM'
+	if timerEnd         > 0: alarmVars['timerEndH']     = timerEnd      & killvar 'timerEnd'
+	if timerEndM        > 0: alarmVars['timerEndM']     = timerEndM     & killvar 'timerEndM'
+	if alarm_holiday    > 0: alarmVars['alarm_holiday'] = alarm_holiday & killvar 'alarm_holiday'
 
-! Pav shared apartment update
+	!! Pav shared apartment update
 	if updated_pav_shared_apt = 0:
-		
 		npctemp = 264
 		$npc_dna['A<<npctemp>>'] = '1290130369 1043654233 5049908515 3153411713 0721993774 2486220839 0288719745'
 		$npc_firstname['A<<npctemp>>'] = 'Yakov'
@@ -2227,57 +2225,59 @@ end
 		npc_sexskill['A<<npctemp>>'] = 1
 		$npc_occupation['A<<npctemp>>'] = 'programmer'
 		npc_style['A<<npctemp>>'] = 3
-
-	if nd_rel                  > 0:npc_rel[A266]           	  =nd_rel                  &killvar 'nd_rel'
-	if sp_rel                  > 0:npc_rel[A264]              =sp_rel                  &killvar 'sp_rel'
-	if gp_rel                  > 0:npc_rel[A265]              =gp_rel                  &killvar 'gp_rel'
-	if nd_hj                   > 0:oleg_hj                    =nd_hj                   &killvar 'nd_hj'
-	if nd_bj                   > 0:oleg_bj                    =nd_bj                   &killvar 'nd_bj'
-	if nd_bjFail               > 0:oleg_bjFail                =nd_bjFail               &killvar 'nd_bjFail'
-	if nd_bjDeep               > 0:oleg_bjDeep                =nd_bjDeep               &killvar 'nd_bjDeep'
-	if nd_bjFailPuke           > 0:oleg_bjFailPuke            =nd_bjFailPuke           &killvar 'nd_bjFailPuke'
-	if nd_bjFailFaint          > 0:oleg_bjFailFaint           =nd_bjFailFaint          &killvar 'nd_bjFailFaint'
-	if nd_swall                > 0:oleg_swall                 =nd_swall                &killvar 'nd_swall'
-	if nd_vagCumInsideUnwanted > 0:oleg_vagCumInsideUnwanted  =nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
-	if nd_vag                  > 0:oleg_vag                   =nd_vag                  &killvar 'nd_vag'
-	if nd_vagCumInside         > 0:oleg_vagCumInside          =nd_vagCumInside         &killvar 'nd_vagCumInside'
-	if nd_anal                 > 0:oleg_anal                  =nd_anal                 &killvar 'nd_anal'
-	if nd_analCumInside        > 0:oleg_analCumInside         =nd_analCumInside        &killvar 'nd_analCumInside'
-	if nd_vagCumInsideUnwanted > 0:oleg_vagCumInsideUnwanted  =nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
-	if nd_piss                 > 0:oleg_piss                  =nd_piss                 &killvar 'nd_piss'
-	if nd_doPornpos            > 0:oleg_doPornpos             =nd_doPornpos            &killvar 'nd_doPornpos'
-	if nd_pornPos              > 0:oleg_pornPos               =nd_pornPos              &killvar 'nd_pornPos'
-	if gp_bj                   > 0:nestor_bj                  =gp_bj                   &killvar 'gp_bj'
-	if gp_bjFail               > 0:nestor_bjFail              =gp_bjFail               &killvar 'gp_bjFail'
-	if gp_bjDeep               > 0:nestor_bjDeep              =gp_bjDeep               &killvar 'gp_bjDeep'
-	if gp_bjFailPuke           > 0:nestor_bjFailPuke          =gp_bjFailPuke           &killvar 'gp_bjFailPuke'
-	if gp_bjFailFaint          > 0:nestor_bjFailFaint         =gp_bjFailFaint          &killvar 'gp_bjFailFaint'
-	if gp_swall                > 0:nestor_swall               =gp_swall                &killvar 'gp_swall'
-	if gp_vagCumInsideUnwanted > 0:nestor_vagCumInsideUnwanted=gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
-	if gp_vag                  > 0:nestor_vag                 =gp_vag                  &killvar 'gp_vag'
-	if gp_vagCumInside         > 0:nestor_vagCumInside        =gp_vagCumInside         &killvar 'gp_vagCumInside'
-	if gp_anal                 > 0:nestor_anal                =gp_anal                 &killvar 'gp_anal'
-	if gp_analCumInside        > 0:nestor_analCumInside       =gp_analCumInside        &killvar 'gp_analCumInside'
-	if gp_vagCumInsideUnwanted > 0:nestor_vagCumInsideUnwanted=gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
-	if gp_doPornpos            > 0:nestor_doPornpos           =gp_doPornpos            &killvar 'gp_doPornpos'
-	if gp_pornPos              > 0:nestor_pornPos             =gp_pornPos              &killvar 'gp_pornPos'
-	if sp_bj                   > 0:yakov_bj                   =sp_bj                   &killvar 'sp_bj'
-	if sp_bjFail               > 0:yakov_bjFail               =sp_bjFail               &killvar 'sp_bjFail'
-	if sp_bjDeep               > 0:yakov_bjDeep               =sp_bjDeep               &killvar 'sp_bjDeep'
-	if sp_bjFailPuke           > 0:yakov_bjFailPuke           =sp_bjFailPuke           &killvar 'sp_bjFailPuke'
-	if sp_bjFailFaint          > 0:yakov_bjFailFaint          =sp_bjFailFaint          &killvar 'sp_bjFailFaint'
-	if sp_swall                > 0:yakov_swall                =sp_swall                &killvar 'sp_swall'
-	if sp_vagCumInsideUnwanted > 0:yakov_vagCumInsideUnwanted =sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
-	if sp_vag                  > 0:yakov_vag                  =sp_vag                  &killvar 'sp_vag'
-	if sp_vagCumInside         > 0:yakov_vagCumInside         =sp_vagCumInside         &killvar 'sp_vagCumInside'
-	if sp_anal                 > 0:yakov_anal                 =sp_anal                 &killvar 'sp_anal'
-	if sp_analCumInside        > 0:yakov_analCumInside        =sp_analCumInside        &killvar 'sp_analCumInside'
-	if sp_vagCumInsideUnwanted > 0:yakov_vagCumInsideUnwanted =sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
-	if sp_doPornpos            > 0:yakov_doPornpos            =sp_doPornpos            &killvar 'sp_doPornpos'
-	if sp_pornPos              > 0:yakov_pornPos              =sp_pornPos              &killvar 'sp_pornPos'
-	if sp_hj                   > 0:yakov_hj                   =sp_hj                   &killvar 'sp_hj'
-	if sp_dildo                > 0:yakov_dildo                =sp_dildo                &killvar'sp_dildo'
-		
+		updated_pav_shared_apt = 1
+	end
+
+	if sp_rel                  > 0: npc_rel['A264']             = sp_rel                  &killvar 'sp_rel'
+	if gp_rel                  > 0: npc_rel['A265']             = gp_rel                  &killvar 'gp_rel'
+	if nd_rel                  > 0: npc_rel['A266']             = nd_rel                  &killvar 'nd_rel'
+	if nd_hj                   > 0: oleg_hj                     = nd_hj                   &killvar 'nd_hj'
+	if nd_bj                   > 0: oleg_bj                     = nd_bj                   &killvar 'nd_bj'
+	if nd_bjFail               > 0: oleg_bjFail                 = nd_bjFail               &killvar 'nd_bjFail'
+	if nd_bjDeep               > 0: oleg_bjDeep                 = nd_bjDeep               &killvar 'nd_bjDeep'
+	if nd_bjFailPuke           > 0: oleg_bjFailPuke             = nd_bjFailPuke           &killvar 'nd_bjFailPuke'
+	if nd_bjFailFaint          > 0: oleg_bjFailFaint            = nd_bjFailFaint          &killvar 'nd_bjFailFaint'
+	if nd_swall                > 0: oleg_swall                  = nd_swall                &killvar 'nd_swall'
+	if nd_vagCumInsideUnwanted > 0: oleg_vagCumInsideUnwanted   = nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
+	if nd_vag                  > 0: oleg_vag                    = nd_vag                  &killvar 'nd_vag'
+	if nd_vagCumInside         > 0: oleg_vagCumInside           = nd_vagCumInside         &killvar 'nd_vagCumInside'
+	if nd_anal                 > 0: oleg_anal                   = nd_anal                 &killvar 'nd_anal'
+	if nd_analCumInside        > 0: oleg_analCumInside          = nd_analCumInside        &killvar 'nd_analCumInside'
+	if nd_vagCumInsideUnwanted > 0: oleg_vagCumInsideUnwanted   = nd_vagCumInsideUnwanted &killvar 'nd_vagCumInsideUnwanted'
+	if nd_piss                 > 0: oleg_piss                   = nd_piss                 &killvar 'nd_piss'
+	if nd_doPornpos            > 0: oleg_doPornpos              = nd_doPornpos            &killvar 'nd_doPornpos'
+	if nd_pornPos              > 0: oleg_pornPos                = nd_pornPos              &killvar 'nd_pornPos'
+	if gp_bj                   > 0: nestor_bj                   = gp_bj                   &killvar 'gp_bj'
+	if gp_bjFail               > 0: nestor_bjFail               = gp_bjFail               &killvar 'gp_bjFail'
+	if gp_bjDeep               > 0: nestor_bjDeep               = gp_bjDeep               &killvar 'gp_bjDeep'
+	if gp_bjFailPuke           > 0: nestor_bjFailPuke           = gp_bjFailPuke           &killvar 'gp_bjFailPuke'
+	if gp_bjFailFaint          > 0: nestor_bjFailFaint          = gp_bjFailFaint          &killvar 'gp_bjFailFaint'
+	if gp_swall                > 0: nestor_swall                = gp_swall                &killvar 'gp_swall'
+	if gp_vagCumInsideUnwanted > 0: nestor_vagCumInsideUnwanted = gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
+	if gp_vag                  > 0: nestor_vag                  = gp_vag                  &killvar 'gp_vag'
+	if gp_vagCumInside         > 0: nestor_vagCumInside         = gp_vagCumInside         &killvar 'gp_vagCumInside'
+	if gp_anal                 > 0: nestor_anal                 = gp_anal                 &killvar 'gp_anal'
+	if gp_analCumInside        > 0: nestor_analCumInside        = gp_analCumInside        &killvar 'gp_analCumInside'
+	if gp_vagCumInsideUnwanted > 0: nestor_vagCumInsideUnwanted = gp_vagCumInsideUnwanted &killvar 'gp_vagCumInsideUnwanted'
+	if gp_doPornpos            > 0: nestor_doPornpos            = gp_doPornpos            &killvar 'gp_doPornpos'
+	if gp_pornPos              > 0: nestor_pornPos              = gp_pornPos              &killvar 'gp_pornPos'
+	if sp_bj                   > 0: yakov_bj                    = sp_bj                   &killvar 'sp_bj'
+	if sp_bjFail               > 0: yakov_bjFail                = sp_bjFail               &killvar 'sp_bjFail'
+	if sp_bjDeep               > 0: yakov_bjDeep                = sp_bjDeep               &killvar 'sp_bjDeep'
+	if sp_bjFailPuke           > 0: yakov_bjFailPuke            = sp_bjFailPuke           &killvar 'sp_bjFailPuke'
+	if sp_bjFailFaint          > 0: yakov_bjFailFaint           = sp_bjFailFaint          &killvar 'sp_bjFailFaint'
+	if sp_swall                > 0: yakov_swall                 = sp_swall                &killvar 'sp_swall'
+	if sp_vagCumInsideUnwanted > 0: yakov_vagCumInsideUnwanted  = sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
+	if sp_vag                  > 0: yakov_vag                   = sp_vag                  &killvar 'sp_vag'
+	if sp_vagCumInside         > 0: yakov_vagCumInside          = sp_vagCumInside         &killvar 'sp_vagCumInside'
+	if sp_anal                 > 0: yakov_anal                  = sp_anal                 &killvar 'sp_anal'
+	if sp_analCumInside        > 0: yakov_analCumInside         = sp_analCumInside        &killvar 'sp_analCumInside'
+	if sp_vagCumInsideUnwanted > 0: yakov_vagCumInsideUnwanted  = sp_vagCumInsideUnwanted &killvar 'sp_vagCumInsideUnwanted'
+	if sp_doPornpos            > 0: yakov_doPornpos             = sp_doPornpos            &killvar 'sp_doPornpos'
+	if sp_pornPos              > 0: yakov_pornPos               = sp_pornPos              &killvar 'sp_pornPos'
+	if sp_hj                   > 0: yakov_hj                    = sp_hj                   &killvar 'sp_hj'
+	if sp_dildo                > 0: yakov_dildo                 = sp_dildo                &killvar'sp_dildo'
+	
 	if oleg_analCumInside           > 0: oleg_cumAnal                  = oleg_analCumInside
 	if oleg_analCumInside           > 0: oleg_analCumInside           -= oleg_analCumInsideUnwanted
 	if oleg_analCumInsideUnwanted   > 0: oleg_analCumInsideUnwanted   -= oleg_analCumInside
@@ -2296,15 +2296,15 @@ end
 	if yakov_vagCumInside           > 0: yakov_cumVag                  = yakov_vagCumInside
 	if yakov_vagCumInside           > 0: yakov_vagCumInside           -= yakov_vagCumInsideUnwanted
 	if yakov_vagCumInsideUnwanted   > 0: yakov_vagCumInsideUnwanted   -= yakov_vagCumInside
-	updated_pav_shared_apt = 1
-	end
-killvar 'gp_horny'
-killvar 'sp_horny'
-killvar 'nd_horny'
-killvar 'milkPause'
-killvar 'gp_cumVol'
-killvar 'sp_cumVol'
-killvar 'nd_cumVol'
+
+	killvar 'gp_horny'
+	killvar 'sp_horny'
+	killvar 'nd_horny'
+	killvar 'milkPause'
+	killvar 'gp_cumVol'
+	killvar 'sp_cumVol'
+	killvar 'nd_cumVol'
+end
 
 
 killvar 'temp_current_save_version'

locations/shortgs.qsrc

@@ -1,5 +1,19 @@
 # shortgs
 
+!! make an autosave unless it is disabled
+if $ARGS[0] = 'autosave':
+	if disable_autosave = 0:
+		if mid($start_type, 1, 4) = 'city':
+			savegame 'autosave_city.sav'
+		elseif mid($start_type, 1, 3) = 'uni':
+			savegame 'autosave_uni.sav'
+		else
+			savegame 'autosave_sg.sav'
+		end
+	end
+end
+
+
 !! following function counts the number of guys which PC slept with.
 !! use func('shortgs','guy') or func('shortgs','guy',X) for subset (X can be 'A','B','C','AB','AC','BC')
 if $ARGS[0] = 'guy':

locations/sleep_events.qsrc

@@ -231,7 +231,7 @@ if $ARGS[0] = 'wake_horny':
 		pcs_mood -= 10
 		pcs_sleep -= 5
 		gs 'sleep_events', 'exit'
-		gt 'dream_event', 'dream'
+		gt 'dream_events', 'dream'
 	end
 
 	act 'Masturbate':

locations/succubus.qsrc

@@ -576,14 +576,14 @@ if $args[0] = 'sucwalkinginit':
 	if succublvl <= 2:
 		if $pantyworntype ! 'none': gs 'underwear', 'remove'
 	else
-		if sleepQW['bedPanty'] = 1: 
+		if sleepVars['bedPanty'] = 1: 
 			gs 'underwear', 'wear'
-		elseif sleepQW['bedPanty'] = 2:
+		elseif sleepVars['bedPanty'] = 2:
 			gs 'underwear', 'remove'
 		end
 	end
-	if analplugIN = 1 and sleepQW['bedAnal'] = 1: analplugIN = 0
-	if vibratorIN = 1 and sleepQW['bedVibrator'] = 1: vibratorIN = 0
+	if analplugIN = 1 and sleepVars['bedAnal'] = 1: analplugIN = 0
+	if vibratorIN = 1 and sleepVars['bedVibrator'] = 1: vibratorIN = 0
 
 !!This is the simple method for the base level succubus
 	if succublvl = 1 and $lastwornclothingtype ! 'nude':

locations/therapist.qsrc

@@ -1806,7 +1806,7 @@ if $ARGS[0] = 'hypnoDress':
 	elseif $pantyworntype = 'none' and hypnoPanty > 0:
 		'"Get dressed, <i>Cunt</i>. I see you didn''t wear underwear. Very good."'
 		'He watches you getting dressed with a small smile on his face.'
-		sleepQW['bedPanty'] = 2
+		sleepVars['bedPanty'] = 2
 
 	elseif $pantyworntype ! 'none' and hypnoPanty < 1:
 		'"Get dressed, <i>Cunt</i>, but forget the underwear. You didn''t wear any when you came, and you do not like to wear them. You enjoy the thought that people may notice that you do not wear underwear, maybe catch a glimpse of your naked pussy or ass."'
@@ -1816,12 +1816,12 @@ if $ARGS[0] = 'hypnoDress':
 
 		'He throws your panties in the garbage.'
 		hypnoPanty = 1
-		sleepQW['bedPanty'] = 2
+		sleepVars['bedPanty'] = 2
 
 	else
 		'"Get dressed, <i>Cunt</i>."'
 		'He watches you getting dressed with a small smile on his face, especially enjoying the sight of you not wearing underwear.</font>'
-		sleepQW['bedPanty'] = 2
+		sleepVars['bedPanty'] = 2
 	end
 	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>'
 
@@ -2205,7 +2205,7 @@ if $ARGS[0] = 'hypnoRandom':
 		*clr & cla
 		hypnoRandomCounter = 0
 		hypnoPanty = 1
-		sleepQW['bedPanty'] = 2
+		sleepVars['bedPanty'] = 2
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		'"Listen, Cunt. You no longer like to wear panties ever again. You get off on the thought that people may see your naked pussy or ass. Just the thought of it will make you wet. You won''t ever think of putting them on anymore every again." He commands you to strip off your panties and hand them to him.'
 
@@ -2236,7 +2236,7 @@ if $ARGS[0] = 'hypnoRandom':
 		end
 
 		hypnoPanty = 1
-		sleepQW['bedPanty'] = 2
+		sleepVars['bedPanty'] = 2
 
 	! sveta will now think it''s normal for pavlov to check if she is not wearing panties before their sessions.
 	elseif hypnoCheckPanties ! 1 and rand(1,2) = 1 and hypnoPanty = 1:
@@ -3341,7 +3341,7 @@ $RestTherapyVariables ={
     killvar 'hypnoPanty'
     killvar 'hypnoCheckPanties'
     killvar 'hypnoFlashGreet'
-	sleepQW['bedPanty'] = 0
+	sleepVars['bedPanty'] = 0
     killvar 'hypnoBra'
     killvar 'hypnoClothes'
     killvar 'hypnoStage'

locations/therapist_hotel.qsrc

@@ -166,12 +166,13 @@ if $ARGS[0] = 'event2':
 		*clr & cla
 		minut += 2
 		gs 'stat'
-		
+		'<center><video autoplay loop <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_shower_fondle.mp4"></video></center>'
 		'"Today is an important day for you", the therapist said. “You will feel your heart flutter with love every time you see me, no matter if it''s at the clinic or out in public, as we begin your mental training. It will seem as if you are actually in love with me and you want to stay by my side every chance you get. It is imperative that you act the part when I take you out of your training if you intend to be my wife in real life. There will be times when I need you to do something for me, so when I snap, you will return to that dark room. Do you get it, wife?"'
 		
 		act '"Yes" - (continue)':
 			*clr & cla
-			minut+= 5
+			minut += 5
+			
 			'"Wonderful, now remember, a clean wife is a happy wife. I will join you this time, to make sure you are completely clean." He says and takes your hand and pulls you into the bathroom and helps you get undressed, feeling you up each chance he gets. "Your young body is incredible".'
 			
 			act 'Go take a shower':
@@ -266,13 +267,10 @@ if $ARGS[0] = 'event2_shower':
 			*clr & cla
 			minut += 5
 			therapistQW['escaped'] = 1
-			gs 'clothing', 'wear', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
-			gs 'panties', 'wear', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
-			gs 'bras', 'wear', $lastwornbratype['therapist'], lastwornbranumber['therapist']
-			
-			gs 'clothing', 'dispose'
-			gs 'panties', 'dispose'
-			gs 'bras', 'dispose'
+
+			gs 'clothing', 'dispose', $lastwornclothingtype['therapist'], lastwornclothingnumber['therapist']
+			gs 'panties', 'dispose', $lastwornpantytype['therapist'], lastwornpantynumber['therapist']
+			gs 'bras', 'dispose', $lastwornbratype['therapist'], lastwornbranumber['therapist']
 
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 			'You don''t know why, but you feel this isn''t right. You can''t put your finger on why but this man isn''t your lover. As soon as you bite down hard on his cock, he screams out in pain. This wakes you up from your dreamlike state. Not sticking around, you grab a nearby robe and run out of the hotel room and into the night.'
@@ -295,7 +293,7 @@ if $ARGS[0] = 'event3':
 		minut += 2
 		'"Good" he says and snaps his fingers again and you come out of your trance. "My dear, thank you for coming over, I really hope you had a good day" he says and gives you a kiss, which you return. "Sorry about being a bad host. This place is a mess, I''ve not had time to clean up" he says and your mind triggers and you remove your clothes, fold them up nicely, place then on the bed, then begin to clean up the hotel room.'
 
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_clean.webp"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/therapist/hotel_clean.jpg"></center>'
 
 		$lastwornclothingtype['therapist'] = $clothingworntype
 		lastwornclothingnumber['therapist'] = clothingwornnumber