Updated the thoughts to work with the new sleep cycle system.

locations/mod_wlife.qsrc

@@ -1,8 +1,9 @@
 # mod_wlife
 
 !! Registering the mod_wlife_hotelroom as a home location with the main game 
-if $func('homes_properties', 'get_property_code', 'mod_wlife_hotelroom') ! 'HotelRoom': 
+if hotel_registered = 0: 
 	gs 'homes_properties_attr', 'add_new_home_location', 'mod_wlife_hotelroom', '', 'HotelRoom'
+	hotel_registered = 1
 end
 
 !! Checking if the player is in Pavlovsk 
@@ -419,41 +420,43 @@ elseif wl_status['main'] > -1:
 	end
 
 	!!Thoughts & Okoro phone calls
-	if (($curloc = 'bed2' and $menu_loc = 'bed2') or ($curloc = 'mod_BroMod_bed2' and $menu_loc = 'mod_BroMod_bed2')) and $menu_arg = '' and menu_off = 0 and InSleep = 0 and (hour > 19 or hour < 8) and wl_thought['timer'] ! daystart:
+	!!if (($curloc = 'bed2' and $menu_loc = 'bed2') or ($curloc = 'mod_BroMod_bed2' and $menu_loc = 'mod_BroMod_bed2')) and $menu_arg = '' and menu_off = 0 and InSleep = 0 and (hour > 19 or hour < 8) and wl_thought['timer'] ! daystart:
+	if $curloc = 'pre_sleep_events' and $ARGS[0] = 'pre_sleep_events' and $ARGS[1] = 'mod_sleepevents' and (hour > 19 or hour < 8) and wl_thought['timer'] ! daystart:
 		if (wl_timer['startday'] + 14) < daystart and wl_thought['whore'] = 0 and wl_thought['timer_whore'] < daystart and wl_status['main'] > 4:
-			gt 'mod_wlife_thoughts', 'whore_0'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'whore_0'"
 		elseif wl_medical['status'] = 2 and wl_thought['pissing'] = 0 and wl_thought['timer_pissing'] < daystart and $wl_fetish['pissing'] ! 'blocked':
-			gt 'mod_wlife_thoughts', 'pissing'
-		elseif wl_thought['rimjob'] = 1:
-			gt 'mod_wlife_thoughts', 'rim_whore'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'pissing'"
+		elseif wl_thought['rimjob'] = 1  and $wl_fetish['rimjob'] ! 'blocked':
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'rim_whore'"
 		elseif wl_passport = 1 and wl_thought['passport'] = 0:
-			gt 'mod_wlife_thoughts', 'passport'
-		elseif wl_volya['status'] = 3:
-			gt 'mod_wlife_thoughts', 'volya_car_bj'
-		elseif wl_volya['status'] = 5 and wl_volya['relationship'] = 1:
-			gt 'mod_wlife_thoughts', 'volya_car_sex'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'passport'"
+		elseif wl_volya['status'] > 2 and wl_thought['volya_car_bj'] = 0: 
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'volya_car_bj'"
+		elseif wl_volya['status'] = 5 and wl_volya['relationship'] = 1 and wl_thought['volya_car_sex'] = 0:
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'volya_car_sex'"
 		elseif wl_volya['status'] = 5 and wl_volya['relationship'] ! 1:
 			wl_volya['status'] = 6
-		elseif wl_shura['status'] = 9:
-			gt 'mod_wlife_thoughts', 'shura_bj'
+		elseif wl_shura['status'] > 8 and wl_thought['shura_bj'] = 0:  
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'shura_bj'"
 		elseif wl_iosif['pissing'] = 1 and $wl_fetish['pissed_on'] = '':
-			gt 'mod_wlife_thoughts', 'piss_whore'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'piss_whore'"
 		elseif wl_homeless['status'] > 1 and wl_thought['homeless'] = 0:
-			gt 'mod_wlife_thoughts', 'homeless_aftermath'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'homeless_aftermath'"
 		elseif wl_thought['atm'] = 1 and wl_thought['timer_atm'] < daystart:
-			gt 'mod_wlife_thoughts', 'ass_to_mouth'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'ass_to_mouth'"
 !!ToDo: Prostitution in pavlovsk
 !!	elseif wl_thought['pav_total'] > 0 and wl_thought['pav_prost'] = 0:
 !!		gt 'mod_wlife_thoughts', 'pav_prost'
 		elseif wl_thought['sacha'] = 0 and wl_sacha['status'] = 2:
