Merge remote-tracking branch 'Hornguy6/master'

locations/bedrPar.qsrc

@@ -171,20 +171,26 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			else
 				sisterdialog = 1
 
-				if locat['Anya'] = 1:
+				if locat['Anya'] = 26 or (locat['Anya'] = 1 and locat['Anya_party_day'] >= daystart - 1):
+					if sisboypartyQW = 1: sisboypartyQW = 2
+					if sisboyparty = -1: sisboyparty = 1
+					'A drunken <a href="exec:gt ''sistersleep'', ''drunk_after_party''">Anya</a> is sound asleep in her bed.'
+				elseif locat['Anya'] = 1:
 					'<a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
 				elseif locat['Anya'] = 4:
 					sisterdialog = 3
 					'<a href="exec:gt ''sister_chat'', ''talking''">Anya</a> is getting ready to go out.'
 				elseif locat['Anya'] = 15:
-					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
+					if anyaQW['bathroom_dildos'] > 0:
+						gt'sister_chat','bathroom_dildo_talk1'
+					elseif sisterQW['sex_room'] > 0:
+						gt'sister_chat','sex_room_talk1'
+					end
 					'<a href="exec:gt ''sister_chat'', ''talking''">Anya</a> is sitting on her bed, reading a book.'
 				elseif locat['Anya'] = 26 or (locat['Anya'] = 1 and locat['Anya_party_day'] >= daystart - 1):
 					if sisboypartyQW = 1: sisboypartyQW = 2
 					if sisboyparty = -1: sisboyparty = 1
-					'A drunken Anya is sound asleep in her bed.'
-					!! In the future should point to 'sistersleep', 'drunk_after_party' when that content is added again
-					!! 'A drunken <a href="exec:gt ''sistersleep'', ''drunk_after_party''">Anya</a> is sound asleep in her bed.'
+					'A drunken <a href="exec:gt ''sistersleep'', ''drunk_after_party''">Anya</a> is sound asleep in her bed.'
 				end
 			end
 		end

locations/booty_call.qsrc

