Merge remote-tracking branch 'Lusticon/bugfixes'

# Conflicts:
#	locations/mother.qsrc
#	locations/sister.qsrc

locations/LakeBoyDy.qsrc

@@ -7,8 +7,10 @@ if $ARGS[0] = 'ride':
 		gs'stat'
 
 		'You quickly get dressed and follow the fat man to his car. He guides you to an old Mitsubishi Pajero, and takes place behind the wheel while he invites you to relax in the passenger seat. Once you get in the car, he puts his hand on your knee as he starts the engine.'
-		'"My name is Vadim Bely... you can call me Mr. Bely. What''s your name, girl?"'
-		'You''re still a bit intimidated by his presence, and just say your name: "<<$pcs_nickname>>."'
+		if npc_QW['A113'] = 0 and belgangday = 0:
+			'"My name is Vadim Bely... you can call me Mr. Bely. What''s your name, girl?"'
+			'You''re still a bit intimidated by his presence, and just say your name: "<<$pcs_nickname>>."'
+		end
 		'Vadim slides his hand up your leg a little, and gently kneads your thigh as you drive through town, the engine roaring. Within minutes, you approach a five-storey apartment. Vadim parks the car in front of it and says: "Get out and follow me", not waiting for a response.'
 		act'Look around':
 			cls

locations/Nudelake.qsrc

@@ -65,7 +65,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				$lastwornbratype['swim'] = $braworntype
 				lastwornbranumber['swim'] = brawornnumber
 				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:

locations/Serge_kuh.qsrc

@@ -1700,7 +1700,6 @@ if $ARGS[0] = 'sex2':
 					*clr & cla
 					minut +=10
 					pcs_mood = 100
-					gs 'cum_manage'
 					gs 'cum_call','',$boy,1
 					pcs_hairbsh = 0
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex2-5.jpg"></center>'

locations/artemhome.qsrc

@@ -1196,7 +1196,8 @@ if $ARGS[0] = 'chat':
 			act 'Stop talking': gt 'artemhome', 'artemroom'
 		end
 !! This is triggered after Sveta has asked Artem to steal the video
-	elseif artemQW['artlie'] =1 and artemQW['dimkahelp'] ! daystart:
+!! dimaRevChoice ! 6 - Sveta did not ask Artem for extra help at school
+	elseif artemQW['artlie'] = 1 and artemQW['dimkahelp'] ! daystart and dimaRevChoice ! 6:
 		cla & clr
 		DimaRudeBlock = 1
 		artemQW['artlie'] = 2

locations/cikl.qsrc

@@ -113,7 +113,7 @@ end
 if week = 7 and masseuse['schedule_update'] ! daystart: gs 'masseuse_schedule','schedule_reset'
 
 !!modelling check
-if model_week ! (daystart - week) / 7:model_job_week = 0
+if model_week ! (daystart - week) / 7 and model['status'] > 0: model_job_week = 0
 
 !!acting strings to set available jobs
 if casting = 1:

locations/dimaRevenge.qsrc

@@ -9,6 +9,7 @@ menu_off = 1
 !! dimaDisco - Did you attend the disco?
 !! dimaTrain - Did you go to the train station?
 gs 'stat'
+if DimaRudeBlock = 0: DimaRudeBlock = 1
 
 if ARGS[0] = 1:
 	menu_off = 1
@@ -730,6 +731,9 @@ if dimaRevChoice = 3:
 			'"No wait! I''m sorry. I''ll stop everyone from talking. I swear. Jst don''t show that to anyone."'
 			'"That''s more like it. You have until the end of the day to get results, or else you know what will happen. Don''t you? I don''t want to see you in class until you get it done." He nods and heads into the hall. You breathe a sigh of relief. You were seriously scared there, but it was also exciting seeing him so scared himself. You think about following him around to make sure he keeps his word, but that would mean skipping class. You know he won''t cross you as long as you have dirt on him. You head to class.'
 			act 'Go to class':