-			gt 'mod_wlife_thoughts', 'sacha'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'sacha'"
 		elseif wl_okoro['status'] = 2 and (wl_timer['startday'] + 49) < daystart and wl_okoro['timer'] ! daystart and week ! 7:
-			gt 'mod_wlife_phone', 'okoro'
+			$sleep_events_priority[] = "gt 'mod_wlife_phone', 'okoro'"
 		elseif wl_thought['BDSM'] = 0 and wl_irina['status'] > 1:
-			gt 'mod_wlife_thoughts', 'BDSM'
+			$sleep_events_priority[] = "gt 'mod_wlife_thoughts', 'BDSM'"
 		end
 	end
-end
+
+end 
 
 !!Removes the vanilla Vadim Bely
 if npc_QW['A113'] ! 2:
@@ -471,4 +474,5 @@ end
 !!Blocks vanilla prostitution event in the residential area
 if pav_residential_prost_day ! daystart: pav_residential_prost_day = daystart
 
+
 --- mod_wlife ---------------------------------

locations/mod_wlife_thoughts.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'whore_0':
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'No, you don''t want to think about that and try to force yourself to think about something else, something nice. It''s dragging down your mood, but after a few minutes you have successfully pushed the thought aside. You can still feel it lurking in the depths of your mind and it won''t stay suppressed forever.'
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	else
 		act 'Try to suppress the memory (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -37,6 +37,7 @@ if $ARGS[0] = 'whore_1':
 	*clr & cla
 	minut += 1
 	wl_thought['whore'] = 1
+	wlife_thoughts_triggered = 1
 	gs 'stat'
 	if $ARGS[1] = 'picture_yes':
 		'<center><img <<$set_imgh>> src="mod/wlife/images/sex/story/start/start.jpg"></center>'
@@ -57,7 +58,7 @@ if $ARGS[0] = 'whore_1':
 		'"No," you whisper. It''s not true. You aren''t a whore and you have to keep reminding yourself of that fact.'
 		'You don''t feel better about your situation, but about yourself.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'Yes, that''s the real you':
@@ -68,7 +69,7 @@ if $ARGS[0] = 'whore_1':
 		'Yes it is, you have become a whore and even so, nobody can see the degrading writing anymore, it feels like it''s still there.'
 		'You don''t feel better about yourself, but you accept your new role and the situation you''re in a little bit more.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -92,7 +93,7 @@ if $ARGS[0] = 'pissing':
 			gs 'stat'
 			'No, you don''t want to think about that and try to force yourself to think about something else, something nice. It''s dragging down your mood, but after a few minutes you have successfully pushed the thought aside. You can still feel it lurking in the depths of your mind and it won''t stay suppressed forever.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	else
 		act 'Try to suppress the memory (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -111,7 +112,7 @@ if $ARGS[0] = 'pissing':
 			$wl_fetish['pissing'] = 'no'
 			'... doesn''t react at all. If it happens again you''ll hold your nose and go through with it if you have no other choice, but it isn''t turning you on in any way.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 
 		act '... tingles pleasantly (Like it)':
@@ -121,7 +122,7 @@ if $ARGS[0] = 'pissing':
 			gs 'stat'
 			'... tingles pleasantly. Your pussy is wet just from thinking about it. It''s such a humiliating act and you may have never thought about it before, but you can''t deny the fact that you feel aroused by the thought of somebody watching you piss.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 end
@@ -148,7 +149,7 @@ if $ARGS[0] = 'rim_whore':
 			$wl_fetish['rimjob'] = 'no'
 			'It''s the money and self preservation plays a role as well. It''s always a good idea to not piss off your client. If that means licking an asshole, you swallow your pride and do it.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 
 		act 'No, it was more than just the money (Like it)':
@@ -158,7 +159,7 @@ if $ARGS[0] = 'rim_whore':
 			gs 'stat'
 			'You have to accept the fact that it was more than just the money that made you do it. It''s hard to face that fact, but you can''t lie to yourself. You hide so much from your family and friends, being honest with yourself is more important than ever. And the truth is: You like it. Sure the money is nice, but something inside you get''s turned on by the humiliating and degrading act of licking a strangers ass.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 end
