30 Commits 724220ad32 ... 56e7972ce1

Author SHA1 Message Date
  LinaHirata 56e7972ce1 [fixed] syntax error in `wardrobe` 4 months ago
  Kevin_Smarts 46e7401cae [update] another new parser 4 months ago
  Kevin_Smarts d6b1a9dccb Merge remote-tracking branch 'Lusticon/TheRapist-fixes' 4 months ago
  Kevin_Smarts 9142187371 [changed] first files to centralize clothing totals, have to post so I can merge something else 4 months ago
  Kevin_Smarts db1ea0c421 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 months ago
  Kevin_Smarts ed0d9280bf Merge remote-tracking branch 'Lusticon/BugFixes' 4 months ago
  Kevin_Smarts 7734135ece Merge remote-tracking branch 'Felix/master' 4 months ago
  Lusticon 82d7d9e82b [fixed] Cheerleading after SchoolAtestat = 1 4 months ago
  Lusticon 9d6396c448 [fixed] Set this apartment as your main home 4 months ago
  Lusticon 2764a19bcf [fixed] remindedtherapyday thursday not thursday 4 months ago
  Lusticon 6cb1555239 [fixed] remindedtherapyday thursday not thursday 4 months ago
  bgkjdgbizgblzdgbr a617224d80 [fixed] Forgot to active the new spying on Sofia events 4 months ago
  Lusticon 990e4e198c [added] Therapist force exhibitionist clothing information 4 months ago
  Lusticon b315ef68f7 [fixed] Therapist force exhibitionist clothing check 4 months ago
  Lusticon 596ad873e6 [fixed] act misplace 4 months ago
  Lusticon 82ac4e7a1f [fixed] TheRapist force clothing check 4 months ago
  Lusticon f71a3d0ce1 [fixed] therapistFuckedPussyScene force reset on the next day 4 months ago
  Lusticon 81044de382 [fixed] TheRapist nude walk 4 months ago
  Lusticon 360d5f55ae [fixed] Check if Sveta is dressed like a hooker 4 months ago
  Kevin_Smarts 5dc258b5e4 [update] New parser version 4 months ago
  Lusticon a3063c3387 [fixed] preg swollen breasts text if lactation already active 4 months ago
  Lusticon 14e1ae0e02 [fixed] $wombthfath text display 4 months ago
  Lusticon 9d43f17075 [added] SMTV_commercial extra text message 4 months ago
  Lusticon f98c68f48e [fixed/changed] nerd_study_night showing and accessing 4 months ago
  Lusticon 2e6feb8fd5 [changed] Igor after dance reaction check after breaking up with Dimka 4 months ago
  Lusticon 9ad81e7d90 [fixed] cheerleading backup member while social group has changed for a suitable 4 months ago
  Lusticon a005396a21 [fixed] PCloPanties 4 months ago
  Lusticon 9bd5db9eae [fixed] PCloPanties 4 months ago
  Lusticon e738c9475e [fixed] PCloPanties 4 months ago
  Lusticon 1ba3262a42 [fixed] mom['condoms'] variable 4 months ago

+ 1 - 1
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 and CloPanties > 0:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and PCloPanties > 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:

+ 7 - 1
locations/budgetclothes.qsrc

@@ -102,6 +102,7 @@ if $ARGS[0] = 'clothes':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_outfits'
 
 	act 'Return':
 		cla
@@ -133,7 +134,7 @@ if $ARGS[0] = 'clothes':
 			end
 			i += 3
 
-		if i <= 200:jump 'loopgm_outfits'
+		if i <= total:jump 'loopgm_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -166,6 +167,7 @@ if $ARGS[0] = 'dresses':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_dress'
 
 	act 'Return':
 		cla
@@ -231,6 +233,7 @@ if $ARGS[0] = 'office':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_office'
 
 	act 'Return':
 		cla
@@ -288,6 +291,7 @@ if $ARGS[0] = 'gm_maid':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_maid'
 
 	act 'Return':
 		cla
@@ -340,6 +344,7 @@ if $ARGS[0] = 'gm_server':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_outfits'
 
 	act 'Return':
 		cla
@@ -392,6 +397,7 @@ if $ARGS[0] = 'school':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'gm_school'
 
 	act 'Return':
 		cla

+ 30 - 0
locations/clothing.qsrc

@@ -1,6 +1,32 @@
 # clothing
 !!2021/05/06
 