+				!! needed to avoid school absences
+				gs 'gschool_lessons', 'morning' & school_period = 1
+
 				*clr & cla
 				'<center><b><font color="maroon">Classroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/engaged.jpg"></center>'

locations/din_van.qsrc

@@ -1505,7 +1505,10 @@ if $ARGS[0] = 'prvt_pee':
 			if isprok = 1 and mc_inventory['tampons'] > 0:
 				act 'Change tampon (0:02)':
 					*clr & cla
+					mc_inventory['tampons'] -=  1
+					isprok = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one, unpack it and carefully insert it into yourself.'
 
@@ -1514,10 +1517,13 @@ if $ARGS[0] = 'prvt_pee':
 			end
 	!!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
 	!!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
-			if isprokp = 1 and mc_inventory['sanitary_pads'] > 0:
+			if isprokp = 1 and mc_inventory['sanitary_pads'] > 0 and $pantyworntype ! 'none':
 				act 'Change pad (0:02)':
 					*clr & cla
+					mc_inventory['sanitary_pads'] -=  1
+					isprokp = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 					'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1626,7 +1632,10 @@ if $ARGS[0] = 'pblc_pee':
 			if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['tampons'] > 0 and bag = 1:
 				act 'Change tampon (0:02)':
 					*clr & cla
+					mc_inventory['tampons'] -=  1
+					isprok = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 					'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into yourself.'
 
@@ -1634,10 +1643,13 @@ if $ARGS[0] = 'pblc_pee':
 				end
 			end
 
-			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['sanitary_pads'] > 0 and bag = 1:
+			if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and mc_inventory['sanitary_pads'] > 0 and bag = 1 and $pantyworntype ! 'none':
 				act 'Change pad (0:02)':
 					*clr & cla
+					mc_inventory['sanitary_pads'] -=  1
+					isprokp = 1
 					minut += 2
+					pcs_mood -= 5
 					'<center><img <<$set_imgh>> src="images/pc/body/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 					'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 

locations/food.qsrc

@@ -179,7 +179,6 @@ if $ARGS[0] = 'bliny':
 		'You buy some bliny. The portions are fairly small.'
 		gs 'uni_cafe', 'sitting_choice'
 	else
-		'<center><img <<$set_imgh>> src="images/shared/food/blini.jpg"></center>'
 		'You eat some bliny. The portions are fairly small and<<$mtxt>>'
 		gs 'stat'
 		if food_loc = 1:

locations/foto.qsrc

@@ -22,6 +22,7 @@ if $ARGS[0] = 'start':
 	special_model['roll'] = rand(30,1400)
 	special_skill_model['roll'] = rand(1,500)
 	foto['documentary'] = rand(1,100)
+	act'Leave':gt'city_center'
 	act'Strip down':
 		cla & *clr
 		menu_off = 1

locations/foto_shoot.qsrc

@@ -45,6 +45,7 @@ if $ARGS[0] = 'model':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Alright, what kind of shoot? Clothing or swimsuits?"'
 		
+		act 'Look at something else':gt 'foto_shoot','model'
 		act'Clothing':
 			$modelfoto['shoot_type'] = 'catalog'
 			modelfoto['catalog'] += 1

locations/gschool_break.qsrc

@@ -481,7 +481,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			if soniaPS < 5:soniasextime += 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/soniabj.mp4"></video></center>'
-			'You go to the girls restroom to wash your hands and see Sonia on her knees with an open blouse and a cock in her mouth, enthusiastically deepthroating a boy you''ve never seen before.'
+			'You go to the boys restroom and see Sonia on her knees with an open blouse and a cock in her mouth, enthusiastically deepthroating a boy you''ve never seen before.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave':

locations/gschool_grounds.qsrc

@@ -437,7 +437,7 @@ if $ARGS[0] = 'bulding':
 			!!this should happen the first time Sveta enters school in a game and never again
 			gt 'Zvereva_events', 'christina_bu_1'
 		else
-			if rand(0,1) = 0:
+			if rand(0,1) = 0 or hour > 7:
 				gt 'gschool_lessons', 'morning'
 			else
 				if rand(0,3) = 0:

locations/gschool_jock_chats.qsrc

@@ -1496,6 +1496,7 @@ if $ARGS[0] = 'ivan':
 		if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 
 		if rand(0,4) = 0:
+			*clr
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/School/ivan2.jpg"></center>'
 			func('npc_reactions', 'general', 'A3')

locations/gschool_lessons.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'morning':
 		lernHome += 1
 
 		if SchoolSorev = 1: SchoolSorev = 0
-		gs 'gschool_socialchg', 'test'
+		if hour < 8: gs 'gschool_socialchg', 'test'
 	end
 		
 	if $breaktype ! 'first':

locations/gschool_lessons1.qsrc

@@ -1496,7 +1496,7 @@ if $ARGS[0] = 'history':
 				'It was an embarrassing experience, but the sudden adrenaline surge helps you to stay awake for the rest of the period.'
 			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
-		elseif daydream = 2:
+		elseif daydream = 3:
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			'You''re far too tired to pay attention in class today. Mrs. Sokoloff is droning on about the Tsar''s family and their life.'

locations/gschool_lessons2.qsrc

@@ -576,9 +576,8 @@ if $ARGS[0] = 'computer':
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 		end
 	end
-	if fuckornot > 2:
-		act 'Check the listings on "Fuck or Not"': $view_location = 'school' & gt 'komp_HF_or_not', 'fuckornot'
-	end
+	if fuckornot > 2: act 'Check the listings on "Fuck or Not"': $view_location = 'school_lesson' & gt 'komp_HF_or_not', 'fuckornot'
+	if hotornot >= 2: act 'Check the listings on "Hot or Not"': $view_location = 'school_lesson' & gt 'komp_HF_or_not', 'hotornot'
 end
 
 if $ARGS[0] = 'science':

locations/komp_HF_or_not.qsrc

@@ -23,6 +23,8 @@ if $ARGS[0] = 'fuckornot':
 	act 'Leave the site':
 		if $view_location = 'school':
 			gt 'gschool_lessons', 'short_break'
+		elseif $view_location = 'school_lesson':
+			gt 'gschool_lessons2', 'computer'
 		else
 			gt 'komp', 'browse'
 		end
@@ -54,6 +56,8 @@ if $ARGS[0] = 'hotornot':
 		if $view_location = 'school':
 			killvar 'access'
 			gt 'gschool_lessons', 'short_break'
+		elseif $view_location = 'school_lesson':
+			gt 'gschool_lessons2', 'computer'
 		else
 			gt 'komp', 'browse'
 		end

locations/lug.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'prut2':
 				if pcs_stren < 30: gs 'exp_gain', 'stren', 1
 				gs 'arousal', 'flash', 10, 'exhibitionism'
 				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and pcs_inhib >= 60:
+				if pcs_horny >= 80 and pcs_inhib >= 60 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'AS you strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you and carry on stripping.'
 					'Once you are naked you play around and have fun in the pond, enjoying the feel of the warm water on your body. The clean pond water refreshes and invigorates you.'

locations/medical_din.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'abortion':
 	abortionbirthdate = daystart
 
 	gs 'medical_din', 'remove_preg'
-	knowpregloss = 2
+	knowpregloss = 1
 
 	abortrand = rand(0, 10)
 	if age > 18:

locations/mey_vika_events.qsrc

@@ -580,7 +580,7 @@ if $ARGS[0] = 'park_meet':
 			elseif npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 18:
 				cla
 				if (month >= 5 and month <= 10) and (hour <= 20 and hour >= 8):
-					'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
+					'They are going to the beach and ask you to join them.'
 
 					if mesec = 0:
 						act 'Go with them to the beach':
@@ -603,7 +603,7 @@ if $ARGS[0] = 'park_meet':
 						end
 					end
 				elseif (month >= 11 or month <= 4) and (hour <= 20 and hour >= 8):