@@ -18,22 +18,11 @@ if $ARGS[0] = 'fuckbuddy_scheduler2':
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
-		if $npc_rel_type[$FuckBuddy[i]] = 'sugar_daddy':
-			if npc_sugar_daddy_timer[$FuckBuddy[i]] - (npc_rel[$FuckBuddy[i]] / 10) > daystart:
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-				
-			elseif (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-				sugar_daddy_call[$FuckBuddy[i]] = 1
-				gs 'booty_call', 'fuckbuddy_scheduler3'
-			else
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-			end
+
+		if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
+			gs 'booty_call', 'fuckbuddy_scheduler3'
 		else
-			if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-				gs 'booty_call', 'fuckbuddy_scheduler3'
-			else
-				npc_no_booty_call[$FuckBuddy[i]] = daystart
-			end
+			npc_no_booty_call[$FuckBuddy[i]] = daystart
 		end
 		i += 1
 		gs 'booty_call', 'fuckbuddy_scheduler2'
@@ -52,22 +41,14 @@ if $ARGS[0] = 'sugar_daddy_scheduler2':
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
-		if $npc_rel_type[$sugar_daddy[i]] = 'sugar_daddy':
-			if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
-				npc_no_booty_call[$sugar_daddy[i]] = daystart
-				
-			elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
-				sugar_daddy_call[$sugar_daddy[i]] = 1
-				gs 'booty_call', 'sugar_daddy_scheduler3'
-			else
-				npc_no_booty_call[$sugar_daddy[i]] = daystart
-			end
+		if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
+			npc_no_booty_call[$sugar_daddy[i]] = daystart
+			
+		elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
+			sugar_daddy_call[$sugar_daddy[i]] = 1
+			gs 'booty_call', 'sugar_daddy_scheduler3'
 		else
-			if (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
-				gs 'booty_call', 'sugar_daddy_scheduler3'
-			else
-				npc_no_booty_call[$sugar_daddy[i]] = daystart
-			end
+			npc_no_booty_call[$sugar_daddy[i]] = daystart
 		end
 		i += 1
 		gs 'booty_call', 'sugar_daddy_scheduler2'

locations/exercise.qsrc

@@ -531,9 +531,11 @@ if $ARGS[0] = 'tier1':
 	if ARGS[1] = 0:
 		minut += 15
 		mult = 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += 15
 	else
 		minut += ARGS[1]
 		mult = (ARGS[1]-1)/15 + 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += ARGS[1] / 2
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
@@ -571,6 +573,7 @@ if $ARGS[0] = 'tier1':
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop1'
+	stat['last_workout_trig'] = 1
 	killvar 'mcnt'
 	killvar 'mult'
 end
@@ -579,9 +582,11 @@ if $ARGS[0] = 'tier2':
 	if ARGS[1] = 0:
 		minut += 15
 		mult = 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += 15
 	else
 		minut += ARGS[1]
 		mult = (ARGS[1]-1)/15 + 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += ARGS[1] / 2
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
@@ -619,6 +624,7 @@ if $ARGS[0] = 'tier2':
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop2'
+	stat['last_workout_trig'] = 1
 	killvar 'mcnt'
 	killvar 'mult'
 end
@@ -627,9 +633,11 @@ if $ARGS[0] = 'tier3':
 	if ARGS[1] = 0:
 		minut += 15
 		mult = 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += 15
 	else
 		minut += ARGS[1]
 		mult = (ARGS[1]-1)/15 + 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += ARGS[1]
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
@@ -667,6 +675,7 @@ if $ARGS[0] = 'tier3':
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop3'
+	stat['last_workout_trig'] = 1
 	killvar 'mcnt'
 	killvar 'mult'
 end
@@ -675,9 +684,11 @@ if $ARGS[0] = 'tier4':
 	if ARGS[1] = 0:
 		minut += 15
 		mult = 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += 15
 	else
 		minut += ARGS[1]
 		mult = (ARGS[1]-1)/15 + 1
+		if pcs_traits['fitness_freak'] = 1: pcs_horny += ARGS[1]
 	end
 
 	gs 'exercise', 'get_sport_clothes_exercise_bonus'
@@ -715,6 +726,7 @@ if $ARGS[0] = 'tier4':
 	end
 	mcnt += 1
 	if mcnt < mult: jump 'timeexploop4'
+	stat['last_workout_trig'] = 1
 	killvar 'mcnt'
 	killvar 'mult'
 end

locations/npcgeneratec.qsrc

@@ -95,6 +95,8 @@ end
 !! Flag for virginity
 if npctempc2[1] < 20:
 	npc_sexskill[$npclastgenerated] = 0
+else
+	npc_sexskill[$npclastgenerated] = rand(1,100)
 end
 
 
@@ -587,9 +589,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	2 = casual relationship 
 !!	3 = serious relationship
 	npc_goal[$npclastgenerated] = rand(1,3)
-
+	if npc_goal[$npclastgenerated] = 1:
+		$npc_rel_goal[$npclastgenerated] = 'sex'
+	elseif npc_goal[$npclastgenerated] = 2:
+		$npc_rel_goal[$npclastgenerated] = 'casual'
+	elseif npc_goal[$npclastgenerated] = 3:
+		$npc_rel_goal[$npclastgenerated] = 'serious'
+	end
 !!	npc_fidelity is how they will behave in a relationship
-!!	1-3 = will cheat on you and others with no guilt
+!!	1-4 = will cheat on you and others with no guilt
 !!	5-6 = will cheat on others with you
 !!		5 = has been cheating and feels guilty
 !!		6 = cheats on them with you for the first time
@@ -674,6 +682,17 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		end
 	end
 	
+	npc_manscaped[$npclastgenerated] = rand(0,2) - npc_neat[$npclastgenerated]
+	if npc_manscaped[$npclastgenerated] < 1:
+		npc_manscaped[$npclastgenerated] = 0
+		$npc_pubes[$npclastgenerated] = 'shaved'
+	elseif npc_manscaped[$npclastgenerated] = 1:
+		$npc_pubes[$npclastgenerated] = 'trimmed'
+	elseif npc_manscaped[$npclastgenerated] = 2:
+		$npc_pubes[$npclastgenerated] = 'bush'
+	end
+	
+	
 	!! if npc_argumentative = 1: they will get into more arguments with you about things
 	!! it is also harder to persuade them
 	npc_argumentative[$npclastgenerated] = rand(0,2)
@@ -710,7 +729,6 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	
 !! ------------------------- sex related preferences ----------------------------------
 
-!!	if rand(0,1) >= 1 and npc_risktaker[$npclastgenerated] ! 1:
 	if rand(0,1) >= 1:
 !!		if npc_condom_conscious = 1: they will use condoms but can be talked out of it
 !!		if npc_condom_conscious = 2: they will always insist on using condoms unless you are in a committed relationship and/or trying for a baby
@@ -719,7 +737,6 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		else
 			npc_condom_conscious[$npclastgenerated] = rand(-2,2)
 		end
-!!	elseif npc_diligent[$npclastgenerated] ! 1:
 	else
 !!		if npc_no_condoms = 1: they have a preference for skipping condoms but can be talked into using one
 !!		if npc_no_condoms = 2: they will never use a condom no matter what
@@ -729,6 +746,14 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_no_condoms[$npclastgenerated] = rand(-2,2)
 		end
 	end
+	if npc_condom_conscious[$npclastgenerated] < 0: npc_condom_conscious[$npclastgenerated] = 0
+	if npc_no_condoms[$npclastgenerated] < 0: npc_no_condoms[$npclastgenerated] = 0
+	
+	if rand(1,50) = 1:
+		npc_latex_allergy[$npclastgenerated] = 1
+		npc_no_condoms[$npclastgenerated] = 1
+		npc_condom_conscious[$npclastgenerated] = 0
+	end
 
 !! Preferred sexual position
 	npc_fav_pos[$npclastgenerated] = rand(1,7)
@@ -752,6 +777,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	!! npc_sex_speed determines whether they like it slow, steady, or fast and will cause them to select that speed more frequently
 	!! 1 is slow, 2 is steady, 3 is fast/rough
 	npc_sex_speed[$npclastgenerated] = rand(1,3)
+	
+	
+	npc_sex_volume[$npclastgenerated] = rand(0,3)
+	!! npc_sex_volume refers to how much noise they make during sex
+	!! npc_sex_volume = 0: virtually quiet during sex
+	!! npc_sex_volume = 1: grunting noises only
+	!! npc_sex_volume = 2: will add dirty talk
+	!! npc_sex_volume = 3: loud "obnoxious" noises
+	
 	if npc_sex_speed[$npclastgenerated] = 1 and rand(1,3) = 1:
 		!! npc has a tendency to be overly gentle and cautious
 		npc_gentle_lover[$npclastgenerated] = 1
@@ -826,11 +860,13 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	else
 		!!failsafe
 		npc_sexdrive[$npclastgenerated] = rand(1,10)
+		if npc_sexdrive[$npclastgenerated] > 5: npc_energetic[$boy] = rand(0,1)
 	end
 	
 	!! if npc_sex_stamina determines how long they can last in bed without cumming
+	npc_sex_stamina[$npclastgenerated] = rand(1,10)
 	
-	if rand(1,10) <= 4:
+!!{	if rand(1,10) <= 4:
 		npc_sex_stamina[$npclastgenerated] = rand(3,5)
 	elseif rand(1,10) <= 3:
 		npc_sex_stamina[$npclastgenerated] = rand(1,3)
@@ -841,7 +877,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	else
 		!!failsafe
 		npc_sex_stamina[$npclastgenerated] = rand(1,10)
-	end
+	end}
 
 	!! npc_spanker determines whether or not they''re into spanking during sex
 	if rand(1,3) = 1: npc_sex_spanker[$npclastgenerated] = 1

locations/npcpreservec.qsrc

@@ -102,6 +102,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
 	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
 	npc_goal[$npclastsaved]			= npc_goal[$npctemp]
+	$npc_rel_goal[$npclastsaved]			= $npc_rel_goal[$npctemp]
 	
 !!	relationship ideals/stats
 	
@@ -126,11 +127,13 @@ if mid($npctemp,1,1) = 'C':
 	npc_messy[$npclastsaved] 		= npc_messy[$npctemp]
 	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
 	
+	npc_manscaped[$npclastsaved]		= npc_manscaped[$npctemp]
 	npc_argumentative[$npclastsaved]	= npc_argumentative[$npctemp]
 	npc_competitive[$npclastsaved]		= npc_competitive[$npctemp]
 	npc_insecure[$npclastsaved] 		= npc_insecure[$npctemp]
 	npc_condom_conscious[$npclastsaved] = npc_condom_conscious[$npctemp]
 	npc_no_condoms[$npclastsaved] 		= npc_no_condoms[$npctemp]
+	npc_latex_allergy[$npclastsaved] 	= npc_latex_allergy[$npctemp]
 	npc_caretaker[$npclastsaved] 		= npc_caretaker[$npctemp]
 	npc_childfree[$npclastsaved]		= npc_childfree[$npctemp]
 	npc_abusive[$npclastsaved] 			= npc_abusive[$npctemp]
@@ -144,6 +147,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
 	$npc_fav_pos[$npclastsaved]		= $npc_fav_pos[$npctemp]
 	npc_sex_speed[$npclastsaved]	= npc_sex_speed[$npctemp]
+	npc_sex_volume[$npclastsaved]	= npc_sex_volume[$npctemp]
 	npc_gentle_lover[$npclastsaved]	= npc_gentle_lover[$npctemp]
 	npc_dirty_lover[$npclastsaved]	= npc_dirty_lover[$npctemp]
 	npc_sensual_lover[$npclastsaved]= npc_sensual_lover[$npctemp]

locations/pav_commcenter.qsrc

@@ -48,7 +48,6 @@ if $ARGS[0] ! 'XXX':
 
 	if month > 8 and ml_guitarlesson['advertisement']  = 0: gt 'music_guitarlesson', 'advertisement'
 
-	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
 
 	if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the sports section': gt 'gdksport', 'start'
 
@@ -67,6 +66,8 @@ if $ARGS[0] ! 'XXX':
 	!! ballet career
 	gs 'core_library', 'init'
 
+	act 'Walk to the bus station (0:01)': minut += 1 & gt 'bus', 'community'
+	
 	act 'Wait': gs 'obj_din', 'wait'
 
 	if locat['Anya'] = 10: 'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'

locations/pav_pharmacy.qsrc

@@ -193,25 +193,31 @@ if $ARGS[0] = 'buy_condoms':
 			elseif pharmacyfirstbirthcontrol = 1:
 				'"Are you seeing someone new?" Luda asks curiously as she gets a box of rubbers and places in in a bag. "Or just being careful? I thought you were already on birth control."'
 				if birth_control['using_bc'] > 0:
-					act'Someone new':
-						cla & *nl
-						'"Someone new," you smile. "Haven''t gotten around to making sure they''re clean yet."'
-						'"Well I hope you do it soon." Her eyes twinkle mischeviously and she leans in with a hand cupped around her mouth. "I prefer bareback too."'
-						act 'Continue shopping': gt $loc_s, $args_s
-					end
-					
-					act'Hookups':
-						cla & *nl
-						'"I''ve been having a lot of one night stands lately," you tell her.'
-						'"Ahh. Glad to know my niece is popular <i>and</i> smart," she winks, adding the condoms to your purchase.'
-						act 'Continue shopping': gt $loc_s, $args_s
-					end
-					
-					act'Just being safe':
-						cla & *nl
-						'"Just being safe," you shrug. "Birth control can fail. Condoms can too. Better if I use both, isn''t it?"'
-						'"Good girl." She smiles at you proudly and adds the condoms to your purchase.'
+					if birth_control['think_safe'] = 0:
+						'"Still waiting for it to kick in," you smile ruefully.'
+						'"Oh! Silly me!" Luda rolls her eyes in self-deprecating fashion. "Of course. And I call myself a pharmacist! Well good on you for keeping safe in the mean time!"'
 						act 'Continue shopping': gt $loc_s, $args_s
+					else
+						act'Someone new':
+							cla & *nl
+							'"Someone new," you smile. "Haven''t gotten around to making sure they''re clean yet."'
+							'"Well I hope you do it soon." Her eyes twinkle mischeviously and she leans in with a hand cupped around her mouth. "I prefer bareback too."'
+							act 'Continue shopping': gt $loc_s, $args_s
+						end
+						
+						act'Hookups':
+							cla & *nl
+							'"I''ve been having a lot of one night stands lately," you tell her.'
+							'"Ahh. Glad to know my niece is popular <i>and</i> smart," she winks, adding the condoms to your purchase.'
+							act 'Continue shopping': gt $loc_s, $args_s
+						end
+						
+						act'Just being safe':
+							cla & *nl
+							'"Just being safe," you shrug. "Birth control can fail. Condoms can too. Better if I use both, isn''t it?"'
+							'"Good girl." She smiles at you proudly and adds the condoms to your purchase.'
+							act 'Continue shopping': gt $loc_s, $args_s
+						end
 					end
 				else
 					gs'pav_pharmacy', 'luda_stopped_bc'
@@ -757,7 +763,7 @@ if $ARGS[0] = 'buy_morning_after':
 		act'He didn''t pull out':gt 'pav_pharmacy', 'morning_after_no_pullout_meek'
 		act'He didn''t pull out (annoyed)':gt 'pav_pharmacy', 'morning_after_no_pullout_annoyed'
 		if stat['last_broken_condom'] >= daystart - 3:
-			act'The condom broke':gt 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
+			act'The condom broke':gs 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
 		end
 		if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_meek'
@@ -783,7 +789,7 @@ if $ARGS[0] = 'buy_morning_after':
 			act'I made a mistake':gt 'pav_pharmacy', 'morning_after_mistake_open'
 			act'He didn''t pull out (annoyed)':gt 'pav_pharmacy', 'morning_after_no_pullout_annoyed'
 			if stat['last_broken_condom'] >= daystart - 3:
-				act'The condom broke':gt 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
+				act'The condom broke':gs 'pav_pharmacy', 'buy_morning_after_condom_broke_meek'
 			end
 			if birth_control['condom_stealth'] >= daystart - 3:
 			act'I got stealthed':gs 'pav_pharmacy', 'morning_after_stealth_open'
@@ -1062,6 +1068,13 @@ if $ARGS[0] = 'morning_after_warning':
 		'"I can''t wait until it does," Luda sighs, rolling her eyes to the heavens.'
 		gs 'pav_pharmacy', 'buy_morning_after_end'
 	else
+		act'No thanks':
+			cla & *nl
+			'"I''ll be okay Aunt," you say.'
+			'"Not if this is any indication," Luda replies dryly.'
+			gs 'pav_pharmacy', 'buy_morning_after_end'
+		end
+		
 		act'I prefer condoms':
 			if preziktype = 0:
 				mc_inventory['equipped_condoms'] += 5

locations/pav_residential.qsrc

@@ -203,6 +203,19 @@ end
 if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1
 	*clr & cla
+	if month >= 11 or month <= 3:
+		if hour >= 8 and hour <= 21:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswinter.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavreswintern.jpg"></center>'
+		end
+	else
+		if hour >= 8 and hour <= 21:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn.jpg"></center>'
+		end
+	end
 	npcdaycheck[54] = daystart
 	gs 'stat'
 

locations/pav_train_hall.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pavstation'
+	
 	act 'Walk to the Market (0:03)': minut += 3 & gt 'pav_market'
 	act 'Walk to the Commercial area (0:10)': minut += 10 & gt 'pav_commercial'
 	act 'Walk to the Residential area (0:15)': minut += 15 & gt 'pav_residential'
@@ -63,6 +63,7 @@ if $ARGS[0] = '':
 	act 'Walk to the Five Eight estate (0:15)': minut += 15 & gt 'pav_complex', 'start'
 	act 'Walk to the highway (0:15)': minut += 15 & nroad = 20 & gt 'road'
 	act 'Walk to Pushkin (0:15)': minut += 15 & nroad = 19 & gt 'pushkin'
+	act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pavstation'
 
 	if transportVars['trainpass_day'] > daystart:
 		func('transport_functions', 'display_trainpass_time')
@@ -85,18 +86,11 @@ if $ARGS[0] = '':
 	end
 
 	if cleanDailypay > 0:
-		act 'Collect your salary':
-			menu_off = 1
-			*clr & cla
-			'<center><h2>Pavlovsk train station interior</h2></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-			money += cleanDailypay
-			cleanDailypay = 0
-			minut += 3
-			gs 'stat'
-			'When you are done cleaning all the places you were told to clean, you go to the cashier and collect your well-earned salary.'
-			act 'Continue':minut += 1 & gt 'pav_train_hall'
-		end
+		money += cleanDailypay
+		*nl
+		'When you are done cleaning all the places you were told to clean, you go to the manager''s office and collect your <<cleanDailypay>><b>₽</b> pay.'
+		cleanDailypay = 0
+		gs 'stat'
 	end
 
 	*nl
@@ -122,8 +116,8 @@ if $ARGS[0] = '':
 
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
-
-		if tovarL > 0:act 'Sell your goods to passengers':gt 'pav_train_hall_events', 'trinkets'
+	
+		if tovarL > 0:'You could <a href="exec:gt ''pav_train_hall_events'', ''trinkets''">try to sell some trinkets</a> to some of the passengers.'
 	end
 
 	act 'Wait':gs 'obj_din', 'wait'

locations/sex_ev_morning.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'morning_menu1':
 		elseif $sex_ev['loc'] ! 'pc_home':
 			act'Prepare to leave':gs'sex_ev_morning', 'head_out'
 		else
-			act'Say goodbye to <<$npc_firstname[$boy]>>':gt'sex_ev_morning', 'npc_leave'
+			gs'sex_ev_leave', 'npc_leave'
 		end
 		
 		if $clothingworntype = 'nude':

locations/stat.qsrc

@@ -266,6 +266,12 @@ gs 'spellTimer', prevtotmin, totminut
 !! deodorant
 if deodorant_on = 1 and totminut > deodorant_time: gs 'sweat', 'remove_deo'
 
+!! exercise tracking
+if stat['last_workout_trig'] = 1: 
+	stat['last_workout_trig'] = 0
+	stat['last_workout'] = totminut
+end
+
 !!painkiller
 if pain['killer'] > 0:
 	if pain['killer'] = 1: pain_timer = totminut - 2