@@ -183,7 +184,7 @@ if $ARGS[0] = 'ass_to_mouth':
 			gs 'stat'
 			'No, you don''t want to think about that and try to force yourself to think about something else, something nice. It''s dragging down your mood, but after a few minutes you have successfully pushed the thought aside. You can still feel it lurking in the depths of your mind and it won''t stay suppressed forever.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	else
 		act 'Try to suppress the memory (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -204,7 +205,7 @@ if $ARGS[0] = 'ass_to_mouth':
 			$wl_fetish['atm'] = 'no'
 			'There is no way in hell that something like this will ever turn you on. Doing it for money? Yes, fine that is something you can go along with, but that''s it.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 
 		if $wl_fetish['rimjob'] = 'yes':
@@ -215,7 +216,7 @@ if $ARGS[0] = 'ass_to_mouth':
 				gs 'stat'
 				'You shrug. What''s the difference between licking an ass and taking something from it into your mouth? There isn''t for you. Your pussy even tingles a bit, when you think about a guy making you suck his dick, after fucking your ass.'
 
-				act 'Continue': gt $loc, $loc_arg
+				act 'Continue': gt 'pre_sleep_events', 'event_end'
 			end
 		end
 	end
@@ -247,7 +248,7 @@ if $ARGS[0] = 'passport':
 			wl_stats['acceptance'] -= 2
 			'What a stupid thing to think about. You''re of course <<$pcs_firstname>>. You put the fake passport back inside your '+iif(bag = 1, 'purse', 'pocket')+' and don''t waste another second thinking about it.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 
 		act '<<$wl_names[''first'']>>':
@@ -257,7 +258,7 @@ if $ARGS[0] = 'passport':
 			wl_stats['acceptance'] += 3
 			'You''re more her, the whore, than your old self, you finally admit to yourself. It doesn''t make yourself feel good to admit it, but you''re accepting your situation a bit more.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 end
@@ -267,6 +268,7 @@ if $ARGS[0] = 'volya_car_bj':
 	minut += 1
 	menu_off = 1
 	wl_thought['timer'] = daystart
+	wl_thought['volya_car_bj'] = 1
 	wl_volya['status'] = 4
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="mod/wlife/images/player/bed.jpg"></center>'
@@ -288,7 +290,7 @@ if $ARGS[0] = 'volya_car_bj':
 			wl_volya['relationship'] = 0
 			'You can''t stand him and probably never will. You can''t put your finger on it, but there is something about him that prevents you from trusting him.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 
@@ -297,7 +299,7 @@ if $ARGS[0] = 'volya_car_bj':
 		wl_volya['relationship'] = 1
 		'Maybe you were wrong about him. He promised to help you and even if he hasn''t done anything to help you yet, you''re starting to trust and like him.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	if npc_rel['A904'] > 30:
@@ -306,7 +308,7 @@ if $ARGS[0] = 'volya_car_bj':
 			wl_volya['relationship'] = 2
 			'There is no question about it, you like and trust him. He will definitely help you.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 end
@@ -316,6 +318,7 @@ if $ARGS[0] = 'volya_car_sex':
 	minut += 1
 	menu_off = 1
 	wl_thought['timer'] = daystart
+	wl_thought['volya_car_sex'] = 1
 	wl_volya['status'] = 6
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="mod/wlife/images/player/bed.jpg"></center>'
@@ -326,7 +329,7 @@ if $ARGS[0] = 'volya_car_sex':
 		wl_volya['relationship'] = 0
 		'It''s all transactional. You keep him on your side, so that he''ll keep helping you. If that means sleeping with him on occasion, so be it. Sometimes the tiny nagging voice in your head asks you if you''re unfair to him, but you push it aside and ignore it.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'You do like him':
@@ -334,7 +337,7 @@ if $ARGS[0] = 'volya_car_sex':
 		wl_volya['relationship'] = 2
 		'It''s time to acknowledge that you like him despite of who he works for. Sometimes the tiny nagging voice in your head asks you if you can really trust him, but you push it aside and ignore it.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -343,6 +346,7 @@ if $ARGS[0] = 'shura_bj':
 	minut += 1
 	menu_off = 1
 	wl_thought['timer'] = daystart
+	wl_thought['shura_bj'] = 1
 	if wl_adrian['status'] < 3: wl_homeless['good'] += 1
 	wl_shura['status'] = 10
 	gs 'stat'
@@ -354,7 +358,7 @@ if $ARGS[0] = 'shura_bj':
 		wl_shura['relationship'] = 0
 		'You don''t have to think long before you reach a conclusion. You only took pity on him. Nothing more nothing less. He may be into you and wants more, but that isn''t a road you want to go down with him.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'More than that':