-					'Walking through the park, you meet Vicky and Vanya. They are going to the sauna and ask you to join them.'
+					'They are going to the sauna and ask you to join them.'
 
 					if mesec = 0:
 						act 'Go with them to the sauna':

locations/motherkafeboss.qsrc

@@ -196,6 +196,7 @@ if $ARGS[0] = 'dealbreaker':
 						if pcafejob = 2:'"Listen," he says. "Since you''ve found out the truth, our bargain doesn''t hold up anymore. If you want to stop that, you can even still work here, no strings attached. Like I said, I need another waitress anyways. How does that sound?"'
 
 						act'Leave without saying anything':
+							cla
 							pcafejob = 3
 							slavatalk = 3
 							*nl
@@ -888,6 +889,7 @@ if $ARGS[0] = 'cloth_fuck':
 	'<center><video autoplay loop src="images/locations/pavlovsk/cafe/wait_fuck.mp4"></video></center>'
 	'As usual, he wastes no time, not bothering to build up the tempo slowly but instead preferring to go straight to full fuck speed. The table rocks underneath you and creates a strange melody of squeaking wood, slapping flesh, and moans and grunts. In the middle of this hypnotic rhythm, you find your mind thinking of...'
 	*nl
+	slavafuck += 1
 	if slavafuck < 4:
 		act'Nothing in particular':
 			cla
@@ -1125,6 +1127,7 @@ if $ARGS[0] = 'cloth_fuck':
 					'Afterwards, you dutifully clean his cock, licking off your pussy juice and sucking out the remnants as you did before. He pulls up his trousers and leaves you.'
 					act'Continue':
 						*nl
+						cla
 						'Once you''re alone, your thoughts go back to when Slava was fucking you. Up until now, you used thoughts of your mother to keep yourself going during this time. You tried to remember that you were doing it for her so she wouldn''t have to but it didn''t help. You feel empty inside as you realize that thoughts of your mother no longer drive you.'
 
 						act'Find your panties and leave':
@@ -1157,6 +1160,7 @@ if $ARGS[0] = 'cloth_fuck':
 					'Afterwards, you dutifully clean his cock, licking off your pussy juice and sucking out the remnants as you did before. He pulls up his trousers and leaves you.'
 					act'Continue':
 						*nl
+						cla
 						'You sit alone in the room with Slava''s cum plastered across your face. Your thoughts drift back to how Slava''s cock felt inside of you. How big he was. How full you felt. Your pussy leaks onto the floor as you become lost in your thoughts, but you push these intrusive feelings away.'
 
 						act'Find your panties and leave':

locations/pav_disco.qsrc

@@ -249,7 +249,6 @@ if $ARGS[0] = '':
 						*clr & cla
 						'<center><b><font color="maroon">Disco</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/very_drunk_dance.jpg"></center>'
-						'You''re very drunk, but are having a lot of fun out on the dance floor anyway. You''re not paying attention to anyone else or even the music.'
 						if pcs_danc <= 30:
 							grupvalue[1] -= 4
 							grupvalue[2] -= 4

locations/pav_disco_coolkids.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'dimka':
 		act 'Go out on the dance floor':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