+if $ARGS[0] = 'totals':
+	!!sets the number of items in clothing sets
+	if $ARGS[1] = 'gm_outfits':
+		total = 200
+	elseif $ARGS[1] = 'gm_dress':
+		total = 300
+	elseif $ARGS[1] = 'gm_office':
+		total = 40
+	elseif $ARGS[1] = 'gm_maid':
+		total = 40
+	elseif $ARGS[1] = 'gm_server':
+		total = 30
+	elseif $ARGS[1] = 'gm_school':
+		total = 62
+	elseif $ARGS[1] = 'allure_swimsuit':
+		total = 100
+	elseif $ARGS[1] = 'allure_bikinis':
+		total = 140
+	elseif $ARGS[1] = 'coco_dress':
+		total = 300
+	elseif $ARGS[1] = 'coco_outfits':
+		total = 160
+	end
+end
+
+
 menu_off = 1
 
 $clothing_list_line = {
@@ -1399,6 +1425,10 @@ if $ARGS[0] = 'view_clothing_item':
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
 		'<<$description>>'
+		if hypnoClothes > 0 and ((CloStyle2 = 4 and CloThinness >= 3) _
+		or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 4) _
+		or CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress'): _
+			nl & '<I>You have a strange feeling about this outfit. You <b>really</b> want to wear it.</i>'
 	else
 		$swimwear_description
 	end

+ 2 - 1
locations/clothing_QV.qsrc

@@ -1341,7 +1341,8 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness > 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':
+				if CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _
+				or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 4):
 					act 'Wear this outfit':
 						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 

+ 1 - 1
locations/din_bad.qsrc