@@ -362,7 +366,7 @@ if $ARGS[0] = 'shura_bj':
 		wl_shura['relationship'] = 2
 		'You don''t have to think long before you reach a conclusion. You like him even after all that has happened between you two, you can''t deny the fact that there is at least a friendship growing between you.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -385,7 +389,7 @@ if $ARGS[0] = 'piss_whore':
 			$wl_fetish['pissed_on'] = 'no'
 			'... still the case. If it happens again you''ll hold your nose and go through with it if you have no other choice, but it isn''t turning you on in any way.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 
 		act 'Not the case anymore (Like it)':
@@ -395,7 +399,7 @@ if $ARGS[0] = 'piss_whore':
 			if pcs_horny < 100: pcs_horny = 100
 			'... not the case anymore. You can feel it between your legs. Your pussy is wet just from thinking about it. It''s such a degrading act and maybe it''s your new life that''s slowly changing you, but you can''t deny the fact that you like it.'
 
-			act 'Continue': gt $loc, $loc_arg
+			act 'Continue': gt 'pre_sleep_events', 'event_end'
 		end
 	end
 end
@@ -418,7 +422,7 @@ if $ARGS[0] = 'homeless_aftermath':
 		wl_homeless['bad'] -= 1
 		'Of course you don''t want to go back to this rotten place! What a stupid question to ask yourself. You will never do it again, unless Georgiy forces you to.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'No, but helping that man felt nice':
@@ -428,7 +432,7 @@ if $ARGS[0] = 'homeless_aftermath':
 		gs 'stat'
 		'OK, it felt nice to give him a good time. You finally acknowledge that warm and fuzzy feeling inside you, even if the whole situation was disgusting. It feels good to be the one small sliver of hope in his life, but that doesn''t mean you will ever go back there on your own...'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'Maybe...':
@@ -439,7 +443,7 @@ if $ARGS[0] = 'homeless_aftermath':
 		'<center><img <<$set_imgh>> src="mod/wlife/images/player/pussy_wet.jpg"></center>'
 		'"Shit," you murmur when you push your hand between your legs and feel wetness. This can''t be true? Can it? Does it really turn you on being degraded like this? You shake your head in disbeliefe and pull your hand back. It was disgusting and vile, you tell yourself several times, but that doesn''t stop the tingling sensation between your legs.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -461,7 +465,7 @@ if $ARGS[0] = 'sacha':
 		gs 'stat'
 		'Why should there be a difference? Sucking somebody off for money and then using it to pay for drugs is the same as sucking somebody off for drugs. Sex is just sex. It''s not like somebody got hurt. It was a simple mutual and beneficial transaction. Nothing more and nothing less. In the end it doesn''t matter if you fuck somebody for money, drugs, happiness or even love. It''s all transactional.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'Yes, it was wrong (blocks further sex with him for drugs)':
@@ -472,7 +476,7 @@ if $ARGS[0] = 'sacha':
 		gs 'stat'
 		'This was a line you shouldn''t have crossed. The Belys forced you into prostitution, but nobody pressured you into buying drugs and especially not to use your body to get it. In this moment you swear to yourself you''ll never use your body like this again. Fucking for money? Fine, you have to do it to survive, but you won''t do it again for drugs.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 end
 
@@ -492,7 +496,7 @@ if $ARGS[0] = 'BDSM':
 		$wl_fetish['BDSM'] = 'no'
 		'It was her and only her. The pain was too much and if somebody else would have done it to you, you would have hated every second of it.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
 
 	act 'It was both (Like BDSM)':
@@ -502,8 +506,7 @@ if $ARGS[0] = 'BDSM':
 		'<center><video autoplay loop src="mod/wlife/images/punishment/whip/tits/escalation_3.mp4"></video></center>'
 		'You grab your nipple and pinch it. The sharp pain forces the memories to the surface and for a moment you''re back at her place, chained to the ceiling, helpless and aroused like crazy by it. A low moan escapes your mouth, when you remember how your tits felt, how red they looked at the end and how exquisite every touch of Irina... No... how exquisite every touch of your Mistress was.'
 
-		act 'Continue': gt $loc, $loc_arg
+		act 'Continue': gt 'pre_sleep_events', 'event_end'
 	end
-end
-
+end 
 --- mod_wlife_thoughts ---------------------------------