-			if grupTipe = 5:
+			if grupTipe = 5 or (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
 				'He ignores you and turns his back on you as you approach, shunning you.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			elseif npc_rel['A1'] >= 50 and fame['pav_slut'] < 250:
@@ -37,7 +37,12 @@ if $ARGS[0] = 'dimka':
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
 		'You see Dimka sitting at a table near the dance floor. He is dressed very stylishly and is in the middle of a small crowd of of people, mostly girls.'
-		if dimka_debt > 0:
+		if (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
+			'Dimka glares at you as you approach. "What the fuck do you want, slut?"'
+			'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
+			'He looks a little dumbfounded, but shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
+			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+		elseif dimka_debt > 0:
 			'The first thing Dimka does as you walk up is grab you by the arm and drag you aside so no one can hear him. "Do you have my money?"'
 			if money >= dimka_debt:
 				act 'Pay your debt':
@@ -99,11 +104,6 @@ if $ARGS[0] = 'dimka':
 		elseif fame['pav_slut'] >= 250:
 			'Dimka sees you approaching and gives you a blank look, his gaze cold and unblinking. "Do you really think I would talk to a whore like you?" he dryly states. He continues to stare you down until you finally leave.'
 			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
-		elseif (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
-			'Dimka glares at you as you approach. "What the fuck do you want, slut?"'
-			'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
-			'He looks a little dumbfounded, but shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
-			act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 		else
 			'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking before someone calls over to him and he smiles and waves back to them. "Sorry, I hope you don''t mind." He starts heading towards them - you could quickly ask him something or just let him go.'
 			if dimarudorient = 1: act 'Ask for some pale lady': gt 'pav_disco_coolkids', 'dim_drugs'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'dimka_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'You start dancing with him. He''s a pretty good dancer and you both enjoy dancing together for a while.'
 
-	if npc_rel['A1'] >= 80 and DimaRudeQW > 0:
+	if npc_rel['A1'] >= 80 and DimaRudeQW > 0 and DimaRudeBlock = 0:
 		'After the dance, Dimka holds onto your hand. "Let''s go outside."'
 
 		act 'Refuse':npc_rel['A1'] -= 5 & gt $loc, $loc_arg
@@ -882,7 +882,7 @@ if $ARGS[0] = 'igor_dance':
 		elseif IgorLoverQW = 0:
 			'While the two of you are dancing, you feel Igor''s hands wander to the small of your back and further down to your ass. He gives your ass a good squeeze.'
 
-			if DimaRudeQW > 0:
+			if DimaRudeQW > 0 and DimaRudeBlock = 0:
 				'Igor leans in close to your ear. "Dimka told me that you were a fantastic cocksucker. How about we go outside and you show me if he''s right?" he whispers.'
 				act 'Go outside with him':
 					cls

locations/pav_lake_nude.qsrc

@@ -90,7 +90,7 @@ if month >= 5 and month <= 9:
 				end
 				gs 'clothing', 'strip_all'
 				gs 'stat'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and CloPanties > 0:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passers-by do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:

locations/pav_pool.qsrc

@@ -186,11 +186,13 @@ if $ARGS[0] = 'lockerfemale':
 			gt 'pav_pool', 'pool'
 		end
 	else
+		delact 'Enter the pool area'
 		*nl
 		'You need to put some swimwear on first if you want to go in the pool.'
 		*nl
 	end
 	if pcs_makeup >= 2:
+		delact 'Enter the pool area'
 		*nl
 		'You need to wash your make-up off first if you want to go in the pool.'
 		*nl

locations/pav_shared_nestor.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'nestor_Dick':
 	'<<$npc_notes[$boy]>>'
 	'his mood is <<$nestor_mood>>'
 
-	'His dick is npc_dick[$boy] cm long with somehow maintained pubic hair.'
+	'His dick is <<npc_dick[$boy]>> cm long with somehow maintained pubic hair.'
 	''
 		if nestor_hj = 1:'-you have jerked him off'	
 			if nestor_hj > 1:'-you have jerked him off <<nestor_hj>> times' & if nestor_hjFail > 1:' and failed to make him cum with your hands <<nestor_hjFail>> times'

locations/pav_shared_oleg.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'oleg':
 		'<font color=#<<$oleg_font>>>"Hello <<$pcs_firstname>>, I think you have sperm on your clothes. Please go change."</a>'
 		act 'Leave': gt 'pav_shared_apt', 'start'	
 	! cum on belly, breasts, ass, pussy; visible only when nude
-	elseif cumloc[14] > 0 or cumloc[15] > 0 or cumloc[1] > 0 or cumloc[4] > 0 and $clothingworntype = 'nude':
+	elseif (cumloc[14] > 0 or cumloc[15] > 0 or cumloc[1] > 0 or cumloc[4] > 0) and $clothingworntype = 'nude':
 		'<font color=#<<$oleg_font>>>"Hello <<$pcs_firstname>>, why are you naked? And is that sperm on you? It''s gross, please go wash yourself and put on some clothes."</a>'
 		act 'Leave': gt 'pav_shared_apt', 'start'
 	else

locations/prostitution_functions.qsrc

@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'abortion':
 	abortionbirthdate = daystart
 
 	gs 'medical_din', 'remove_preg'
-	knowpregloss = 2
+	knowpregloss = 1
 
 	abortrand = rand(0, 10)
 	if age > 18:

locations/stat.qsrc

@@ -866,9 +866,13 @@ else
 end
 
 !!stop auto birth control pill taking if the player believes they are pregnant or are pregnant
-if (thinkpreg = 1 or knowpreg = 1) and tabletkicheck = 1: tabletkicheck = 0
-
-if birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart:
+if thinkpreg = 1 or knowpreg = 1:
+	if tabletkicheck = 1: tabletkicheck = 0
+	if birth_control['remind_hour'] > 0:
+		birth_control['remind_hour'] = 0
+		if birth_control['remind_icon'] = 1: birth_control['remind_icon'] = 0
+	end
+elseif birth_control['remind_hour'] > 0 and hour >= birth_control['remind_hour'] and hour <= birth_control['remind_hour'] + 1 and tabletkiday ! daystart:
 	birth_control['remind_icon'] = 1
 else
 	birth_control['remind_icon'] = 0

locations/stat_display.qsrc

@@ -697,7 +697,7 @@ $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if PanThinness >= 5:
+	if PanThinness >= 5 and $pantyworntype ! 'none':
 		if $braworntype = 'none':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through panties.'
@@ -1331,9 +1331,11 @@ if cheatStatusIcons = 0:
 	end
 
 	if model['icon'] = 1:
-		if model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
+		if model_job_week >= 2:
+			$stat_model_msg = 'You have no more modeling jobs available this week.'
+		elseif model_job_week = 1:
 			$stat_model_msg = 'You can get paid for 1 more modeling job this week.'
-		elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
+		elseif model_job_week < 1:
 			$stat_model_msg = 'You can get paid for 2 modeling jobs this week.'
 		end
 		$statusIconBarTab += '<td><a href="exec: msg $stat_model_msg"><img title="<<$stat_model_msg>>" height = <<set_siconht>> src="images/system/icons/status/model_'+iif(theme['is_dark'] = 1, 'white', 'black')+'.png"></a></td>'
@@ -2308,12 +2310,14 @@ if enable_extra_msg = 1:
 	end
 
 
-	if model['status'] > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
-		$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
-	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
-		$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
-	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
-		$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+	if model['status'] > 0:
+		if model_job_week >= 2:
+			$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
+		elseif model_job_week = 1:
+			$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
+		elseif model_job_week < 1:
+			$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+		end
 	end
 
 	if pornstack > 0:

locations/street_event.qsrc

@@ -910,7 +910,7 @@ if $ARGS[1] = 'main':
 				gs 'stat'
 				act 'Continue':gt $loc
 		!! when rainy and not wearing panties
-			elseif sunWeather = 0 and $pantyworntype = 'none':
+			elseif PCloSkirt > 2 and sunWeather = 0 and $pantyworntype = 'none':
 				*clr & cla
 				menu_off = 1
 				minut += 5

locations/talent_agency.qsrc

@@ -212,6 +212,7 @@ if $ARGS[0] = 'SMTV_shy':
 	minut += 5
 	*clr & cla
 	gs 'clothing', 'strip_all'
+	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 	'Mr Yanovich makes no move to leave the room as you shyly take off all your clothes and awkwardly stand naked before him.'
 	'He stares appreciatively at your nude body.'
@@ -298,6 +299,7 @@ if $ARGS[0] = 'SMTV_confident':
 	minut += 5
 	*clr & cla
 	gs 'clothing', 'strip_all'
+	gs 'stat'
 	'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 	'You confidently strip down in front of Mr Yanovich, not bothered by his presence.'
 	'He stares appreciatively at your nude body.'