@@ -797,7 +797,7 @@ $d_cycreport_update = {
 		if cyccustom = 1:
 			if preg = 1 and knowpreg = 1:
 				$cycreport_txt = 'You are pregnant. Your due date is around <<$pregduedate>>.'
-				if $wombthfath ! 'unknown': 
+				if $wombthfath <> 'unknown' and $wombthfath <> '':
 					$cycreport_txt = '<<$cycreport_txt>> You suspect the father being <<$wombthfath>>.'
 				end
 			elseif knowpregloss = 1:

+ 1 - 1
locations/gschool_cheerleading.qsrc

@@ -313,7 +313,7 @@ if $ARGS[0] = 'practice':
 			end
 		else
 			if cheerleadingQW['quest_stage'] = 2:
-				if (cheerleadingQW['game_count'] > 6) and (rand(0,3) = 0):
+				if (cheerleadingQW['game_count'] > 6) and (rand(0,3) = 0) or grupTipe = 1 or grupTipe = 2:
 					'As you enter the hall, Albina walks up to you, looking strangely cheerful. "Hey <<$pcs_nickname>>, I''ve been talking with the girls and, since you''ve proven yourself capable, we''re <i>mostly</i> in agreement that you deserve a spot on the squad. I''ll sort you out with a uniform in due time, but you''re part of the squad now. So... welcome, I guess?" she says before walking away to prepare the rest of the squad for practice. You contain your excitement as you take your place among the other girls, overjoyed that you actually made it onto the squad!'
 					cheerleadingQW['quest_stage'] = 3
 				else

+ 10 - 8
locations/gschool_grounds.qsrc

@@ -64,14 +64,16 @@ if $ARGS[0] = 'main':
 	end
 
 	!! Cheerleading tryouts if Sveta decided to attend
-	if hour = 14 and cheerleadingQW['quest_stage'] = 1:
-		if pregtime < 90: gt 'gschool_cheerleading', 'tryouts'
-	!! Sveta attends training after school every Tuesday and Thursday.
-	elseif hour = 14 and cheerleadingQW['day'] ! daystart and (week = 2 or week = 4) and kanikuli = 0 and cheerleadingQW['quest_stage'] > 1 and suspended['on'] ! 1:
-		if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_practice'
-	!! A football game is played once every 2nd Friday and the cheerleaders perform out on the field.
-	elseif hour = 14 and cheerleadingQW['day'] ! daystart and week = 5 and (daystart - (daystart mod 7)) mod 2 = 1 and kanikuli = 0 and (cheerleadingQW['quest_stage'] >= 3 or cheerleadingQW['backup_game'] = 1) and suspended['on'] ! 1:
-		if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_game'
+	if SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
+		if hour = 14 and cheerleadingQW['quest_stage'] = 1:
+			if pregtime < 90: gt 'gschool_cheerleading', 'tryouts'
+		!! Sveta attends training after school every Tuesday and Thursday.
+		elseif hour = 14 and cheerleadingQW['day'] ! daystart and (week = 2 or week = 4) and kanikuli = 0 and cheerleadingQW['quest_stage'] > 1 and suspended['on'] ! 1:
+			if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_practice'
+		!! A football game is played once every 2nd Friday and the cheerleaders perform out on the field.
+		elseif hour = 14 and cheerleadingQW['day'] ! daystart and week = 5 and (daystart - (daystart mod 7)) mod 2 = 1 and kanikuli = 0 and (cheerleadingQW['quest_stage'] >= 3 or cheerleadingQW['backup_game'] = 1) and suspended['on'] ! 1:
+			if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_game'
+		end
 	end
 
 	if hour <= 8 and kanikuli = 6:

+ 1 - 1
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 and CloPanties > 0:
+				if pcs_horny >= 80 and pcs_inhib >= 60 and PCloPanties > 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.'

+ 1 - 1
locations/mother.qsrc

@@ -1800,13 +1800,13 @@ if $ARGS[0] = 'condom_find':
 	*clr & cla
 	minut += 20
 	killvar 'mom_found_condoms_variable'
+	mom['condoms'] = 1
 	gs 'stat'
 	!! TEMPORARY PICTURE
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'You''re in your room when your <<$npc_nickname[''A29'']>> walks in and shuts the door behind her. Without saying a word, she walks over to the desk, pulls out one of the drawers and takes out some condoms. "<<$pcs_nickname>>, why do you have this in your desk?!"'
 	act 'I...':
 		*clr & cla
-		mom['condoms'] = 1
 		gs 'stat'
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'

+ 2 - 2
locations/music_checks.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'zariyah_approach':
 		end
 
 		!! Check if Sveta is dressed like a hooker
-		if PCloStyle > 3 or PCloStyle = 3 or CloThinness > 4 or CloTopCut > 3 or CloSkirtShortness > 4 or CloPantsShortness > 5 or CloPanties = 1:
+		if PCloStyle > 3 or PCloStyle2 = 3 or PCloThinness > 4 or PCloTopCut > 3 or PCloSkirt > 4 or PCloPants > 5 or PCloPanties > 0:
 			ml_delparcoQW['Outfit Rule'] = 1
 			ml_delparcoQW['Zariyah Trust'] -= 5
 		end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'check_if_can_perform':
 	end
 
 	!! Check if Sveta is dressed like a hooker
-	if PCloStyle > 3 or PCloStyle = 3 or CloThinness > 4 or CloTopCut > 3 or CloSkirtShortness > 4 or CloPantsShortness > 5 or CloPanties = 1:
+	if PCloStyle > 3 or PCloStyle2 = 3 or PCloThinness > 4 or PCloTopCut > 3 or PCloSkirt > 4 or PCloPants > 5 or PCloPanties > 0:
 		ml_delparcoQW['Outfit Rule'] = 1
 		ml_delparcoQW['Zariyah Trust'] -= 10
 		ml_perform = 0

+ 3 - 3
locations/obj_din.qsrc

@@ -314,12 +314,12 @@ if $ARGS[0] = 'description':
 			'You can''t seem to stop gaining weight and your belly looks like it is getting bigger everyday, although you can still wear baggy clothes to hide it. At least the flu you''ve been fighting lately seems to have finally gone away for the most part.'
 			*nl
 		elseif pregchem > 1800 and knowpreg = 1:
-			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
+			iif(lactation['active']<=0,'Your breasts look and feel swollen and tingle at the slightest touch. ','') + 'Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
 			*nl
 		elseif pregchem > 1800 and knowpreg = 0:
-			'Your breasts look and feel swollen and tingle at the slightest touch. Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
+			iif(lactation['active']<=0,'Your breasts look and feel swollen and tingle at the slightest touch. ','') + 'Waking up is getting harder to do and it takes you longer to get going in the morning. Lately, just the thought of food is enough to turn your stomach.'
 			*nl
-		elseif pregchem > 1200:
+		elseif pregchem > 1200 and lactation['active'] <= 0:
 			'You''ve noticed that your breasts seem firmer lately and your nipples seem to be sticking out more.'
 			*nl
 		end

+ 1 - 1
locations/pav_disco_coolkids.qsrc

@@ -905,7 +905,7 @@ if $ARGS[0] = 'igor_dance':
 				end
 
 			else
-				if npc_rel['A1'] = 0:
+				if npc_rel['A1'] = 0 or dimaRevenge > 0:
 					'"Dimka told me that you dumped him. I get it, he can be a real asshole sometime." Igor whispers in your ear.'
 					'He pauses for a second. "Want to go outside and get some air?"'
 					'You feel that you could use some fresh air and agree.'

+ 1 - 1
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 and CloPanties > 0:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and PCloPanties > 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:

+ 3 - 2
locations/pav_library.qsrc

@@ -20,7 +20,7 @@ if lernHome > 0:
 	'You could do your homework with the help of one of the computers.'
 end
 
-if 	mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0:
 	'The nerds are sitting at a table studying together.'
 end
 
@@ -98,7 +98,8 @@ if hour >= 8 and hour < 18:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
-	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 _
+	and (class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else

+ 1 - 1
locations/pav_shared_apt.qsrc

@@ -233,7 +233,7 @@ if $ARGS[0] = 'start':
 			act '<font color=red>End your rental agreement and move out</font>':gt 'pav_shared_apt', 'eoleg_agreement'
 		end
 
-		if func('homes_properties', 'is_current_home'):
+		if func('homes_properties', 'is_current_home') = 0:
 			act 'Set this apartment as your main home':gs 'homes_properties', 'set_home' & gt 'pav_shared_apt', 'start'
 		end
 	end

+ 2 - 0
locations/shop_allure.qsrc

@@ -53,6 +53,7 @@ if $ARGS[0] = 'swim':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'allure_swimsuit'
 
 	act 'Return':
 		cla
@@ -104,6 +105,7 @@ if $ARGS[0] = 'bikinis':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'allure_bikinis'
 
 	act 'Return':
 		cla

+ 2 - 0
locations/shop_coco_carmen.qsrc

@@ -39,6 +39,7 @@ if $ARGS[0] = 'dress':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'coco_dress'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
@@ -100,6 +101,7 @@ if $ARGS[0] = 'outfits':
 	*nl
 
 	gs 'clothing_QV', 'shop_filter_header'
+	gs 'clothing', 'coco_outfits'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 

+ 6 - 3
locations/stat.qsrc

@@ -1079,9 +1079,12 @@ else
 	pornstar['icon'] = 0
 end
 
-if therapistday ! daystart and remindedtherapyday ! daystart and week ! 4 and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
-	remindedtherapyday = daystart
-	gt 'therapist_reminder'
+if therapistday ! daystart:
+	if therapistFuckedPussyScene > 0: therapistFuckedPussyScene = 0
+	if remindedtherapyday ! daystart and week ! 4 and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
+		remindedtherapyday = daystart
+		gt 'therapist_reminder'
+	end
 end
 
 !!--------------------------Booty Call SMSs--------------------------------

+ 3 - 1
locations/stat_display.qsrc

@@ -325,7 +325,7 @@ if hypnoAddict > 0:
 		$stat_hypno_tooltip = 'You feel moody for some reason.'
 	end
 end
-if therapistday ! daystart and week ! 4 and hypnoSchedule = 1:
+if therapistday ! daystart and week = 4 and hypnoSchedule = 1:
 	if $stat_hypno_msg ! '': 
 		$stat_hypno_msg += '<br>'
 		$stat_hypno_tooltip += '<br>'
@@ -1668,6 +1668,8 @@ else
 		if pcs_mdlng > 0: gs 'show_table', '<<pcs_mdlng>> Modelling', '2'
 		if pcs_heels > 0: gs 'show_table', '<<pcs_heels>> Heels', '2'
 	end
+	if SMTV_commercial = daystart + 1: $stat_msg += '<BR><b><i>Aurora Talent Agency</i> commercial shoot scheduled tomorrow at 10:00!</b>'
+	if hour <= 11 and SMTV_commercial = daystart: $stat_msg += '<BR><b><i>Aurora Talent Agency</i> commercial shoot in the city center at 10:00!</b>'
 
 	!!---------------------Artistic skills-------------------
 	if Enable_show_art_skill = 0:

+ 2 - 2
locations/therapist.qsrc

@@ -2171,9 +2171,9 @@ if $ARGS[0] = 'hypnoRandom':
 			'"You show him that you are not wearing a bra.'
 			'Good girl. Keep it that way."'
 			'"Yes, <i>Master</i>."'
-		end
 
-		act 'Continue':	gt 'therapist', 'hypnoEnd'
+			act 'Continue':	gt 'therapist', 'hypnoEnd'
+		end
 
 		hypnoBra = 1
 

+ 6 - 0
locations/therapist_reminder.qsrc

@@ -57,6 +57,12 @@ if $ARGS[0] = '':
 			else
 				minut += 5
 			end
+			if $clothingworntype = 'nude':
+				gs 'clothing', 'wear_last_worn'
+				gs 'underwear', 'wear'
+				gs 'shoes', 'wear', 'last_worn'
+			end
+			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
 			'You walk to your therapist''s office.'
 	

+ 3 - 3
locations/uni_dorm.qsrc

@@ -177,9 +177,9 @@ if $ARGS[0] = 'second_floor':
 						if pcs_prcptn > rand(30,70):
 							gs 'exp_gain', 'prcptn', rand(1,2)
 							'Listening a little more carefully, you are sure that somebody is having sex in the room.'
-							!! act 'Take a peek': gt 'sofia', 'spying'
+							act 'Take a peek': gt 'sofia', 'spying'
 						else
-							!! act 'Open the door': gt 'sofia', 'not_spying'
+							act 'Open the door': gt 'sofia', 'not_spying'
 						end
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'second_floor':
 					end
 				elseif (locat['katja'] = 32 or locat['katja'] = 33) and katjaQW['kitchen_day'] ! daystart:
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
-					'You knock on the door, but no one answers. Noticing what thime it is Katja is probably in the shared Kitchen eating or preparing food.'
+					'You knock on the door, but no one answers. Noticing what time it is Katja is probably in the shared Kitchen eating or preparing food.'
 					act 'See if Katja is in the shared kitchen': gt 'katja_pantyquest', 'kitchen'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'

+ 24 - 8
locations/wardrobe.qsrc

@@ -527,12 +527,6 @@ if $ARGS[0] = 'default_entry_wear':
 	end
 
 	if defunderwear[default_entry] = 0:
-		if (hypnoPanty = 1 and $pantyworntype ! 'none') or (hypnoBra = 1 and $braworntype ! 'none'):
-			!! removal of underwear from set if therapist has prohibited it
-			if hypnoPanty = 1 and $pantyworntype ! 'none': $defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
-			if hypnoBra = 1 and $braworntype ! 'none': $defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
-			msg '<center>You feel like something about this set has changed but you cannot workout what it is.</center>'
-		end
 		if dyneval('RESULT = <<$defpantytype[default_entry]>>_panties[<<defpantynumber[default_entry]>>]') = 0:
 			$defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
 		end
@@ -549,6 +543,12 @@ if $ARGS[0] = 'default_entry_wear':
 		else
 			gs 'bras', 'wear', $defbratype[default_entry], defbranumber[default_entry]
 		end
+		if (hypnoPanty = 1 and $pantyworntype ! 'none') or (hypnoBra = 1 and $braworntype ! 'none'):
+			!! removal of underwear from set if therapist has prohibited it
+			if hypnoPanty = 1 and $pantyworntype ! 'none': $defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
+			if hypnoBra = 1 and $braworntype ! 'none': $defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
+			msg '<center>You feel like something about this set has changed but you cannot workout what it is.</center>'
+		end
 	end
 
 	if dyneval('RESULT = <<$defshoetype[default_entry]>>_shoe[<<defshoenumber[default_entry]>>]') = 0:
@@ -600,6 +600,18 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'stat'
 			act 'Return': gt 'wardrobe', $wloc
 		end
+	!!Therapist force exhibitionist clothing check
+	elseif hypnoClothes = 1 and CloThinness < 6 and $temp1 <> 'salacious_outfits' and $temp1 <> 'salacious_dress' _
+	and NO (($temp1 = 'eroto_outfits' or $temp1 = 'eroto_dress' or $temp1 = 'eroto_strip') and CloThinness >= 4) _
+	and NO (CloStyle2 = 4 and CloThinness >= 3):
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"/></center>'
+		'You pick up the outfit and think about trying them on... but you don''t really like wearing these type of outfits'
+		act 'Strip out of restrictive clothing':
+			gs 'clothing', 'strip'
+			gs 'stat'
+			gt 'wardrobe', $wloc
+		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
 		cls
@@ -884,7 +896,7 @@ end
 
 if $ARGS[0] = 'default_sport_options':
 	if default_sport_number = 0:
-		'We have no default sports clothing set, you can set this in your wardrobe.'
+		'You have no default sports clothing set, you can set this in your wardrobe.'
 	else
 		!! checks to see if player is wearing the default sports set using default_sport_number[2]
 		default_sport_number[2] = 0
@@ -898,8 +910,12 @@ if $ARGS[0] = 'default_sport_options':
 		if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
 		if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
 
+		!! check to see if sports outfit is worn out
+		if dyneval('RESULT = <<$defclothingtype[default_sport_number]>>_h[<<defclothingnumber[default_sport_number]>>]') = 0:
+			act '<font color="red">Put on your sports clothes - unavailable as outfit is worn out</font>':
+			end
 		!! check to see that player is not wearing default sports outfit
-		if default_sport_number[2] ! 5:
+		elseif default_sport_number[2] ! 5:
 			act'Put on your sports clothes':
 				$lastwornclothingtype['sport'] = $clothingworntype
 				lastwornclothingnumber['sport'] = clothingwornnumber

BIN
tools/Parser/qsp_parser.exe