44 Commits 456a274718 ... fbabe5f484

Autore SHA1 Messaggio Data
  Kevin_Smarts fbabe5f484 Merge remote-tracking branch 'Violet_Kitten/master' 5 mesi fa
  Kevin_Smarts 926e0026de Merge remote-tracking branch 'Anjuna/master' 5 mesi fa
  Kevin_Smarts 03f0e03639 Merge remote-tracking branch 'Lusticon/master' 5 mesi fa
  Kevin_Smarts 4f5c5c7448 [fixed] Duplicate outfits replaced with images from Earnest and selen99 5 mesi fa
  anjuna krokus b3355e0564 [changed] changed the textsize of the stat explenation to the standard textsize 5 mesi fa
  Lusticon c7bc8e53c4 [fixed] duplicated if 5 mesi fa
  Lusticon 0b7b6d7fce [fixed] String vs Integer 5 mesi fa
  Lusticon 627c95e5dc [fixed] missed video 5 mesi fa
  Kevin_Smarts cf069c3baa Merge remote-tracking branch 'Lusticon/master' 5 mesi fa
  Lusticon 1f958520d6 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 5 mesi fa
  Lusticon c2015053e1 [fixed] infinite loop 5 mesi fa
  anjuna krokus 006439a739 [fixed] Fixed Great grandparents linking to eachother in the journal file. Removed trailing spaces 5 mesi fa
  Kevin_Smarts 7d4362ca33 Merge remote-tracking branch 'origin/master' 5 mesi fa
  Kevin_Smarts 6d2913bb7c [fixed] Original intro music playing over the seond one for TG starts 5 mesi fa
  Kevin_Smarts 329757edc9 Merge remote-tracking branch 'Anjuna/master' 5 mesi fa
  bgkjdgbizgblzdgbr 17270f6deb [added] The glossary is now linked at the ende of the introduction. 5 mesi fa
  Awesome 717af6e387 [changed] using tables for the Glossary 5 mesi fa
  anjuna krokus a5ad1519b3 [fixed] layout fixes to stat explenations 5 mesi fa
  Kevin_Smarts a59b114b12 Merge remote-tracking branch 'Hornguy6/master' 5 mesi fa
  Kevin_Smarts cbdb0f6a00 Merge remote-tracking branch 'Anjuna/master' 5 mesi fa
  bgkjdgbizgblzdgbr 0f0d08a11e [fixed] Chore is an action and not type. So you could increase max willpower coing chores which was not the intention. 5 mesi fa
  hornguy6 440fa05c80 [fixed] missing options 5 mesi fa
  hornguy6 8e1d8dbf78 [fixed] inconsistent choice 5 mesi fa
  hornguy6 6088e1dc88 [fixed] missing stat change 5 mesi fa
  hornguy6 b4fae713f1 [fixed] unnecessary elseif changed to else 5 mesi fa
  hornguy6 58bea7bc4f [fixed] bad text 5 mesi fa
  anjuna krokus 2a7105c5c5 [changed] moved bus action down the list. Removed a trailing space 5 mesi fa
  Kevin_Smarts 5a034f267b Merge remote-tracking branch 'origin/master' 5 mesi fa
  Kevin_Smarts d5fd5aef61 [fixed] Variable change to match new image due to duplicate as spotted by Selen99 5 mesi fa
  bgkjdgbizgblzdgbr 692aa41215 [Fixed] Second file for the comit. 5 mesi fa
  bgkjdgbizgblzdgbr 357fd6e0f5 [fixed/changed] The cum eater function now checks for private location before removing cum, and the stat display is fixed so it the cum eater icon will tell you if you can eat the cum on your body in the curent location. 5 mesi fa
  bgkjdgbizgblzdgbr d6fe658e74 [Added] Year check so that you can not wait to after new year and join the startles when they are suppoesed to be dispanded. 5 mesi fa
  Kevin_Smarts 9f6b831239 [fixed] Pain calc not run when pain applied 5 mesi fa
  Kevin_Smarts 3b06957ed0 Merge remote-tracking branch 'Anjuna/master' 5 mesi fa
  Kevin_Smarts e306b43228 Merge remote-tracking branch 'Lusticon/master' 5 mesi fa
  Kevin_Smarts d46de97ce5 Merge remote-tracking branch 'Anya/master' 5 mesi fa
  anjuna krokus 175adb4249 [removed] trailing spaces 5 mesi fa
  anjuna krokus ca873a4d08 [fixed/removed] Fixed a game breaking bug in `gschool_lessonsev2` + removal of trailing spaces 5 mesi fa
  Lusticon 6c3538066f [fixed] syntax bugs 5 mesi fa
  anjuna krokus be5c722e43 [fixed?] should allow Sveta to orgasm with the therapist in the hotel room 5 mesi fa
  anjuna krokus cdd318e2c2 Merge remote-tracking branch 'master/master' 5 mesi fa
  Vengeance_11 9ea87df0ba File that I missed 5 mesi fa
  anjuna krokus 5b3330ed34 [removed] Floating spaces 5 mesi fa
  Violet Kitten 42823a026a Nutty's Pav Beach Experience! "Adding Ivan's shower chat to the his beach interaction. along with a minor bug fix, and cleaning up some code." by our favorite Nutluck of all time. 8 mesi fa
43 ha cambiato i file con 449 aggiunte e 513 eliminazioni
  1. 1 1
      locations/Cum_Manage.qsrc
  2. 1 2
      locations/_attributes_cats_dress.qsrc
  3. 2 3
      locations/_attributes_cats_outfits.qsrc
  4. 2 1
      locations/_attributes_fashionista_panties.qsrc
  5. 3 3
      locations/_attributes_gm_dress.qsrc
  6. 3 4
      locations/_attributes_moncheri_bodysuit.qsrc
  7. 1 1
      locations/_attributes_moncheri_dress.qsrc
  8. 1 1
      locations/_attributes_scandalicious_dress.qsrc
  9. 2 2
      locations/_attributes_scandalicious_outfits.qsrc
  10. 8 8
      locations/brother_shower_sex.qsrc
  11. 26 25
      locations/cum_cleanup.qsrc
  12. 1 1
      locations/gdksport.qsrc
  13. 39 35
      locations/gschool_lessons4.qsrc
  14. 4 4
      locations/gschool_lessonsev2.qsrc
  15. 1 1
      locations/gschool_lessonsev3.qsrc
  16. 1 0
      locations/intro_city.qsrc
  17. 1 0
      locations/intro_city_m.qsrc
  18. 1 0
      locations/intro_city_tg.qsrc
  19. 1 0
      locations/intro_sg.qsrc
  20. 1 0
      locations/intro_sg_m.qsrc
  21. 2 0
      locations/intro_sg_tg.qsrc
  22. 1 0
      locations/intro_uni.qsrc
  23. 1 0
      locations/intro_uni_m.qsrc
  24. 1 0
      locations/intro_uni_tg.qsrc
  25. 62 62
      locations/journal_NPC_information.qsrc
  26. 1 1
      locations/model_krystal.qsrc
  27. 1 0
      locations/pain.qsrc
  28. 14 1
      locations/pav_beach_chat.qsrc
  29. 2 2
      locations/pushkin.qsrc
  30. 1 1
      locations/sex_ev_after.qsrc
  31. 4 4
      locations/sex_ev_condoms.qsrc
  32. 0 2
      locations/sex_ev_dress_talking.qsrc
  33. 5 3
      locations/sex_ev_foreplay.qsrc
  34. 1 1
      locations/sex_ev_pillow_talk2.qsrc
  35. 2 1
      locations/sex_ev_shower.qsrc
  36. 1 1
      locations/sex_ev_talk.qsrc
  37. 20 16
      locations/stat_display.qsrc
  38. 111 210
      locations/stat_explanations.qsrc
  39. 1 0
      locations/therapist_home.qsrc
  40. 30 30
      locations/uni_lessons_electives1.qsrc
  41. 41 41
      locations/uni_lessons_electives2.qsrc
  42. 35 35
      locations/uni_lessons_electivesev1.qsrc
  43. 12 10
      locations/willpower.qsrc

+ 1 - 1
locations/Cum_Manage.qsrc

@@ -506,7 +506,7 @@ if $ARGS[0] = 'cumeater_icon':
 	*nl
 	j = 0
 	:cumeater_icon_jump
-		if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatVars['enema'] = 1): gs 'cum_manage', 'cumeater', j
+		if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatVars['enema'] = 1) and FUNC('Cum_Manage', 'check_private', j) = 1: gs 'cum_manage', 'cumeater', j
 	if j < 17: j += 1 & jump 'cumeater_icon_jump'
 end
 

+ 1 - 2
locations/_attributes_cats_dress.qsrc

@@ -1404,10 +1404,9 @@ elseif ARGS[1] = 207:
 	CloDress = 1
 
 elseif ARGS[1] = 208:
-!! Duplicate of Coco 210
 	CloQuality = 4
 	CloThinness = 4
-	CloTopCut = 4
+	CloTopCut = 2
 	CloSkirtShortness = 4
 
 elseif ARGS[1] = 209:

+ 2 - 3
locations/_attributes_cats_outfits.qsrc

@@ -688,10 +688,9 @@ elseif ARGS[1] = 111:
 	
 elseif ARGS[1] = 112:
 	CloQuality = 3
-	CloThinness = 5
+	CloThinness = 3
 	CloTopCut = 2
-	CloPantsShortness = 5
-	CloStyle = 4
+	CloPantsShortness = 4
 	
 elseif ARGS[1] = 113:
 	CloQuality = 3

+ 2 - 1
locations/_attributes_fashionista_panties.qsrc

@@ -431,11 +431,12 @@ elseif ARGS[1] = 57:
 	PanThinness = 2
 
 elseif ARGS[1] = 58:
-	PanType = 1
+	PanType = 3
 	PanFun = 1
 	PanMaterial = 6
 	PanQuality = 3
 	PanThinness = 4
+	PanCoverBack = 4
 
 elseif ARGS[1] = 59:
 	PanType = 1

+ 3 - 3
locations/_attributes_gm_dress.qsrc

@@ -1557,9 +1557,9 @@ elseif ARGS[1] = 217:
 	
 elseif ARGS[1] = 218:
 	CloQuality = 2
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloThinness = 3
+	CloTopCut = 3
+	CloSkirtShortness = 3
 	
 elseif ARGS[1] = 219:
 	CloQuality = 2

+ 3 - 4
locations/_attributes_moncheri_bodysuit.qsrc

@@ -365,14 +365,13 @@ elseif ARGS[1] = 32:
 
 elseif ARGS[1] = 33:
 	BraType = 7
-	BraMaterial = 3
+	BraMaterial = 6
 	BraFun = 1
 	BraQuality = 6
-	BraThinness = 4
+	BraThinness = 3
 	BraCover = 3
 	PanThinness = 4
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverBack = 2
 
 elseif ARGS[1] = 34:
 	BraType = 7

+ 1 - 1
locations/_attributes_moncheri_dress.qsrc

@@ -689,7 +689,7 @@ elseif ARGS[1] = 89:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 3
 

+ 1 - 1
locations/_attributes_scandalicious_dress.qsrc

@@ -10,7 +10,7 @@ if ARGS[1] = 1:
 	CloDress = 1
 	
 elseif ARGS[1] = 2:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3

+ 2 - 2
locations/_attributes_scandalicious_outfits.qsrc

@@ -145,9 +145,9 @@ elseif ARGS[1] = 19:
 	CloStyle = 4
 	
 elseif ARGS[1] = 20:
-	CloQuality = 5
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 4
+	CloBra = 1
 	CloPantsShortness = 5
 	CloBimbo = 1
 	CloStyle = 4

+ 8 - 8
locations/brother_shower_sex.qsrc

@@ -242,16 +242,16 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 		'<center><video autoplay loop src="images/shared/home/bathroom/broshowervirgin.mp4"></center>'
 		'Holding your breath, you push back on Kolka, feeling his tip stretch your pussy. He eventually pushes the entire length of his cock inside causing you to gasp in pain as his <<npc_dick[''A34'']>> cm dick tears through your hymen. Despite your pain, neither of you stop moving, continuing to thrust against each other.'
 		!!elseif stat['hidden_vaginal'] > 0:
-		!!	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		!!	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		!!	'Kolka slides inside you with surprising ease. Though his dick still stretches your pussy, you find it to be pleasant instead of painful. Of course you''ve heard stories that say it doesn''t hurt for some girls, but you always thought it was a myth or at least a rare occurrence. <i>I must be pretty lucky!<</i> you think to yourself.'
 	else
-		'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		'Your pussy easily swallows your brother''s <<npc_dick[''A34'']>> cm cock and you immediately start building into a rhythm, pushing back on him in time with his thrusts for maximum depth of penetration.'
 	end
 
 	act'Continue':
 		cla & *clr
-		'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+		'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 		if pcs_vag = 0:
 			'Several minutes pass and your pain is long forgotten. The only thing you can feel now is the ecstasy of Kolka''s cock pumping in and out of your pussy. His hands come up to grope your breasts and you moan in pleasure. Is this what sex is? How did you live your life without it? Why did you wait so long to lose your virginity? Why didn''t you jump on your brother''s cock sooner?!'
 		elseif stat['hidden_vaginal'] > 0 and stat['vaginal'] = 0:
@@ -299,7 +299,7 @@ if $ARGS[0] = 'brother_shower_fuck_first3':
 	eff_contra = iif(argc > 1,ARGS[1],sexcontra)
 	tmp = func('pregriskeval',eff_contra)
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	'Barely giving him any time at all to recover from your sudden start, you immediately break into a hard rhythm, thrusting your hips back and giving it your all. He''s your little brother after all. You should try to make his first time special. Soon enough, you start giving him tips.'
 	'"Hold my hips so you have more control."'
 	'"Grab my boobs if you like. Boobs are meant to be grabbed during sex.'
@@ -651,7 +651,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 	elseif brothercumchoice = 5:
 		act'Continue':
 			cla & *clr
-			'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+			'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 			gs 'cum_call', '', 'A34', 1
 			*nl
 			'Suddenly Kolka grabs you tight, thrusting his cock into you as deep as it can go and you can feel him pulsating inside you.'
@@ -1156,7 +1156,7 @@ end
 
 if $ARGS[0] = 'shower_creampie':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	'You don''t respond verbally but pick up the pace, slapping your ass back against Kolka''s cock until he grabs you tight and you can feel his cock pulsating, spurts of cum pouring out inside you.'
 	$orgasm_txt = 'The sensation sends you over the edge and you orgasm as well, your pussy gripping him and squeezing every last drop of cum from his cock.'
 	gs 'arousal', 'vaginal', 1
@@ -1197,7 +1197,7 @@ end
 
 if $ARGS[0] = 'shower_forced_creampie':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	gs 'cum_call', '', 'A34', 1
 	gs 'stat'
 	if pcs_horny >= 90:
@@ -1283,7 +1283,7 @@ end
 
 if $ARGS[0] = 'shower_fill_me_up':
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></center>'
 	gs 'cum_call', '', 'A34', 1
 	gs 'stat'
 	'"Yes! Yes!" you cry out. "Fill me up!"'

+ 26 - 25
locations/cum_cleanup.qsrc

@@ -68,6 +68,7 @@ if $ARGS[0] = 'cleanloc':
 		l += 1
 		jump 'cleanlocloop'
 	end
+	killvar 'l'
 elseif $ARGS[0] = 'cleandeposit':
 	cumsumbod -= sparrvol[ARGS[1]]
 	cumsumvag -= iif(sparrloc[ARGS[1]]=0,sparrvol[ARGS[1]],0)
@@ -267,67 +268,67 @@ elseif $ARGS[0] = '':
 		KILLVAR 'cum_vol'
 	end
 
-	l = 0
+	n = 0
 	:cumcleanloop
-	if l < arrsize('$sparrnam'):
-		tmp = arrpos('deresidue', sparrloc[l])
+	if n < arrsize('$sparrnam'):
+		tmp = arrpos('deresidue', sparrloc[n])
 		if tmp ! -1 and tmp < arrsize('deresidue'):
 			!! vagina
-			if sparrloc[l] = 0:
+			if sparrloc[n] = 0:
 				!! cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 _ 
+				if FUNC('Cum_Manage', 'check_innards', sparrloc[n]) = 1 _ 
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
-					cumsumbod -= sparrvol[l] & cumsumvag -= sparrvol[l]
-					sparrslc[l] = 0 & sparrvol[l] = 0
+					cumsumbod -= sparrvol[n] & cumsumvag -= sparrvol[n]
+					sparrslc[n] = 0 & sparrvol[n] = 0
 					isprok = 0 & vibratorIN = 0
 				end
 			!! ass
-			elseif sparrloc[l] = 3:
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 or cumspclnt = 7 _ 
+			elseif sparrloc[n] = 3:
+				if FUNC('Cum_Manage', 'check_innards', sparrloc[n]) = 1 or cumspclnt = 7 _ 
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
-					cumsumbod -= sparrvol[l] & cumsumass -= sparrvol[l]
-					sparrslc[l] = 0 & sparrvol[l] = 0
+					cumsumbod -= sparrvol[n] & cumsumass -= sparrvol[n]
+					sparrslc[n] = 0 & sparrvol[n] = 0
 					analplugin = 0 & analplugout = 0
 				end
 			else
-				cumsumbod -= sparrvol[l]
-				sparrslc[l] = 0 & sparrvol[l] = 0
+				cumsumbod -= sparrvol[n]
+				sparrslc[n] = 0 & sparrvol[n] = 0
 			end
 		end
 
-		tmp = arrpos('toclean', sparrloc[l])
-		if tmp ! -1 and tmp < arrsize('toclean') and sparrvol[l] > 0:
+		tmp = arrpos('toclean', sparrloc[n])
+		if tmp ! -1 and tmp < arrsize('toclean') and sparrvol[n] > 0:
 			!! vagina
-			if sparrloc[l] = 0:
-				if cumsumvag * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and isprok = 0 and vibratorIN = 0 _ 
+			if sparrloc[n] = 0:
+				if cumsumvag * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[n], 1) and isprok = 0 and vibratorIN = 0 _ 
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
-					gs 'cum_cleanup', 'cleandeposit', l
+					gs 'cum_cleanup', 'cleandeposit', n
 					if cumspclnt = 3: isprok = 0 & vibratorIN = 0
 				end
 			!! ass
-			elseif sparrloc[l] = 3:
-				if (cumsumass * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and analplugin = 0) or cumspclnt = 7 _ 
+			elseif sparrloc[n] = 3:
+				if (cumsumass * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[n], 1) and analplugin = 0) or cumspclnt = 7 _ 
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _ 
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
-					gs 'cum_cleanup', 'cleandeposit', l
+					gs 'cum_cleanup', 'cleandeposit', n
 					if cumspclnt = 3 or cumspclnt = 7: analplugin = 0
 				end
 			else
-				gs 'cum_cleanup', 'cleandeposit', l
+				gs 'cum_cleanup', 'cleandeposit', n
 			end
 		else
-			if sparrvol[l] <= 0 and ($sparrnam[l] = '' or sparrloc[l] ! 0 or (sparrloc[l] = 0 and sparrage[l] > 10)): gs 'cum_cleanup', 'cleandeposit', l
-			l += 1
+			if sparrvol[n] <= 0 and ($sparrnam[n] = '' or sparrloc[n] ! 0 or (sparrloc[n] = 0 and sparrage[n] > 10)): gs 'cum_cleanup', 'cleandeposit', n
+			n += 1
 		end
 		jump 'cumcleanloop'
 	end
 	killvar 'toclean'
 	killvar 'deresidue'
 	killvar 'tmp'
-	killvar 'l'
+	killvar 'n'
 	killvar 'lubonus'
 	killvar 'anal_slip'
 	killvar 'vaginal_slip'

+ 1 - 1
locations/gdksport.qsrc

@@ -273,7 +273,7 @@ if $ARGS[0] = 'dance2':
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further, it is still good exercise.'
 
 		act 'Leave':
-			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
+			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )) and year = 2016:
 				if $start_type['cat'] = 'dancer':
 					gt 'albina_starlets', 'albina3'
 				elseif (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 60:

+ 39 - 35
locations/gschool_lessons4.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'math':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big26.jpg"></center>'
 	if VK = 1:
 		VKrand = rand(1,2)
-		'You sit in your seat just as Mr. Tsarev stands up to begin his lesson. He casually leans against the desk, then crosses his arms as he begins the lesson. "Today, we''ll be learning about problem solving. The most important thing about solving a problem is to know what answer you''re looking for, especially with word problems. You''ll need to know the question that you need to answer. Here is an example: If Anna had four bottle caps and Dina had two pebbles, then how many bottle caps do they have in total? Anyone?"'
+		'You sit in your seat just as Mr. Tsarev stands up to begin his lesson. He casually leans against the desk, then crosses his arms. "Today, we''ll be learning about problem solving. The most important thing about solving a problem is to know what answer you''re looking for, especially with word problems. You''ll need to know the question that you need to answer. Here is an example: If Anna had four bottle caps and Dina had two pebbles, then how many bottle caps do they have in total? Anyone?"'
 		*nl
 		if VKrand = 1:
 			'A few students raise their hands and Mr. Tsarev points to Arkadi.'
@@ -21,13 +21,13 @@ if $ARGS[0] = 'math':
 			'Mr. Tsarev chuckles. "Of course four plus two is six, but is that the number of <i>bottle caps</i> that they have? No. Anna has four bottle caps, but Dina has two <i>pebbles</i>. You need to pay better attention to the actual question."'
 			'Some of the other boys start laughing at Arkadi while some of the girls giggle.'
 		    'Mr. Tsarev continues. "Don''t let the numbers fool you. Understanding the question is the most important part of answering it. Now I''m going to hand out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one."'
-			'He reaches for some papers and begins handing them out while Arkadi crosses his arms, trying to ignore some of the others laughing at him.'
+			'He reaches for some papers and starts handing them out as Arkadi crosses his arms, trying to ignore some of the others laughing at him.'
 		else
 			'A few students raise their hands and Mr. Tsarev points to Natalia.'
 			'"The answer is four because Anna is the only one with bottle caps," she answers. "Dina only has pebbles, which might as well not be mentioned as it does not pertain to the answer needed."' 
 			'Mr. Tsarev tilts his head in surprise at Natalia''s answer while Christina whispers to one of the other girls. "Wow, she''s really smart. Is she studying to be a teacher or something?"'
 		    'Mr. Tsarev nods his head. "Precisely. The involvement of Dina was only to deceive the one answering the question, which is why it is referred to as a ''trick question''. Now I''d like to see who was paying attention and who was dozing off. I''ll be handing out some sheets with multiple choice questions and all of you will have 10 minutes to answer each one."'
-			'He reaches for some papers on his desk and begins handing them out.'
+			'He reaches for some papers on his desk and starts handing them out.'
 		end
 	elseif VK = 2:
 		VK = rand(1,3)
@@ -55,7 +55,7 @@ if $ARGS[0] = 'math':
 				'"I was on my way here when some braindead bimbo spilled her coffee on my uniform, so I had to head back home to clean up. You wouldn''t want me to arrive covered in coffee, right?"'
 				'Mr. Tsarev sighs. "You couldn''t run home and change your shirt <i>before</i> the start of class?"'
 				'"Well I had to clean the coffee from my hair as well as restyle it and that takes time," Niko replies.'
-				'Christina chimes in. "Why even bother washing the coffee off? You always look like a greasy punk anyway."'
+				'"Why even bother washing the coffee off? You always look like a greasy punk anyway," Christina chimes in.'
 				*nl
 				'Niko leans toward Christina. "You don''t have to play hard to get. If you want my attention, then you need only ask."' 
 				'"I should tell you that I''ve been looking for a handsome, strong and sexy man in my life..." she whispers in a seductive tone.'
@@ -83,10 +83,10 @@ if $ARGS[0] = 'math':
 			'Mr. Tsarev chuckles. "Ahh Dmitri, it was nice of you to raise your hand and volunteer to answer my next question." Dimka facepalms as Mr. Tsarev continues. "If the current time is 4am and you have a dentist appointment at 2pm, then how long do you have to wait until your dentist appointment begins? Remember that you need to calculate the numbers while keeping the 12 hour timezones in mind."'
 			'"If it is really 4am, then I would probably go to sleep and figure it out in the morning."'
 			*nl
-			'Many of the students, along with Mr. Tsarev, begin laughing. "That wasn''t exactly the answer I was looking for, but I can forgive it. The answer for that question was ten hours." He grabs a piece of chalk and begins writing on the chalkboard; "A simple way of figuring it out is by looking at the arrival time. The time for arriving is 2pm, which means that it is two hours after twelve. Those added together equals fourteen. Lastly, we need to subtract the current time from this to eliminate the time already passed. Fourteen minus four equals ten, giving us our answer."' 
+			'Many of the students, along with Mr. Tsarev, start laughing. "That wasn''t exactly the answer I was looking for, but I can forgive it. The answer for that question was ten hours." He grabs a piece of chalk and starts writing on the chalkboard; "A simple way of figuring it out is by looking at the arrival time. The time for arriving is 2pm, which means that it is two hours after twelve. Those added together equals fourteen. Lastly, we need to subtract the current time from this to eliminate the time already passed. Fourteen minus four equals ten, giving us our answer."' 
 			'"Yeah that''s... Real simple," Dimka sarcastically replies and Igor laughs.'
 			'Mr. Tsarev responds with a smirk on his face. "With practice it will be. Speaking of which, I''ll begin handing out some simple problems for you to solve."'
-			'He reaches for some papers on his desk and begins handing them out.'
+			'He reaches for some papers on his desk and starts handing them out.'
 		end
 	elseif VK = 3:
 		VKrand = rand(1,3)
@@ -105,7 +105,7 @@ if $ARGS[0] = 'math':
 			'"No, it is not. Infinity is a never ending stream sequence of numbers, not a singular number," Mr. Tsarev replies.'
 		end
 		'"The smallest number in existence is... Nothing. There is no smallest number. Numbers can go beyond negative in an infinite cycle and infinity has no bottom point, so finding the smallest number is an impossibility during an infinite cycle. I''ll be handing out some worksheets with negative and positive number problems. Try to answer as many as possible in the next 15 minutes."'
-		'He then begins handing out worksheets to the class.'
+		'He then starts handing out worksheets to the class.'
 	end
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
@@ -599,7 +599,7 @@ if $ARGS[0] = 'english':
 				act 'Leave class': gt 'gschool_lessons', 'short_break'
 			end
 		end
-		act'Play with your phone':
+		act 'Play with your phone':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
@@ -1158,7 +1158,7 @@ if $ARGS[0] = 'postphys':
 end
 
 if $ARGS[0] = 'postphys2':
-	if christinaQW['subpath'] >= 2 and postphys_event ! daystart:postphys_event = daystart & gt 'Zvereva_sub_1', 'showers'
+	if christinaQW['subpath'] >= 2 and postphys_event ! daystart: postphys_event = daystart & gt 'Zvereva_sub_1', 'showers'
 	*clr & cla
 	$loc_arg = 'postphys2'
 	$loc = 'gschool_lessons4'
@@ -1171,7 +1171,7 @@ if $ARGS[0] = 'postphys2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find most of the other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the girls in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
-	act 'Have a shower':gt 'gschool_lessons4', 'shower'
+	act 'Have a shower': gt 'gschool_lessons4', 'shower'
 	act 'Get dressed': gt 'gschool_lessons4', 'dress'
 end
 
@@ -1197,8 +1197,8 @@ if $ARGS[0] = 'shower2':
 	gymshower = rand(1,10)
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/shower/showerspank.mp4"></video></center>'
-		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella talking to Albina.'
-	    'As you wash off the soap, you turn in time to see Bella start spanking Albina; most of the girls stop what they''re doing to watch. After several fairly hard smacks that echo into the room, they stop and laugh about it as Albina rubs her ass with strange glee and Bella smiles and nods her head, seemingly in approval. You turn back and finish your shower as Bella and Albina giggle at each other.'
+		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
+	    'As you wash off the soap, you turn to see Albina bending over to let Bella spank her; most of the girls stop what they''re doing to watch. After several fairly hard smacks that echo into the room, they stop and laugh about it as Albina rubs her ass. You turn back and finish your shower as Bella and Albina giggle at each other.'
 		gs 'gschool_lessons4', 'shower_options'
 	elseif gymshower = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/picture.jpg"></center>'
@@ -1209,7 +1209,9 @@ if $ARGS[0] = 'shower2':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/aylnushkiss.jpg"></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
 		*nl
-		'As you wash off the soap, you turn just in time to see see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements. A few others look disgusted at the two of them kissing. Katyusha even says "Stop that you fucking dykes! That''s so disgusting." Anushka looks to Katyusha, makes a V with her fingers and sticks her tongue between them wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to just showering.'
+		'As you wash off the soap, you turn to see Anushka and Aylona sharing a kiss under one of the shower heads. Several other girls notice and a few whistle, make cat calls or yell encouragements, but others look disgusted.'
+		'"Stop that, you fucking dykes!" Katyusha scowls. "That''s fucking disgusting!"'
+		'Anushka looks at Katyusha, makes a V with her fingers and sticks her tongue between them, wiggling it back and forth. Katyusha glares at her, then shakes her head, turns off the water and walks into the locker room. Anushka and Aylona laugh about it before they go back to showering.'
 		gs 'gschool_lessons4', 'shower_options'
 	elseif gymshower = 4 and npc_grupTipe['A25'] = 5:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_1.jpg"></center>'
@@ -1226,7 +1228,7 @@ if $ARGS[0] = 'shower2':
 				'"Look girls, now we''ve got TWO sluts to have fun with!" Lera says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue as you stare up at her.'
 				'"What? You''ll suck the boys off, but won''t eat us out? Aren''t dick and pussy the same thing to you? Get to it, you fucking whore!" Lera says and delivers a stinging smack to your face. With no way to escape, you resign yourself to the humiliation and start licking Lera''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as Lera orgasms hard. When she''s done, she pulls your head up by your chin and slaps you.'
 				'"Good slut," is all she says before Pauline takes her place.'
-				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and run for a shower, cleaning the sticky juices from your face and hair.'
+				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they''ve all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
 				gs 'stat'
 				act 'Return to the locker room':
@@ -1246,9 +1248,10 @@ if $ARGS[0] = 'shower2':
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
-				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia. You look up, and to your despair, see that it was Christina. "Let''s make it a party girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.'
-				'With no way to escape, you resign yourself to the humiliation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut." is all she says before another girl takes her place.'
-				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they have all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and quickly run for a shower, cleaning the sticky juices from your face and hair.'
+				'You try slipping out in the crowd, hoping to avoid getting involved, but a hand grabs you, drags you back to the middle of the room and shoves you down next to Sonia.'
+				'You look up, and to your despair, see that it was Christina. "Let''s make it a party, girls! Now we have TWO sluts to eat us out!" she says mockingly before walking up to you and spreading her pussy, her clit exposed and awaiting your tongue.'
+				'With no way to escape, you resign yourself to the humiliation and start licking Christina''s pussy. She wants more, however, and grabs your hair in her hands before she starts roughly grinding her crotch against your face, smearing you with her wetness before starts quickly rubbing her clit. A shower of pussy juice then splashes across your face as she orgasms hard, then slams your face back into her crotch. "Lick me clean, bitch! I want you to drink every last drop of my cum!" When she''s finally done, she pulls your head up by your chin and slaps you hard. "Good slut," is all she says before another girl takes her place.'
+				'The group of girls surrounding you is too big for you to tell how much time passes or how many girls cum on you, but eventually they''ve all had a turn with you or Sonia and start throwing crude insults at both of you. Sonia doesn''t care and is furiously fingering herself next to you. Once the girls have gone, you ignore Sonia and quickly run for a shower, cleaning the sticky juices from your face and hair.'
 				gs 'arousal', 'cuni_give', -8, 'lesbian', 'sub', 'group', 'humiliation'
 				gs 'stat'
 				act 'Return to the locker room':
@@ -1310,10 +1313,10 @@ if $ARGS[0] = 'shower2':
 	elseif gymshower >= 5 and gymshower <= 7:
 		if pcs_pubes >= 40:
 			gt 'gschool_lessons4', 'pube_bully'
-		elseif grupTipe = 1 or grupTipe = 2:
-			gt'gschool_lessons4', 'pube_compliment'
 		elseif pcs_pubes > 25:
-			gt'gschool_lessons4','pube_bully'
+			gt 'gschool_lessons4','pube_bully'
+		elseif grupTipe = 1 or grupTipe = 2:
+			gt 'gschool_lessons4', 'pube_compliment'
 !!		elseif grupTipe = 4 or grupTipe = 2:
 !!			
 		else
@@ -1340,7 +1343,7 @@ if $ARGS[0] = 'pube_bully':
 	'"You''d need a chainsaw to trim that!"'
 	'Other girls in the room uncomfortably ignore the exchange, pretending not to hear either because they don''t want to get involved or are just trying to avoid becoming a target themselves.'
 	act 'Take the abuse':
-		cla & *clr
+		*clr & cla
 		pcs_mood -= 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/nudepic.jpg"></center>'
 		'You try to ignore their insults, but it really gets under your skin and it shows. Seeing the impact, they double down on their abuse.'
@@ -1353,7 +1356,7 @@ if $ARGS[0] = 'pube_bully':
 		act 'Return to the locker room': gt 'gschool_post_shower', 'post_shower'
 	end
 	act 'Tell them to fuck off':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/postphyssho1.jpg"></center>'
 		if grupTipe = 3 or grupTipe = 5:
 			'"Fuck off!" you hiss at them, twisting the faucet open a little harder than you intended.'
@@ -1388,7 +1391,7 @@ if $ARGS[0] = 'pube_bully':
 	act 'Ignore it':
 		grupvalue[1] += 4
 		grupvalue[2] += 2
-		cla & *clr
+		*clr & cla
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You roll your eyes and ignore them completely, turning on the faucet and rinsing your hair. They continue to sling insults at you, but you pay them no mind, picking up the soap and beginning to scrub your body.'
 		'After a few more tries, they realize that they aren''t going to get any reaction out of you and turn back to conversing amongst themselves, finally letting you shower in peace.'
@@ -1418,7 +1421,7 @@ if $ARGS[0] = 'whore_bully':
 		*nl
 		'To punctuate her point, she smiles and reaches forward, giving your ass a slap so hard and so sharp that it burns. And without another word, she turns back to her shower.'
 		act 'Cry':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/nudepic.jpg"></center>'
 			'Caught in the middle, you have no choice to but to keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
 			*nl
@@ -1427,7 +1430,7 @@ if $ARGS[0] = 'whore_bully':
 		end
 		
 		act 'Fume':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/bully_slap1.jpg"></center>'
 			'Caught in the middle, you have no choice to but to keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
 			*nl
@@ -1437,7 +1440,7 @@ if $ARGS[0] = 'whore_bully':
 	end
 	
 	act 'Ignore it':
-		cla & *clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/bully_slap2.jpg"></center>'
 		'You do your best to ignore it and keep heading towards the shower you chose. The other girls, seemingly egged on by Bella, also reach out to swat your ass along the way. Some of them giggle as they do, but what hurts more are the ones that don''t. They clap your cheeks with movements so casual they might as well have been giving a high five in the hallway. Like it''s just how they greet you.'
 		*nl
@@ -1556,19 +1559,20 @@ if $ARGS[0] = 'long_shower':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka1.jpg"></center>'
-				'You go to your locker and don''t see or hear anyone. Just as you finish drying your hair, you think you hear something, so you turn off the dryer and listen. You can''t hear anything now, but you could have sworn there was a sound coming from inside one of the lockers.'
+				'You go to your locker, but don''t see or hear anyone. Just as you finish drying your hair, you think you hear something, so you turn off the dryer and listen. You can''t hear anything now, but you could have sworn there was a sound coming from inside one of the lockers.'
 				act 'Get dressed':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petkaleave.jpg"></center>'
-					'You ignore the sounds and just chalk it up to your imagination. You go back to getting dressed and you don''t hear any more noise. It must have been your imagination.'
+					'You ignore the sounds and just chalk it up to your imagination. You go back to getting dressed and you don''t hear any more noises. It must have been your imagination.'
 					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
 				act 'Investigate the noise':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka2.jpg"></center>'
-					'You walk over to the lockers where you think you heard the noise come from. You get closer, look through the vents in the lockers and listen closely. As you get close to one it sounds like... someone breathing. Could someone be inside one of the lockers? "Is anyone there?" you ask, but hear no response. The breathing sound, if it ever existed, has stopped.'
+					'You walk over to the locker where you think you heard the noise come from and start peering through the vents as you listen closely. It sounds like... someone breathing?'
+					'"Is anyone there?" you ask, but hear no response. The breathing sound, if it ever existed, has stopped.'
 					act 'Open the locker': gt 'gschool_sex', 'petka_lockerroom'
 					act 'Ignore it':
 						*clr & cla
@@ -1619,7 +1623,7 @@ if $ARGS[0] = 'long_shower':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 							'"Sorry, I was just admiring what great shape you''re in. I didn''t mean anything by it," you say while shaking your head.'
-							'She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+							'She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she''s done, she walks out, leaving you alone in the locker room.'
 							gs 'arousal', 'erotic_nudity', 2
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -1665,7 +1669,7 @@ if $ARGS[0] = 'long_shower':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 								'You pull away from her and step back. "What are you doing?"'
-								'She gives you a confused stare. "I thought... never mind," she says while shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+								'She gives you a confused stare. "I thought... Never mind," she says while shaking her head. She starts getting dressed while ignoring you and you do the same. As soon as she''s done, she walks out, leaving you alone in the locker room.'
 								gs 'arousal', 'erotic_nudity', 2
 								gs 'arousal', 'end'
 								gs 'stat'
@@ -1691,7 +1695,7 @@ if $ARGS[0] = 'long_shower':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 							'"Sorry, I was just admiring what great shape you''re in. I didn''t mean anything by it," you say while shaking your head.'
-							'She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+							'She just shrugs. "Whatever," she grumbles before she starts getting dressed while ignoring you, and you do the same. As soon as she''s done, she walks out, leaving you alone in the locker room.'
 							gs 'arousal', 'erotic_nudity', 2
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -1717,7 +1721,7 @@ if $ARGS[0] = 'long_shower':
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
 									'You pull away from her and step back. "What are you doing?"'
-									'She gives you a confused stare. "I thought... never mind," she says, shaking her head. She starts to get dressed while ignoring you. You start getting dressed yourself and as soon as she is done, she walks out, leaving you alone in the locker room.'
+									'She gives you a confused stare. "I thought... Never mind," she says while shaking her head. She starts getting dressed while ignoring you and you do the same. As soon as she''s done, she walks out, leaving you alone in the locker room.'
 									gs 'arousal', 'erotic_nudity', 2
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -1730,7 +1734,7 @@ if $ARGS[0] = 'long_shower':
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/getdressed.jpg"></center>'
-					'You take your clothes out of your locker and start putting them on. While you get dressed, you can still hear someone talking in the other row of lockers, most likely on the phone. At this point you can tell it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She sounds very frustrated as she loudly argues with someone.','She''s happily speaking on the phone with someone.')+' Just as you finish dressing, she stops talking and walks round to where you are, wearing only a towel. She jumps when she notices you and briefly stares at you, perhaps wondering what you heard before she drops her towel and starts getting dressed while ignoring you.'
+					'You take your clothes out of your locker and start putting them on. As you get dressed, you can still hear someone talking in the other row of lockers, most likely on the phone. At this point you can tell it''s Albina. '+iif(AlbinaQW['StarletsShutDown'] = 0,'She sounds very frustrated as she loudly argues with someone.','She''s happily speaking on the phone with someone.')+' Just as you finish dressing, she stops talking and walks round to where you are, wearing only a towel. She jumps when she notices you and briefly stares at you, perhaps wondering what you heard before she drops her towel and starts getting dressed while ignoring you.'
 					'You can choose another outfit while you''re here.'
 					act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 				end
@@ -1832,7 +1836,7 @@ if $ARGS[0] = 'dress':
 			'Curious, you sneak toward the source of the soft, feminine sounds. As you get closer, you are sure you are about to come across some girls making out and, sure enough, when you peek around the next corner, you spy Lena and Lera making out and feeling each other up. Their display of passion is so infectious that you are tempted to join them, but they seem so into each other that you would feel guilty intruding on their tender moment. That doesn''t make it any less arousing to watch, though.'
 			gs 'arousal', 'erotic_nudity', 3
 			gs 'stat'
-			act 'Leave them in peace':gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
+			act 'Leave them in peace': gs 'arousal', 'end' & gt 'gschool_lessons4', 'post_dress'
 			act 'Masturbate':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/sex/mast<<rand(1,2)>>.mp4"></video></center>'

+ 4 - 4
locations/gschool_lessonsev2.qsrc

@@ -300,7 +300,7 @@ if $ARGS[0] = 'geography':
 							grupvalue[4] += 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
 							'You quickly start wiping the cum off you while giving them dirty looks, one of the girls giving you some tissues to help. You quickly clean yourself and your clothes up as best you can before Mrs. Sokoloff notices you. "What are you doing over there, Miss <<$pcs_lastname>>?"'
-							'You glance up at her before turning to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up."' 
+							'You glance up at her before turning to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up."'
 							'Mrs. Sokoloff looks up at the ceiling, as if expecting something to fall from it before she goes back to teaching the class.'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -599,7 +599,7 @@ if $ARGS[0] = 'math':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/fuckoff.jpg"></center>'
 					'What a pervert! You squeeze your legs together and loudly clear your throat. When Mr. Tsarev looks at you, he stares right at your extended middle finger. Everyone in class notices and all eyes are on you now.'
 					'"What is the meaning of this, Miss <<$pcs_lastname>>!?" he angrily scowls.'
-					'You''re not impressed. "One more look, and I''m telling the principal," you boldly say.' 
+					'You''re not impressed. "One more look, and I''m telling the principal," you boldly say.'
 					*nl
 					'He looks slightly nervous now, knowing that you caught him staring at you and tries to compose himself. "Miss <<$pcs_lastname>>, get out of my class!"'
 					'You have no intentions of getting up  "And I don''t know, maybe your wife?" you say with a sly smile.'
@@ -674,7 +674,7 @@ if $ARGS[0] = 'math':
 							'You bite your lip, a thrill of excitement running down your spine at what you''re about to do. You make sure no one else is watching before you pull up your skirt and pull your panties aside, exposing your pussy for you to take a photo. You quickly pull your panties back in place and pull your skirt back down once you have the picture.'
 						else
 							gs 'flash', 'pussy', 'indoors', 1, 1
-							'You bite your lip, a thrill of excitement running down your spine at what you'''re about to do. You make sure no one else is watching before you spread your legs and pull up your skirt, exposing your already bare pussy and taking a photo. You quickly pull your skirt back down once you have the picture.'
+							'You bite your lip, a thrill of excitement running down your spine at what you''re about to do. You make sure no one else is watching before you spread your legs and pull up your skirt, exposing your already bare pussy and taking a photo. You quickly pull your skirt back down once you have the picture.'
 						end
 						gs 'arousal', 'flash', -5, 'exhibitionism'
 						gs 'arousal', 'end'
@@ -901,7 +901,7 @@ if $ARGS[0] = 'history':
 								'You spend the rest of class with Roman''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
 							else
 								gs 'fame', 'pav', 'sex', 1
-								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity.' 
+								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity.'
 								'The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris, but your bare pussy is too tempting and you abandon the pencil for your two middle fingers. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
 								$orgasm_txt = 'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your legs clenching hard in orgasm. You bite your lip hard as you ride out the waves of pleasure and you feel Roman''s hand slide away before you see Mrs. Sokoloff giving you a curious look. With confident eyes and a bright smile, you quickly fix your clothes and sit up in your seat.'

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -903,7 +903,7 @@ if $ARGS[0] = 'music':
 				elseif cum_loc['vagina'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,12)
 					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from your pussy and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
-				elseif cum_loc['anus'] > 0:,
+				elseif cum_loc['anus'] > 0:
 					gs 'fame', 'pav', 'sex', rand(8,15)
 					'There are whistling and shouting sounds from the boys and whispers of intense disapproval from most of the girls behind you, and you realize that not only is your complete lack of panties on display for everyone to see, so is the cum leaking from between your ass cheeks and dribbling down your thigh. You quickly straighten up, but it''s too late and the class explodes into chaos, Mr. Vasilyev having no idea why as he tries to shout for order.'
 				end

+ 1 - 0
locations/intro_city.qsrc

@@ -174,6 +174,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 

+ 1 - 0
locations/intro_city_m.qsrc

@@ -133,6 +133,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the magical girl version of Girl Life! You are finally free of your parents and ready to face all the freedoms and challenges that entails. Guide <<$pcs_nickname>> through her school life, relationships and myriad of other issues that might pop up, all with the added spice of magic to keep things interesting!'
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 --- intro_city_m ---------------------------------

+ 1 - 0
locations/intro_city_tg.qsrc

@@ -403,6 +403,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the Transformation start! Although you''ve lost your masculinity and your old life, new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world!'
 	'Don''t forget to enroll in university during August if that''s a goal you want to pursue.'
 	act 'Start the game': gt 'korr'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'city' & gt 'stat_explanations', 'start'
 end
 
 --- intro_city_tg ---------------------------------

+ 1 - 0
locations/intro_sg.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'five':
 		act 'No': gt 'intro_sg', 'four'
 		act 'Yes': killall & gt 'start'
 	end
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'sg' & gt 'stat_explanations', 'start'
 end
 
 

+ 1 - 0
locations/intro_sg_m.qsrc

@@ -143,6 +143,7 @@ if $ARGS[0] = 'six':
 			gt 'bedrPar', 'intro'
 		end
 	end
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'sg_m' & gt 'stat_explanations', 'start'
 end
 
 

+ 2 - 0
locations/intro_sg_tg.qsrc

@@ -420,6 +420,7 @@ if $ARGS[0] = 'intro_8':
 end
 
 if $ARGS[0] = 'intro_9':
+	music_loop = 0
 	CLOSE ALL
 	*clr & cla
 	!!background : black
@@ -692,6 +693,7 @@ if $ARGS[0] = 'game_start':
 					if $starting_location = 'pavlovsk': gt 'bedrPar'
 					if $starting_location = 'gadukino': gt 'gad_gphouse', 'start'
 				end
+				act 'Introduction to character stats and the stat display': $stat_explanation = 'sg_tg' & gt 'stat_explanations', 'start'
 			end
 		end
 	end

+ 1 - 0
locations/intro_uni.qsrc

@@ -309,6 +309,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to Girl Life. Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 

+ 1 - 0
locations/intro_uni_m.qsrc

@@ -136,6 +136,7 @@ if $ARGS[0] = 'welcome_intro':
 	'Welcome to the Cursed University Student version! Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 --- intro_uni_m ---------------------------------

+ 1 - 0
locations/intro_uni_tg.qsrc

@@ -404,6 +404,7 @@ if $ARGS[0] = 'welcome_intro':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/uni_start.jpg"></center>'
 	'Welcome to the Transformation start! Although you''ve lost your masculinity and your old life, new possibilities are opening up before your eyes, not least aided in your newfound knowledge of the magical nature of the world! Guide <<$pcs_nickname>> through the many challenges of life at university. Manage coursework, a job and relationships with the people you meet on your journey.'
 	act 'Start the game': gt 'uni_grounds', 'main'
+	act 'Introduction to character stats and the stat display': $stat_explanation = 'uni' & gt 'stat_explanations', 'start'
 end
 
 --- intro_uni_tg ---------------------------------

+ 62 - 62
locations/journal_NPC_information.qsrc

@@ -176,20 +176,20 @@ elseif $ARGS[0] = 'A30':
 	'Your mother''s older sister, who works at the local pharmacy and has a live in boyfriend called Olu whom she met while traveling. He is an African man, which has caused more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care though, and if anything, seems to enjoy flaunting her boyfriend in front of others.'
 
 
-!!Great Grandfather
+!!Great Grandmother
 elseif $ARGS[0] = 'A31':
-	'<center><img src="images/characters/shared/headshots_main/31.jpg"></center>'
-	'<center>Zlatek Knavs (Great Grandfather)</center>'
+	'<center><img src="images/characters/shared/headshots_main/32.jpg"></center>'
+	'<center>Elena Knavs (Great Grandmother)</center>'
 
-	'Your great grandfather is a grumpy old man who is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane, so doesn''t leave the house unless he has to. Your mother and aunt were raised by your great grandparents.'
+	'Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of children and is now content with the peace and quiet of the village.'
 
 
-!!Great Grandmother
+!!Great Grandfather
 elseif $ARGS[0] = 'A32':
-	'<center><img src="images/characters/shared/headshots_main/32.jpg"></center>'
-	'<center>Elena Knavs (Great Grandmother)</center>'
+	'<center><img src="images/characters/shared/headshots_main/31.jpg"></center>'
+	'<center>Zlatek Knavs (Great Grandfather)</center>'
 
-	'Your great grandma is extremely old and almost never leaves the house. Most of the time, she just sits on her bed watching TV or slowly cleans the house. Having raised your mother and aunt Luda, she is like a grandmother to you and a mother to your mother. She has raised two generations of children and is now content with the peace and quiet of the village.'
+	'Your great grandfather is a grumpy old man who is always complaining about the village elders and how they have neglected the village to the point where it is now barely fit to live in. He can walk, but requires a cane, so doesn''t leave the house unless he has to. Your mother and aunt were raised by your great grandparents.'
 
 
 !!Anya
@@ -528,10 +528,10 @@ elseif $ARGS[0] = 'A25':
 		!!Sonia will always be grupTipe 5 at this time? Commenting out until further notice. Blame Anjuna
 		!!if npc_grupTipe['A25'] = 1:
 		if grupTipe = 1:
-			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful and sociable, Sonia loves to have fun and is rarely in a bad mood. She even had grades nearly as good as most of the nerds.' 
+			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful and sociable, Sonia loves to have fun and is rarely in a bad mood. She even had grades nearly as good as most of the nerds.'
 			'After a series of slutty incidents that crescendoed at the dance where she got way too drunk, gave Vitek and his buddies a simultaneous blowjob and returned with her face covered in their cum, Sonia''s reputation is in shambles. Even at university, most of the girls give her the silent treatment while the guys still treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her.'
 		else
-			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, many of the other popular girls seem jealous of her sense of style. Pretty, smart, cheerful and sociable, Sonia loves to have fun and is rarely in a bad mood. She even had grades nearly as good as most of the nerds.' 
+			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, many of the other popular girls seem jealous of her sense of style. Pretty, smart, cheerful and sociable, Sonia loves to have fun and is rarely in a bad mood. She even had grades nearly as good as most of the nerds.'
 			'After a series of slutty incidents that crescendoed at the dance where she got way too drunk, gave Vitek and his buddies a simultaneous blowjob and returned with her face covered in their cum, Sonia''s reputation has been in shambles. Even at university, most of the girls give her the silent treatment while the guys still treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her.'
 		end
 		'She is getting a fashion degree at the university.'
@@ -598,7 +598,7 @@ elseif $ARGS[0] = 'A140':
 elseif $ARGS[0] = 'A146':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/146.jpg"></center>'
 	'<center>Marcus Larson</center>'
-	
+
 	if $ARGS[1] = 'gschool':
 		if grupTipe = 1:
 			'Marcus Larson is an African American exchange student who arrived at the school last year and opted to stay for a second year. He does well in school, is a good athlete and seems to really enjoy Russia. He has an eye for Russian girls, always going on about how they are much more beautiful than the girls back home and is a decent looking guy himself which, combined with his exotic looks, accent, athletic ability and different views, has made him popular with the cool kids and jocks. He is friendly and outgoing and if he wasn''t such close friends with Andrey, he would have likely been a jock instead, as he seems to get along with them even more than most of the cool kids.'
@@ -656,14 +656,14 @@ elseif $ARGS[0] = 'A148':
 		else
 			'Mefodiy Utkin is reasonably intelligent, with middle-of-the-road grades. He is fairly average looking, but possesses a good sense of humor and timing. He isn''t too popular, just popular enough to hang among the cool kids, who like his humor.'
 		end
-	
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A148'], 'm'
 
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with him.'
 		'Mefodiy Utkin was reasonably intelligent, with middle-of-the-road grades. He was fairly average looking, but possessed a good sense of humor and timing. He wasn''t too popular, just popular enough to hang among the cool kids, who liked his humor.'
 		'He just packed up and left right after graduation. Rumors are he is traveling around Europe.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A148'], 'm'
 
 	elseif $ARGS[1] = 'city':
@@ -697,14 +697,14 @@ if $ARGS[0] = 'A3':
 		else
 			'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and spends a lot of training and is regularly away competing. Despite being considered very good looking by the girls in school, he isn''t very sociable and, other than when he is training, tends to keep to himself, although he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
 		end
-		
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A3'], 'm'
 
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with him.'
 		'Ivan Prokhorov is a talented athlete who was able to succeed in any sport he took part in. He is mostly into boxing and running and was considered to be very good looking by the girls in school. He spends a lot of time training and is regularly away competing. He wasn''t very sociable and, other than when he is training, tended to keep to himself, although he occasionally hung out with Fedor. He was calm and collected by nature, some might even say apathetic.'
 		'He stayed in Pavlovsk to work and support his family, though he does go to the city to train in boxing and has started boxing professionally.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A3'], 'm'
 
 	elseif $ARGS[1] = 'city':
@@ -723,18 +723,18 @@ elseif $ARGS[0] = 'A5':
 			else
 				'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks Ivan''s level of talent. He is a member of all the school''s sports teams. He is decent looking and often is seen chasing Ivan''s leftovers.'
 			end
-			
+
 		elseif npc_grupTipe['A5'] = 5:
 			'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone, he has been an outcast. Fedor claims he was forced and had no choice, but most people think he actually wanted to do it. Many of the boys mock him and even his former friend Ivan ignores him. The girls are nearly as bad, as many of them make fun of him as well. Fedor now mostly keeps to himself and tries to avoid the other students.'
 		end
-			
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A5'], 'm'
 
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with him.'
 		if npc_grupTipe['A5'] = 2:
 			'Fedor Kozlov is a decent athlete. He often trained with his good friend Ivan, but lacked Ivan''s level of talent. He was a member of all the school''s sports teams. He was decent looking and could often be seen chasing Ivan''s leftovers.'
-			
+
 		elseif npc_grupTipe['A5'] = 5:
 			'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone, he has been an outcast. Fedor claimed he was forced and had no choice, but most people thought he actually wanted to do it. Many of the boys mocked him and even his former friend Ivan ignored him. The girls were nearly as bad, as many of them made fun of him as well. Fedor has kept mostly himself and tried to avoid the other students.'
 		end
@@ -905,14 +905,14 @@ elseif $ARGS[0] = 'A141':
 		else
 			'Veronika Sokolov is called the "Ice Queen" by her fellow students behind her back for two reasons. One is that she is a very talented ice skater; there is even talk about how she might compete in the next winter Olympics. The other is because she is cold and indifferent and never lets anyone get close to her. She comes from one of the wealthier families in Pavlovsk.'
 		end
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A141'], 'f'
-	
+
 	elseif $ARGS[1] = 'uni':
 		!'You went to Pavlovsk Secondary school with her, she has since moved away to go train for the Olympics.'
 		'Veronika Sokolov was called the "Ice Queen" by her fellow students behind her back for two reasons. One is that she was a very talented ice skater, while the other is because she was cold and indifferent and never let anyone get close to her. She came from one of the wealthier families in Pavlovsk.'
 		'She left to join the Russian Olympic skating team.'
-		
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A141'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -963,7 +963,7 @@ elseif $ARGS[0] = 'A150':
 		!!'You went to Pavlovsk Secondary school with him.'
 		'Erast Vagin was a huge boy, nearly two meters tall, and was very strong. He wasn''t a looker or even clever, but was always polite and a little shy, especially around girls. He often defended girls from being bullied by the other boys, not afraid to stand up to several gopniks at once. Most of the girls were nice to him because of it, though a few of them loved to tease him and make him blush. No one that seen him play sports would mistake him for a big teddy bear, as he could be ferocious when he chose to be. He was an average athlete and relied on his size and strength to win the day for him. Other than playing sports, he sometimes boxed with Ivan.'
 		'He stayed in Pavlovsk.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A150'], 'm'
 
 	elseif $ARGS[1] = 'city':
@@ -1222,15 +1222,15 @@ elseif $ARGS[0] = 'A240':
 	'<center><<"Natalia [Nat] Pavlova">></center>'
 	if $ARGS[1] = 'gschool':
 		'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her friendly attitude and eagerness to help others prevents her from being an outcast, despite her not being overly attractive. She is rarely seen hanging out with anyone and fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
-	
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A240'], 'f'
-	
-	
+
+
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with her, she has since moved away to go the Moscow University.'
 		'Natalia was a very smart, but weak willed girl. She constantly struggled to maintain friendships, but her good looks and eagerness to help others prevented her from being an outcast. Despite this, she was rarely seen hanging out with anyone. She also fiercely guarded a notebook she liked to keep private, never letting anyone read or even touch it.'
 		'She left to attend the university in Moscow.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A240'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -1264,7 +1264,7 @@ if $ARGS[0] = 'A9':
 		else
 			'Vitek Kotov is an aggressive and strong guy who considers himself to be a "gangsta". He is very loud, obnoxious, and not very attractive. Lena is his twin sister, whom he is overly protective of, which has caused more than a fair share of drama. He is the leader of the local gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is rumored to be involved with the local organized crime selling drugs.'
 		end
-		
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A9'], 'm'
 
 	elseif $ARGS[1] = 'uni':
@@ -1293,7 +1293,7 @@ elseif $ARGS[0] = 'A10':
 		!!'You went to Pavlovsk Secondary school with him.'
 		'Dan Ryzhov was a tall and skinny guy whose body language screamed his disdain and contempt for others. He was a very stubborn guy who would never let an argument be. He was best friends with Vitek and Vasily and was considered to be the smartest of the bunch, although most didn''t consider that to be much of a feat.'
 		'He stayed in Pavlovsk, still hanging out with Vitek.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A10'], 'm'
 
 	elseif $ARGS[1] = 'city':
@@ -1367,7 +1367,7 @@ elseif $ARGS[0] = 'A21':
 		!!'You went to Pavlovsk Secondary school with her.'
 		'Lera Tsarev came from a poor family. Her father works at the school as a teacher. After her cousin Lesco moved in with them, she often picked on him and the other outcasts at school. She often hung out with the gopniks in your class and was liked by them. She was best friends with Lena and they could often be found together, smoking in the school''s restrooms or hanging out after school. She was protective of Lena and always took her lead. It was rumored that she is a lesbian and was in love with Lena.'
 		'She stayed in Pavlovsk.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A21'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -1392,7 +1392,7 @@ elseif $ARGS[0] = 'A24':
 		!!'You went to Pavlovsk Secondary school with her.'
 		'Pauline Sebagotulina was a bit of a wild child, which made her very unpredictable. She often hung out with the gopniks in your class and was liked by them. No one dared to mess with her because she was in more fights than anyone else. She and Katyusha could sometimes be found sparring together and starting fights with others.'
 		'She stayed in Pavlovsk.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A24'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -1417,7 +1417,7 @@ elseif $ARGS[0] = 'A143':
 		!!'You went to Pavlovsk Secondary school with her.'
 		'Alyona Zima was a hardcore troublemaker. She lived to cause trouble and jumped into any trouble she can find. She could often be found drinking alcohol, and was drunk more often than not. The only person she seemed to spend a lot of time around was Anushka, although she occasionally hung out with the boys from the band or Lena and Lera. It was well known that she carried a knife with her everywhere she went, which caused others to give her a wide berth. Rumor is her mother is a drug addict and her father is an alcoholic bully. Most people viewed her as the apple that didn''t fall far from the tree.'
 		'She moved to the city and moved in with the boys from the band.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A143'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -1463,14 +1463,14 @@ elseif $ARGS[0] = 'A145':
 		else
 			'Katyusha Maksimov is the least attractive girl in school. Her face and body are too masculine, she tends to dress like a boy and never shaves her arm pits or legs. She only seems to care about two things; booze and fighting. Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one.'
 		end
-		
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A145'], 'f'
 
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with her. She left Pavlovsk and no one seems to know where she went.'
 		'Katyusha Maksimov was the least attractive girl in school. Her face and body were too masculine and she tended to dress like a boy while never shaving her arm pits or legs. She only seemed to care about two things; booze and fighting. Regardless of the weather, she practiced Sambo in the park every day before school, often taunting or making fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She didn''t see herself as a gopnik, but other people considered her one.'
 		'Shortly after graduation, she moved away without telling anyone where she was going. Rumors are she joined the army.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A145'], 'f'
 
 	elseif $ARGS[1] = 'city':
@@ -1615,14 +1615,14 @@ elseif $ARGS[0] = 'A189':
 			'Niko Volkov is clever, but short tempered. When he''s not drinking and partying, he is hanging out with Lavrenti, with many saying that he only spends time with Lavrenti for his money. He always seems confident and well spoken, but can sometimes come off as paranoid and unstable.'
 		end
 
-		
+
 		gs 'journal_NPC_information', 'Relationship', npc_rel['A189'], 'm'
 
 	elseif $ARGS[1] = 'uni':
 		!!'You went to Pavlovsk Secondary school with him. Shortly after graduation he disappeared and no one knows where he went.'
 		'Niko Volkov was clever, but short tempered. When he wasn''t drinking and partying, he was hanging out with Lavrenti, with many saying that he only spent time with Lavrenti for his money. He always seemed confident and well spoken, but could sometimes come off as paranoid and unstable.'
 		'He disappered just after graduation and no one has seen him since.'
-		
+
 		gs 'journal_NPC_information', 'Past_Relationship', npc_rel['A189'], 'm'
 
 	elseif $ARGS[1] = 'city':
@@ -1655,7 +1655,7 @@ if $ARGS[0] = 'A7':
 		'Everyone bullies Lesco about anything and everything. The nephew of Mr. Tsarev and the cousin of Lera, he has been residing with his uncle after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very sociable. He always seems be sad and just wants to be left alone.'
 
 	elseif $ARGS[1] = 'uni':
-		'Everyone bullied Lesco about anything and everything. The nephew of Mr. Tsarev and the cousin of Lera, he had been residing with his uncle after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very sociable. He always seems be sad and just wants to be left alone.' 
+		'Everyone bullied Lesco about anything and everything. The nephew of Mr. Tsarev and the cousin of Lera, he had been residing with his uncle after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very sociable. He always seems be sad and just wants to be left alone.'
 		'He is getting a teaching degree at the university.'
 
 	elseif $ARGS[1] = 'city':
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'A77':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/77.jpg"></center>'
 	'<center>Tryndin Maximovich</center>'
 	'Tryndin lives in apartment 37 in the residential area of the city and attends the city university.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A77'], 'm'
 
 
@@ -1712,7 +1712,7 @@ elseif $ARGS[0] = 'A82':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/82.jpg"></center>'
 	'<center>Djibril Maina</center>'
 	'Djibril is from Africa. He is the nephew of Oluuosegun, your aunt''s boyfriend, and lives in the student dorms. He is studying for a business degree.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A82'], 'm'
 
 
@@ -1721,7 +1721,7 @@ elseif $ARGS[0] = 'A83':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/83.jpg"></center>'
 	'<center>Goshi Sidorov</center>'
 	'Goshi has lived in Saint Petersburg his whole life and comes from a well off family; not rich, but not wanting for things. He is used to always getting his way. His mother is a stay at home mom and his dad is a business man. He is going to the university to follow in his father''s footsteps by getting a business degree.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A83'], 'm'
 
 
@@ -1730,7 +1730,7 @@ elseif $ARGS[0] = 'A84':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/84.jpg"></center>'
 	'<center>Kendra Abiodun</center>'
 	'Kendra is from South Africa and attends the university in Saint Petersburg. She is well known to have a dominant personality, often trying to dominate those around her. Some believe she is a racist as she seems to especially love dominating white students that attend the university. She is studying for a business degree.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A84'], 'f'
 
 
@@ -1739,7 +1739,7 @@ elseif $ARGS[0] = 'A220':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/220.jpg"></center>'
 	'<center>Vika Kirilova</center>'
 	'Vika lives in the dorms and attends the city university. She comes from a town in a truly remote part of Russia. Her family is poor, yet she seems to always have money.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A220'], 'f'
 
 
@@ -1748,7 +1748,7 @@ elseif $ARGS[0] = 'A242':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/242.jpg"></center>'
 	'<center>Lebogang "Lebo" Kayode</center>'
 	'Djibril''s closet friend in Russia. They both live on the same floor in the same dorm and also attends the university. He is also from Africa.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A242'], 'm'
 
 
@@ -1757,7 +1757,7 @@ elseif $ARGS[0] = 'A243':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/243.jpg"></center>'
 	'<center>Ermias Okeke</center>'
 	'Ermias is Lebogang''s dorm roommate and friend. He is also from Africa.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A243'], 'm'
 
 
@@ -1766,7 +1766,7 @@ elseif $ARGS[0] = 'A244':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/244.jpg"></center>'
 	'<center>Farai Ihejirika</center>'
 	'Farai is Djibril''s roommate at the university. He is also from Africa.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A244'], 'm'
 
 
@@ -1775,7 +1775,7 @@ elseif $ARGS[0] = 'A245':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/245.jpg"></center>'
 	'<center>Haruna Babatunde</center>'
 	'Haruna is close friends with Djibril, having met in their freshman year. He lives on the same floor of the dorms, and is also from Africa.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A245'], 'm'
 
 
@@ -1784,7 +1784,7 @@ elseif $ARGS[0] = 'A246':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/246.jpg"></center>'
 	'<center>Arendse Idowu</center>'
 	'Arendse is Haruna''s roommate and friend. They live in the same dorm room and both attend the university. He is also from Africa.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A246'], 'm'
 
 
@@ -1794,25 +1794,25 @@ elseif $ARGS[0] = 'A247':
 	'<center>Liliya Lyubimova</center>'
 	'Liliya is a very attractive and rather tall girl. Nobody knows too much about her other than that she is a true tease. She finds amusement in teasing the boys by flashing them or just looking seductively. She refuses any advances made towards her and doesn''t let anybody to touch or even try to flirt with her. Those who attempt to do so end up recieving a slap or some emasculating comeback line.'
 	'She is getting a teaching degree at the university.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A247'], 'f'
-	
+
 
 !!Mia
 elseif $ARGS[0] = 'A267':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/267.jpg"></center>'
 	'<center>Mia Radimova</center>'
 	'The elder of the identical twins studying nursing at the university. She and Yana are inseparable and are seen almost everywhere together. Like her younger sister, she enjoys playing pranks on her professors and classmates and causing confusion about who is actually who. Her parents are divorced, but her father pays for her tuition. There is a rumor spreading across campus claiming that he is a porn star.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A267'], 'f'
-	
-	
+
+
 !!Yana
 elseif $ARGS[0] = 'A268':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/267.jpg"></center>'
 	'<center>Yana Radimova</center>'
 	'The younger of the identical twins studying nursing at the university. She and Mia are inseparable and are seen almost everywhere together. Like her older sister, she enjoys playing pranks on her professors and classmates and causing confusion about who is actually who. Her parents are divorced, but her father pays for her tuition. There is a rumor spreading across campus claiming that he is a porn star.'
-	
+
 	gs 'journal_NPC_information', 'Relationship', npc_rel['A268'], 'f'
 
 
@@ -1982,39 +1982,39 @@ end
 if $ARGS[0] = 'A254':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/254.jpg"></center>'
 	'<center>Klim Kovalyov</center>'
-	
+
 	'Klim is the professor of General Education. He is young and in good shape, with most girls finding him very attractive. He dresses casually and is very friendly with his students, known to let them get away with a lot and join in with the horsing around and joke telling during lectures. He is rumored to be single.'
-	
+
 elseif $ARGS[0] = 'A255':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/255.jpg"></center>'
 	'<center>Grigorii Pasternak</center>'
-	
+
 	'Grigorii is the professor of Teaching Methods. He is an older stoic man who dresses well and gets on with things, expecting his students to give their full attention during his lectures. He is happy to help any of his students by answering questions and helping anyone who is in trouble or struggling in his class. He is married and has teenage children.'
 
 elseif $ARGS[0] = 'A256':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/256.jpg"></center>'
 	'<center>Selena Kovalchuk</center>'
-	
+
 	'Selena is the professor of Learning Theories. She is in her forties and dresses well, but is extremely nerdy, often talking at length about the latest sci-fi, fantasy, supernatural and superhero TV shows, films and comics. Some say she even attends conventions and cosplay events. She''s married with a young daughter; her husband is a lecturer in a different department.'
 
 elseif $ARGS[0] = 'A269':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/269.jpg"></center>'
 	'<center>Raina Marinova</center>'
-	
+
 	'Raina is the professor of Anatomy and Physiology. Young and attractive, she isn''t much older than the students she teaches and tries to make her lessons fun and enjoyable. However, she is a bit of a gossip and enjoys talking about both her colleagues and other students during her lectures.'
-	
+
 elseif $ARGS[0] = 'A270':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/270.jpg"></center>'
 	'<center>Olena Kudelina</center>'
-	
+
 	'Olena is the professor of Patient Care. A woman past her prime, she has a chip on her shoulder about her now former husband cheating on her with a younger woman and is thus extremely bitter towards both her students and her younger colleagues. She takes particular pleasure in ridiculing and belittling students who don''t live up to her high standards.'
-	
+
 elseif $ARGS[0] = 'A271':
 	!!'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/271.jpg"></center>'
 	'<center>Nikita Borisov</center>'
-	
+
 	'Nikita is the professor who teaches the more mundane nursing subjects. An attractive, but shy and somewhat nerdy man, he makes no effort to make his boring lectures interesting and has a habit of speaking at length and in excessive detail. His students often take advantage of his meek personality to amuse themselves or get away with things.'
-	
+
 end
 
 

+ 1 - 1
locations/model_krystal.qsrc

@@ -802,7 +802,7 @@ if $ARGS[0] = 'krystalshower':
 			pcs_makeup = 1
 			gs 'arousal', 'voyeur_sex', 15
 			dynamic $showerdin
-			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/shared/sex/shower/doggy5.mp4"></video></center>'
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,3)>>.mp4"></video></center>'
 			'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if pcs_horny >= 40:

+ 1 - 0
locations/pain.qsrc

@@ -206,6 +206,7 @@ else
 
     !arousal calculation
     !arousal += (pain[1] * pain[2]) * pain[3] * masochism['pref'] / 1000
+	gs 'pain', 'calc'
 end
 
 --- pain ---------------------------------

+ 14 - 1
locations/pav_beach_chat.qsrc

@@ -448,7 +448,20 @@ if $ARGS[0] = 'ivan':
 	gs 'exp_gain', 'chrsm', rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/beach_chat.jpg"></center>'
-	if npc_rel['A3'] >= 50:
+!!added this top bit so the community center shower stuff can be done during the summer. make sure I copied it correctly
+	if fame['pav_slut'] < 225 and IvanShowerQW = 1:
+		IvanShowerQW = 11
+		'Ivan thinks for a second before he speaks. "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics. I think I have a good shot at getting to the Russian National Championships this year. I really can''t afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'
+		act 'Discuss':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
+			'You nod at what he says. "Sure Ivan, I understand. I''m okay with just being friends, really close friends who sometimes fool around in the shower..." you say in your best sexy voice with a wink.'
+			'He gives you a one armed hug. "<<$pcs_nickname>>, you''re the best! Not only are you smoking hot, but you''re a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses and looks around before leaning in close. "Or if you get a little bored during lunch break, you can let me know too..." he says with a suggestive tone and waggled eyebrows.'
+			'You laugh at his silly antics. It''s nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
+			func('npc_reactions', 'general', 'A3')
+			act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
+		end
+	elseif npc_rel['A3'] >= 50:
 		'"Hey <<$pcs_nickname>>," Ivan greets you as he sees you approaching.'
 		'"Hey Ivan. How was your last training match?" you ask curiously.'
 		'He tells you about it and after that the two of you talk about a variety of topics for a while until he gets up and says he''s going for a swim. He runs out into the lake and dives forward once the water is deep enough.'

+ 2 - 2
locations/pushkin.qsrc

@@ -50,8 +50,8 @@ end
 !!this location does not exist
 !!if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
-act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pushkin'
 act 'Walk to Okhlopkov Square (0:05)': minut += 5 & gt 'pushkin_sq'
+act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pushkin'
 act 'Walk to the highway (0:05)': minut += 5 & nroad = 19 & gt 'road'
 act 'Walk to the park (0:10)': minut += 10 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)': minut += 15 & gt 'pav_train_hall'
@@ -76,7 +76,7 @@ end
 
 act 'Wait':gs 'obj_din', 'wait'
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 gs 'prostitution_functions', 'check_solicitation_event'
 
 

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -1816,7 +1816,7 @@ if $ARGS[0] = 'kiss':
 				end
 			end
 			if sex_ev['virgin'] > 0 and sex_ev['fuck_count'] > 0:
-				act'For making taking your virginity':
+				act'For taking your virginity':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 					'"For popping my cherry," you smile wryly. "You''ve made a woman out of me."'

+ 4 - 4
locations/sex_ev_condoms.qsrc

@@ -1834,11 +1834,11 @@ if $ARGS[0] = 'father_check':
 	'List of potential fathers:'
 	:potfather_loop
 	if $wombpotfath[potfather_counter] ! 'unknown':
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 	else
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 	end
-	if $boy = potfather_temp[2]: potfather_counter += 1
+	if $boy = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
 end
 
@@ -2961,7 +2961,7 @@ if $ARGS[0] = 'virgin_condom2':
 					'"My aunt gave it to me earlier this week," you say. "For emergencies..."'
 				elseif LudaQW['condom_give_day'] >= daystart - 30:
 					'"My aunt gave it to me a few weeks ago," you say. "Just in case..."'
-				elseif LudaQW['condom_give_day'] >= daystart - 7:
+				else
 					'"My aunt gave it to me a long time ago," you say. "Just in case..."'
 				end
 				gs 'sex_ev_condoms', 'virgin_condom3'

+ 0 - 2
locations/sex_ev_dress_talking.qsrc

@@ -1226,9 +1226,7 @@ if $ARGS[0] = 'isnt_going_to_work':
 			end
 		end
 	end
-end
 
-if $ARGS[0] = 'isnt_going_to_work':
 	act'Grab your things':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'

+ 5 - 3
locations/sex_ev_foreplay.qsrc

@@ -164,6 +164,7 @@ if $ARGS[0] = 'selfish_fuck_start':
 				gs 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>>_goto'
 			end
 			gs 'sex_ev_condoms', 'condom_wait'
+			gs 'sex_ev_condoms', 'dont_cum_in_me'
 		elseif stat['think_virgin'] = 0 or sex_ev['fuck_count'] > 0:
 			if $npc_fav_pos[$boy] = 'doggy' or sex_ev['position_rand'] = 2:
 				$sex_ev['position'] = 'doggy'
@@ -176,6 +177,7 @@ if $ARGS[0] = 'selfish_fuck_start':
 			end
 			gs 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>>_goto'
 			gs 'sex_ev_condoms', 'condom_wait'
+			gs 'sex_ev_condoms', 'dont_cum_in_me'
 		else
 			gs 'sex_ev_sex', 'rand_position'
 			gs 'sex_ev_foreplay', 'selfish_fuck_start'
@@ -2095,14 +2097,14 @@ end
 if $ARGS[0] = 'bj_dom_swallow_react':
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-	if $npc_cum_pref[$boy] = 'mouth' and npc_cum_pref_know[$boy] = 0:
+	if $npc_cum_pref[$boy] = 'mouth' and $npc_cum_pref_know[$boy] = '':
 		'"Holy..." <<$npc_firstname[$boy]>> lets his head fall back onto his pillow, his mind seemingly blown by your blowjob skills. Taking satisfaction in a job well done, you continue teasing his cock, running your lips up and down its shaft, peppering it with kisses. "That was incredible..."'
 		'"Mmmm?" you hum pleasantly. "You liked it that much?"'
 		'"Like you sucked the soul outta me," he smiles tiredly. "I love the feeling of blowing a load in a girl''s mouth like that, but that was something else."'
 
 		act'You like oral creampies?':
 			cla & *nl
-			npc_cum_pref_know[$boy]= $npc_cum_pref[$boy]
+			$npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 			'"You really like to come in my mouth that much?" you ask, giving his shaft another kiss.'
 			'"Yeah," he sighs. "Even better than nutting inside a pussy."'
 			act'Good to know':
@@ -2134,7 +2136,7 @@ if $ARGS[0] = 'bj_dom_swallow_react':
 			gs 'sex_ev_sex', 'sex_end'
 		end
 	else
-		if $npc_cum_pref[$boy] = 'mouth' and npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
+		if $npc_cum_pref[$boy] = 'mouth' and $npc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 			'"Woah," <<$npc_firstname[$boy]>>''s head flops onto the pillow, while you continue to play with his cock, still twitching in the throes of post-orgasm bliss. "Your mouth is so fucking good."'
 			act'I know you love oral creampies':
 				cla & *nl

+ 1 - 1
locations/sex_ev_pillow_talk2.qsrc

@@ -339,7 +339,7 @@ if $ARGS[0] = 'relationship_talk':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk5.jpg"></center>'
 			'"So," you say casually. "Got a girlfriend?"'
-			if npc_girlfriend[$boy] = 1:
+			if npc_girlfriend[$boy] = 2:
 				gs'sex_ev_stats', 'npc_is_married'
 				if $npc_goal[$boy] = 'sex':
 					'"Nah," <<$npc_firstname[$boy]>> replies. "I don''t want to be tied down. I like to keep things loose."'

+ 2 - 1
locations/sex_ev_shower.qsrc

@@ -664,7 +664,7 @@ if $ARGS[0] = 'together_fuck_doggy2':
 	gs'arousal', 'vaginal',rand(10,15), 'no_orgasm_msg', $sex_ev['prostitution_flag']
 	gs'stat'
 	cla & *clr
-	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,5)>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/shared/sex/shower/doggy<<rand(1,4)>>.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>>''s hips slap against your ass as he eagerly fucks your pussy, helping you get hot and steamy in every sense of the phrase. Which is a good thing because it''s pretty chilly, bent over like this so far outside the range of the shower. But the sex is more than making up for it.'
 	if rand(1,20) > 1:
 		*nl
@@ -1083,6 +1083,7 @@ if $ARGS[0] = 'shower_together_ending_kiss':
 end
 
 if $ARGS[0] = 'shower_together_towel':
+	sex_ev['boy_in_shower'] = 0
 	sex_ev['shower'] = 1
 	noshampoo = 1
 	dynamic $showerdin

+ 1 - 1
locations/sex_ev_talk.qsrc

@@ -701,7 +701,7 @@ if $ARGS[0] = 'creampie_permission_code':
 end
 
 if $ARGS[0] = 'creampie_permission1':
-	if npc_free_creampies[$boy] < 1 and npc_creampie_permission[$boy] < 1 and sex_ev['creampie_allowance'] = 0 and sex_ev['no_condom'] = 1 and sex_ev['pullout_thank'] + sex_ev['promise_no_creampie'] = 0:
+	if npc_free_creampies[$boy] < 1 and npc_creampie_permission[$boy] < 1 and sex_ev['creampie_allowance'] = 0 and sex_ev['no_condom'] = 1 and sex_ev['pullout_thank'] + sex_ev['promise_no_creampie'] = 0 and sex_ev['not_inside'] ! 1:
 		act'"You don''t have to pull out" (free creampies)':
 			cla & *clr
 			if sex_ev['sex_over'] = 0:

+ 20 - 16
locations/stat_display.qsrc

@@ -37,7 +37,7 @@ if debug['trace_shown'] ! 0:
 			p 'clear'
 		end
 		nl '<hr>'
-		
+
 		p '<a href="exec:$debug[''direct_trace''] = '''' & gs ''stat_display''">clear</a>&nbsp;|&nbsp;'
 		pl '<a href="exec:debug[''trace_shown''] = 0 & gs ''stat''">return</a></center>'
 
@@ -114,7 +114,7 @@ if Enable_showstatimg = 1:
 		$img_temp = func('$body_image','bodysuit')
 		if $img_temp ! '':  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	
+
 	if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
 	else
@@ -362,7 +362,7 @@ end
 
 if hypnoSchedule = 1:
 	if therapist_weekly_block = 0 and week = 4 and therapistday ! daystart:
-		if $stat_hypno_msg ! '': 
+		if $stat_hypno_msg ! '':
 			$stat_hypno_msg += '<br>'
 			$stat_hypno_tooltip += '<br>'
 		end
@@ -1175,7 +1175,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and cheatVars['no_periods'] = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/vagina.png"></a></td>'
 	end
-	
+
 	if menu_off = 0 and birth_control['remind_icon'] = 1:
 		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			$statusIconBarTab += '<td><a href="exec:msg ''You are out of birth control pills!''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
@@ -1185,7 +1185,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and birth_control['remind_icon'] = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 	end
-	
+
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		$stat_bleed_msg = 'You need to use your feminine hygiene products'+iif($pantyworntype = 'none', ' and you need to also wear panties if you want to use a sanitary pad.', '.')
 		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vperiod_bleeding.png"></a></td>'
@@ -1258,13 +1258,17 @@ if cheatStatusIcons = 0:
 
 	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = <<set_siconht>> src="images/system/icons/status/visible_cum.png"></a></td>'
 
-	if pcs_traits['cumeater'] = 1 and cheatVars['no_trait_cumeater'] = 0:
-		if stat_cumloc_check = 1 and menu_off = 0:
-			$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-		elseif stat_cumloc_check = 1 and menu_off = 1:
+	if pcs_traits['cumeater'] = 1 and cheatVars['no_trait_cumeater'] = 0 and $stat_cum_msg ! '' and $stat_cum_msg ! 'Your mouth has the tangy aftertaste of sperm.':
+		if menu_off = 1:
 			$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-		elseif stat_cumloc_check = 2:
-			$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+		else
+			if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or  cumloc[11] > 0 or cumloc[13] > 0 or  cumloc[14] > 0 or cumloc[16] > 0:
+				$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) :
+				$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			else
+				$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
+			end
 		end
 	end
 
@@ -1274,7 +1278,7 @@ if cheatStatusIcons = 0:
 		else
 			if cumloc[2] > 0 or cumloc[5] > 0 or cumloc[6] > 0 or cumloc[7] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or  cumloc[11] > 0 or cumloc[13] > 0 or  cumloc[14] > 0 or cumloc[16] > 0:
 				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
-			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) : 
+			elseif FUNC('Cum_Manage', 'check_private') = 1 and (cumloc[1] + cumloc[4] > 0 or FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1) or (FUNC('Cum_Manage', 'check_private', 15) = 1 and cumloc[15] > 0) :
 				$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
 			else
 				$statusIconBarTab += '<td><a href="exec:msg $stat_private_msg"><img title="<<$stat_private_msg>>" height = <<set_siconht>> src="images/system/icons/status/wipes.png"></a></td>'
@@ -1382,7 +1386,7 @@ if cheatStatusIcons = 0:
 				$stat_masseuse_msg += '17:00, '
 			end
 			$stat_masseuse_msg += 'and you have worked <<masseuse[''shifts_worked'']>> of the required <<masseuse[''shifts_required'']>> shifts.'
-		
+
 			$statusIconBarTab += '<td><a href="exec: msg $stat_masseuse_msg"><img title="<<$stat_masseuse_msg>>" height = <<set_siconht>> src="images/system/icons/status/masseuse.png"></a></td>'
 		end
 	end
@@ -1417,7 +1421,7 @@ if cheatStatusIcons = 0:
 		$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'
 		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
 	end
-	
+
 	if pfilmNO ! 1:
 		if pornstar['icon'] = 1 and pornstar['icon_disable'] ! daystart:
 			if hour < 11:
@@ -1432,7 +1436,7 @@ if cheatStatusIcons = 0:
 			end
 		end
 	end
-	
+
 	$statusIconBarTab += '</tr><tr>'
 
 	!!Row 5: Clothes,...
@@ -1975,7 +1979,7 @@ if enable_extra_msg = 1:
 
 	if drugVars['cigarettes_day'] = daystart and drugVars['cigarettes_hour'] = hour and drugVars['cigarettes_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a cigarette.</font><BR>'
 	if drugVars['weed_day'] = daystart and drugVars['weed_hour'] = hour and drugVars['weed_minute'] >= minut: $stat_msg += '<BR><font color="green">You are smoking a joint.</font><BR>'
-	
+
 	if cheatVars['no_sweat'] = 0:
 		if pcs_sweat > 59:
 			$stat_msg += '<br><b><font color="red"><<$stat_sweat_msg>></font></b><br>'

File diff suppressed because it is too large
+ 111 - 210
locations/stat_explanations.qsrc


+ 1 - 0
locations/therapist_home.qsrc

@@ -190,6 +190,7 @@ if $ARGS[0] = 'sex':
 				*clr & cla
 				gs 'arousal', 'vaginal', 5, 'sub'
 				gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
+				$orgasm_or = 'yes'
 				gs 'arousal', 'end'
 				gs 'stat'
 

+ 30 - 30
locations/uni_lessons_electives1.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'Computers 101':
 	'You walk into the classroom and take a seat at one of the computer stations. The rest of your classmates walk in one-by-one before Mr. Blagov enters the lab and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Blagov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'computers 101', pcs_intel
@@ -61,7 +61,7 @@ if $ARGS[0] = 'Computers 101':
 				if npc_rel['A1'] >= 60:
 					'You sit next to Dimka, but other than making a few crude remarks about your sexual exploits, he just ignores you and a fellow student asks you to be quiet.'
 				else
-					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."' 
+					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."'
 					'You hear several other students snicker at his comments. Embarrassed, you move to another location and sit by yourself.'
 				end
 			else
@@ -83,10 +83,10 @@ if $ARGS[0] = 'Computers 101':
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
 			if npc_rel['A144'] >= 60:
 				if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
-					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"' 
+					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"'
 					'You know she''s just being her normal playful self and the two of you are talking away and missing much of the class.'
 				else
-					'You sit next to Anushka, who smiles at you as you sit down. "What up?"' 
+					'You sit next to Anushka, who smiles at you as you sit down. "What up?"'
 					'The two of you are soon talking away and missing much of the class.'
 				end
 			elseif npc_rel['A144'] <= 20:
@@ -242,7 +242,7 @@ if $ARGS[0] = 'art_101_model':
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
@@ -250,7 +250,7 @@ if $ARGS[0] = 'art_101_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
@@ -262,8 +262,8 @@ if $ARGS[0] = 'art_101_model':
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'art_101_model':
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	end
 end
-
+s
 if $ARGS[0] = 'art_101_model_igor':
 	menu_off = 1
 	gs 'stat'
@@ -286,31 +286,31 @@ if $ARGS[0] = 'art_101_model_igor':
 			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly and Igor seems engrossed by it.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most. The class goes by fairly quickly.'
 		end
 	else
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.'
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."' 
-			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model."'
+			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."' 
-			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on it. "Today, we have one of your fellow students as a model."'
+			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.'
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
@@ -341,11 +341,11 @@ if $ARGS[0] = 'art_101_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
-			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to start drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'After the lecture, Mr. Ilyushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to start drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Aww, man!" you hear Feofan mutter in disappointment.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on it. "Aww, man!" you hear Feofan mutter in disappointment.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Feofan seems to be focusing on trying to draw the guys shoes. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female1.jpg"></center>'
@@ -353,12 +353,12 @@ if $ARGS[0] = 'art_101_model_feofan':
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
-			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.'
+			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your seat, Miss Konstantinov."'
 			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.' 
+			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin continues. "Please take your position, Miss Barlovskaya."'
 			'Albina stands on the platform and assumes a position where she pulls her leg up to the back of her head. Her muscular legs and toned ass are highlighted by her yoga pants as Mr. Ilyushin nods in approval and walks to the back of the class, where he tells everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Albina, you overhear a few of your male classmates talking about she''s one of the hottest girls they''ve ever drawn and how they hope she models next semester too. The class goes by fairly quickly. Meanwhile, Feofan seems to spend a lot of time trying to draw her ass just right. The class goes by fairly quickly.'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			'You notice that Natasha seems happy drawing the object and gets on with it, rarely needing guidance from the professor, but the class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male1.jpg"></center>'
-			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on it. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too.'
 			'You''re sitting next to Natasha and notice that as soon as the model takes his place, she gets very embarrassed and starts blushing. She clearly struggles to concentrate and keeps making mistakes as you see her rubbing out parts of her drawing and starting over until the professor comes over and talks to her. The class goes by fairly quickly.'
 		elseif temprand = 3:
@@ -401,7 +401,7 @@ if $ARGS[0] = 'art_101_model_natasha':
 			'You notice that Natasha seems to struggle at first and blushes slightly. After a few pointers from the professor, she gains confidence and seems happy to continue. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."'
 			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too.'
 			'You look over at Natasha and notice that as soon as Anushka straddles the bar, she gets deeply embarrassed and starts blushing. She clearly struggles during the lesson, requiring the professor to spend some time with her, but the class goes by fairly quickly.'
 		elseif temprand = 5:
@@ -424,7 +424,7 @@ if $ARGS[0] = 'Psychology 101':
 	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
@@ -465,13 +465,13 @@ if $ARGS[0] = 'Psychology 101':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
 				if kendraQW['sub'] < 1:
 					'You''re about to sit next to Kendra when she glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 				elseif kendraQW['sub'] >= 10:
 					if npc_rel['A82'] >= 60:
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You''re about to sit next to Kendra when she glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end
@@ -480,7 +480,7 @@ if $ARGS[0] = 'Psychology 101':
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'  
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end

+ 41 - 41
locations/uni_lessons_electives2.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Computers 102':
 	'You walk into the classroom and take a seat at one of the computer lab stations. The rest of your classmates walk in one by one before Mr. Blagov enters the classroom and closes the door. He turns to the class and starts today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Blagov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'computers 102', pcs_intel
@@ -60,7 +60,7 @@ if $ARGS[0] = 'Computers 102':
 				if npc_rel['A4'] >= 60:
 					'You sit next to Dimka, but other than making a few crude remarks about your sexual exploits, he just ignores you and a fellow student asks you to be quiet.'
 				else
-					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."' 
+					'You start to sit next to Dimka when he looks over at you. "Don''t you fucking dare sit near me, slut. Go spread your diseases somewhere else."'
 					'You hear several other students snicker at his comments. Embarrassed, you move to another location and sit by yourself.'
 				end
 			else
@@ -82,10 +82,10 @@ if $ARGS[0] = 'Computers 102':
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
 			if npc_rel['A144'] >= 60:
 				if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
-					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"' 
+					'You sit next to Anushka, who she smiles at you as you take a seat. "What up, slut?"'
 					'You know she''s just being her normal playful self and the two of you are talking away and missing much of the class.'
 				else
-					'You sit next to Anushka, who smiles at you as you sit down. "What up?"' 
+					'You sit next to Anushka, who smiles at you as you sit down. "What up?"'
 					'The two of you are soon talking away and missing much of the class.'
 				end
 			elseif npc_rel['A144'] <= 20:
@@ -238,7 +238,7 @@ if $ARGS[0] = 'art_102_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -246,11 +246,11 @@ if $ARGS[0] = 'art_102_model':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -263,19 +263,19 @@ if $ARGS[0] = 'art_102_model':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina3.jpg"></center>'
@@ -295,7 +295,7 @@ if $ARGS[0] = 'art_102_model_igor':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -303,12 +303,12 @@ if $ARGS[0] = 'art_102_model_igor':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. Igor, meanwhile, is looking a little flushed as he starts drawing.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor looks her over as she strips down, but he doesn''t seem to be leering like the other boys. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. Igor, meanwhile, seems very intent on trying to capture her feminine form, paying special attention to her clothes and body position. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -321,19 +321,19 @@ if $ARGS[0] = 'art_102_model_igor':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, is looking a little flushed as he starts drawing. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her. Igor, meanwhile, seems very intent on trying to capture her femine form, paying special attention to her body position. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina3.jpg"></center>'
@@ -353,7 +353,7 @@ if $ARGS[0] = 'art_102_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -362,12 +362,12 @@ if $ARGS[0] = 'art_102_model_feofan':
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in and strips down to her panties.'
-			'"I''m so glad I took art this year," you overhear Feofan mutter to himself as she sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'"I''m so glad I took art this year," you overhear Feofan mutter to himself as she sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Glancing over at Feofan''s work, you notice he seems to being spending a lot of time drawing her breasts.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. The class goes by fairly quickly, but you do notice how Mr. Ilyushin seems to spend more time than normal with Feofan.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -380,21 +380,21 @@ if $ARGS[0] = 'art_102_model_feofan':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
 			'You notice Feofan is trying not to look at the naked guy, which only makes you smile at his discomfort. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Man, I love art class..." Feofan mutters to himself.' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Man, I love art class..." Feofan mutters to himself.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else.'
 			'As Anushka strips down, you notice Feofan swallow as he tries not to stare. You''re pretty sure you can see a growing bulge in his pants though.'
-			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'Anushka gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class. Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom//electives/art/models/albina3.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin sets up a raised platform as a familiar face walks into the classroom. It''s Albina, who is wearing a short robe. "Today, we have one of your fellow students as a model. Please take your position, Miss Barlovskaya." Albina removes her robe to reveal that she''s completely naked before she sits on the platform and assumes a tastefully artistic pose.'
@@ -413,7 +413,7 @@ if $ARGS[0] = 'art_102_model_natasha':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. This is a theory lesson which Natasha is clearly comfortable with and she doesn''t require any assistance from the lecturer. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male2.jpg"></center>'
@@ -421,12 +421,12 @@ if $ARGS[0] = 'art_102_model_natasha':
 			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models later in the semester too. You look over at Natasha and notice that she''s bright red. You aren''t sure if this is due to embarrassment or if she might fancy the model; maybe it''s a bit of both. The class goes by fairly quickly.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman with short hair comes in. As Mr. Ilyushin talks, she strips down to her panties and sits on the chair in a position that has one of her arms covering her nipples, leaving her just barely covered. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look over at Natasha, you see that she''s clearly uncomfortable with the woman''s lack of clothing and is unable to stop herself from blushing. You let out a small, quiet giggle before concentrating on your work for the rest of the lesson. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka2.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.' 
-			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat, showing off a pair of pink and black panties with a matching bra, along with a black garter belt and stockings. Her look is finished off with some very tall heels. She kneels down on the platform, which causes her panties to slip up the crack of her ass as she looks back over her shoulder taking a modeling pose with a big smile.'
+			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models later in the semester too. When you glance over at Natasha, you see that she''s clearly a bit uncomfortable with Anushka''s state of undress and despite her best efforts, she can''t stop herself from blushing slightly. You shake your head slightly and smile before getting on with your own work. The class goes by fairly quickly.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/albina2.jpg"></center>'
@@ -439,20 +439,20 @@ if $ARGS[0] = 'art_102_model_natasha':
 		temprand = rand(0,5)
 		if temprand <= 1:
 			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.'
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Natasha concentrates hard on the lecture and is clearly comfortable with a theory lesson. The lecturer didn''t need to come over to her and could concentrate on helping some of the other students. The class goes by fairly quickly.'
 		elseif temprand = 2:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/male3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."' 
-			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously.' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and strips down before laying down on his side on the platform. "Today, we have one of your fellow students as a model."'
+			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few your female classmates talking about how he''s not as good looking as the previous male models. Two of the girls can''t stop giggling, much to Mr. Ilyushin''s annoyance, who lectures them about taking it seriously.'
 			'You notice that Natasha is glowing bright red and think back to school, feeling that the reason she''s so embarrassed at the whole situation is because she was rumoured to have gone out on a few dates with Lazar, so this model clearly wouldn''t appeal to her.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/female3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in wearing an overcoat, which she removes to reveal that she''s completely naked underneath as she sits down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. When you look at Natasha, you see that she''s clearly very uncomfortable with the situation and is simply unable to stop herself from blushing. You quietly giggle, but the lecturer notices and tells you to get on with your work before going to help Natasha. The class goes by fairly quickly.'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/models/anushka3.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.' 
+			'After he finishes his lecture, Mr. Ilyushin brings out a raised platform as a familiar face walks into the classroom. It''s Anushka, who is wearing an overcoat. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov." As he talks, she removes the overcoat to reveal that she''s completely naked underneath, showing off her tattoos - and everything else. She gets on the platform and sits down, leaning to one side to support herself with one arm while tucking her legs back up under her as she smiles at the class.'
 			'Mr. Ilyushin nods in approval before walking to the back of the class and telling everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they would like to bang her.'
 			'You glance over at Natasha and see that she''s clearly uncomfortable with Anushka''s lack of clothing. She blushes occasionally and clearly struggles to concentrate on her work until the lecturer comes over and talks to her, giving her come encouragement and guidance.'
 		elseif temprand = 5:
@@ -474,7 +474,7 @@ if $ARGS[0] = 'Psychology 102':
 	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
@@ -515,13 +515,13 @@ if $ARGS[0] = 'Psychology 102':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
 				if kendraQW['sub'] < 1:
 					'You start to sit next to Kendra, who glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 				elseif kendraQW['sub'] >= 10:
 					if npc_rel['A82'] >= 60:
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "We''re not friends. You''re nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, <i>ever</i>. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end
@@ -530,7 +530,7 @@ if $ARGS[0] = 'Psychology 102':
 						'You decide to sit next to Kendra. You talk to her and she even lets you get a few words in, but she mostly treats you like a pet or someone simple, often making condescending comments towards you.'
 					elseif npc_rel['A82'] <= 20:
 						'You start to sit next to Kendra, who glares at you. "I don''t think so, Princess. We''re not friends and I want nothing to do with you. Go sit somewhere else."'
-						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.'
 					else
 						'You sit next to Kendra and try to have a conversation with her, but anytime you try and get a word in, she gives you a dirty look until you shut up and let her keep talking.'
 					end

+ 35 - 35
locations/uni_lessons_electivesev1.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'computers_101':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/uni/classroom/comp_djibirl1.jpg"></center>'
 		if anushkaQW['djibril_sex'] >= 1:
 			'The class is pretty uneventful for the most part, but you notice Djibril sat next to Anushka. He''s flirting with her, but she''s really making him work for her attention, which you find a little amusing.'
-			'As Mr. Blagov finishes his lecture, he informs the class that he won''t be able to stay after to help anyone and if someone needs to ask him something, then they should come and see him in his office later or wait for the next class.' 
+			'As Mr. Blagov finishes his lecture, he informs the class that he won''t be able to stay after to help anyone and if someone needs to ask him something, then they should come and see him in his office later or wait for the next class.'
 			'With class finished, everyone gets up and heads for the exit. You glance back and see that Djibril has stopped Anushka and they''re talking by one of the computers.'
 			act 'Leave': gt 'uni_lessons', 'short_break'
 			act 'Wait for Anushka':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'computers_101':
 							act 'Keep watching':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/uni/classroom/comp_djibirl5.jpg"></center>'
-								'Anushka starts playing with her breasts as she bobs her head up and down on Djirbil''s dick. "Fuccck... You''re amazing at this," he moans out fairly loudly, which only encourages her to redouble her efforts and pick up the pace, making even more wet slurping sounds as she takes his cock deep into her mouth. "Oh, fuck yeah, just like that..." he moans out.' 
+								'Anushka starts playing with her breasts as she bobs her head up and down on Djirbil''s dick. "Fuccck... You''re amazing at this," he moans out fairly loudly, which only encourages her to redouble her efforts and pick up the pace, making even more wet slurping sounds as she takes his cock deep into her mouth. "Oh, fuck yeah, just like that..." he moans out.'
 								'She then pops his dick out of her mouth and gets off her knees. "My turn," she says as she sits on the table.'
 								gs 'arousal', 'voyeur_sex', 2
 								gs 'stat'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'computers_101':
 
 																			!! Evaluates time until 17:45 and grants study progress accordingly
 																			gs 'uni_lessons_electivesev1', 'study_with_friends'
-																			
+
 																			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 																			'You smile. "Yeah, that sounds like a good idea. Mind if I come?"'
 																			'She shrugs. "Sure, if you want, but I really do have to study." Her tone makes it clear she doesn''t have time to mess around like she did back in Pavlovsk.'
@@ -243,10 +243,10 @@ if $ARGS[0] = 'computers_101':
 																		act 'Ask if you can come along':
 																			*clr & cla
 																			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 																			!! Evaluates time until 17:45 and grants study progress accordingly
 																			gs 'uni_lessons_electivesev1', 'study_with_friends'
-																
+
 																			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 																			'You smile. "Yeah, that sounds like a good idea. Mind if I come?"'
 																			'She shrugs. "Sure, if you want, but I really do have to study." Her tone makes it clear she doesn''t have time to mess around like she did back in Pavlovsk.'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'computers_101':
 				*clr & cla
 				gs 'npc_relationship', 'modify', 'A144', 'like'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/lecture_hall/lecture_hall.jpg"></center>'
-				'You wait out in the hallway for a few minutes before Djibril comes out with Anushka. They''re talking and laughing together. "Catch you later, Nush." He stops when he sees you. "Hey <<$pcs_nickname>>, how you been? I got to go, but we should totally catch up. Later."' 
+				'You wait out in the hallway for a few minutes before Djibril comes out with Anushka. They''re talking and laughing together. "Catch you later, Nush." He stops when he sees you. "Hey <<$pcs_nickname>>, how you been? I got to go, but we should totally catch up. Later."'
 				'He walks away, giving you a friendly smile as he does. Once he''s gone, you turn to Anushka. "Hey, what''s up?"'
 				if npc_rel['A144'] >= 60:
 					'She looks a little surprised and gives you a puzzled look. "You know him?"'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Agree to go':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -343,7 +343,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -368,7 +368,7 @@ if $ARGS[0] = 'computers_101':
 				gs 'npc_relationship', 'modify', 'A144', 'like'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/lecture_hall/lecture_hall.jpg"></center>'
 				if npc_rel['A144'] >= 60:
-					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other, and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.' 
+					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other, and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.'
 					'Once he''s gone, you turn to Anushka. "Hey, what''s up?"'
 					if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
 						'She smiles as she sees you. "What up, slut?" You know she''s just being her normal playful self.'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'computers_101':
 					'"<<$pcs_nickname>>," you reply and you talk for a few minutes before he looks at his watch. "Shit, I need to get going, but it was nice meeting you." He hurries off without waiting for a reply.'
 					act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 				else
-					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.' 
+					'You wait out in the hallway for a few minutes before the young black man comes out with Anushka. They''re talking and laughing together. "Hello there," he says to you. Anushka then introduces you to each other and you find out his name is Djibril. "Well, I need to get going girls. Catch you later, Nush." He walks away while giving you a friendly smile.'
 					'Once he''s gone, you turn to Anushka. "So who was that?"'
 					'She glances at you with a smirk. "Why do you care? You think he''s hot or something?"'
 					'You shrug as you walk with her. "I was just curious. You seemed to be flirting a lot."'
@@ -438,7 +438,7 @@ if $ARGS[0] = 'computers_101':
 					act 'Ask if you can come along':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 						!! Evaluates time until 17:45 and grants study progress accordingly
 						gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -489,7 +489,7 @@ if $ARGS[0] = 'comp_nush':
 		act 'Agree to go':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 			!! Evaluates time until 17:45 and grants study progress accordingly
 			gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -521,7 +521,7 @@ if $ARGS[0] = 'comp_nush':
 		act 'Ask if you can come along':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A144', 'like'
-			
+
 			!! Evaluates time until 17:45 and grants study progress accordingly
 			gs 'uni_lessons_electivesev1', 'study_with_friends'
 
@@ -613,7 +613,7 @@ if $ARGS[0] = 'psychology_101':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra_resist.jpg"></center>'
 						'You shake your head. "Sorry mistress, I can''t... I''m not a whore that you can just pimp out."'
-						'An angry scowl appears on her face. "Listen you little fucking cunt, either get down on your knees or we''re done!"' 
+						'An angry scowl appears on her face. "Listen you little fucking cunt, either get down on your knees or we''re done!"'
 						act 'Obey': gt 'uni_lessons_electivesev1', 'obey_kendra'
 						gs 'willpower', 'humiliation', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -632,13 +632,13 @@ if $ARGS[0] = 'psychology_101':
 							end
 						else
 							act 'Refuse again (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end	
+						end
 					end
 				else
 					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-		end				
+		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
 		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
@@ -688,14 +688,14 @@ if $ARGS[0] = 'obey_kendra':
 				act 'Deepthroat':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra4.jpg"></center>'
-					'He places his hand on the back of your head as well, but instead of forcing your head forward he just holds it so you can''t pull away. He then forces his dick down your throat until your nose is pressing against his stomach and you can feel his balls against your chin. As you struggle to breathe, he pulls back and allows you to gasp before he does it again, letting up just enough so you can breathe.' 
+					'He places his hand on the back of your head as well, but instead of forcing your head forward he just holds it so you can''t pull away. He then forces his dick down your throat until your nose is pressing against his stomach and you can feel his balls against your chin. As you struggle to breathe, he pulls back and allows you to gasp before he does it again, letting up just enough so you can breathe.'
 					'"That''s it, choke this white slut with your black cock!"'
 					gs 'arousal', 'bj', 1, 'humiliation', 'sub', 'deepthroat', 'rough'
 					gs 'stat'
 					act 'Get face fucked':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra5.jpg"></center>'
-						'He starts roughly face fucking you, holding one hand on your head so you can''t pull away while Kendra lends a hand. You keep gasping and gagging as he shoves his dick down your throat.' 
+						'He starts roughly face fucking you, holding one hand on your head so you can''t pull away while Kendra lends a hand. You keep gasping and gagging as he shoves his dick down your throat.'
 						'"Okay, enough of that. Let the white slut stand up."'
 						'You feel her grab your hair and pull your head away until his dick pops out of your mouth, followed by her pulling you up into a standing position. "Get on your feet, slave!" she barks.'
 						gs 'arousal', 'bj', 1, 'humiliation', 'sub', 'deepthroat', 'rough'
@@ -754,8 +754,8 @@ end
 if $ARGS[0] = 'obey_kendra_offdesk':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra11.jpg"></center>'
-	'Once he pulls his dick out of you, you slide off the desk as your mistress commands, eager to obey her.' 
-	'"Kneel, slut!" she demands and you obediently drop to your knees as the guy comes over to stand next to you. "Now suck that nasty pussy juice of yours off his dick."' 
+	'Once he pulls his dick out of you, you slide off the desk as your mistress commands, eager to obey her.'
+	'"Kneel, slut!" she demands and you obediently drop to your knees as the guy comes over to stand next to you. "Now suck that nasty pussy juice of yours off his dick."'
 	'You open your mouth just in time for him to eagerly stick his cock back in your mouth. You do your best to slurp up all your pussy juices off it before she issues another command. "Stand up and bend over the desk." You again obey and do as your mistress commands.'
 	gs 'arousal', 'bj', 1, 'humiliation', 'sub'
 	gs 'stat'
@@ -764,14 +764,14 @@ if $ARGS[0] = 'obey_kendra_offdesk':
 		dick = 20
 		$dick_girth = 'thick'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra12.jpg"></center>'
-		'You bend over the desk, placing your elbows on the desk with your ass facing Kendra and the boy. You glance back to watch them, feeling very exposed and vulnerable standing like this in a classroom, knowing someone could come back at any moment. Kendra spreads your ass checks apart and spits on your asshole before she turns to the guy. "I want you to fuck this white slut''s asshole dry, fuck it raw until she cries." He gives her a slightly surprised look. "Do what I tell you! This white slut loves having her ass ripped apart by huge black cocks."' 
+		'You bend over the desk, placing your elbows on the desk with your ass facing Kendra and the boy. You glance back to watch them, feeling very exposed and vulnerable standing like this in a classroom, knowing someone could come back at any moment. Kendra spreads your ass checks apart and spits on your asshole before she turns to the guy. "I want you to fuck this white slut''s asshole dry, fuck it raw until she cries." He gives her a slightly surprised look. "Do what I tell you! This white slut loves having her ass ripped apart by huge black cocks."'
 		'When you don''t say anything, he moves up behind you and rubs the tip of his cock against your asshole. He pushes hard until the head of his cock pops painfully into your ass, causing you to gasp and whine in pain. "Go on, shove that big black cock of yours into that tiny tight asshole and rip it up!" Kendra barks as you close your eyes against the growing pain. You let out a pained yelp as his <<dick>>cm <<$dick_girth>> dick is shoved deeper into your unlubed asshole.'
 		gs 'arousal', 'anal', 2, 'humiliation', 'sub'
 		gs 'stat'
 		act 'Get your ass fucked':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra13.jpg"></center>'
-			'You hiss in pain as he finally bottoms his dick out in your ass. You feel his balls slap against the wet slit of your pussy as he starts roughly fucking your asshole. "That''s it, tear that little white asshole up!" Kendra says, sounding almost orgasmic. She climbs on the desk in front of you and backs her ass up to your face. You start to lick her pussy as your ass gets fucked, but she grabs your head and pulls it up until your tongue is licking her asshole. "Oooh yeah. Lick my ass, slut!"' 
+			'You hiss in pain as he finally bottoms his dick out in your ass. You feel his balls slap against the wet slit of your pussy as he starts roughly fucking your asshole. "That''s it, tear that little white asshole up!" Kendra says, sounding almost orgasmic. She climbs on the desk in front of you and backs her ass up to your face. You start to lick her pussy as your ass gets fucked, but she grabs your head and pulls it up until your tongue is licking her asshole. "Oooh yeah. Lick my ass, slut!"'
 			'You feel his hand join hers on the back of your head as he pushes your face deeper between her ebony cheeks.'
 			gs 'arousal', 'anal', 2, 'humiliation', 'sub', 'rough'
 			gs 'arousal', 'rimming', -2, 'humiliation', 'sub', 'rough'
@@ -793,7 +793,7 @@ end
 if $ARGS[0] = 'obey_kendra_takecum':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra15.jpg"></center>'
-	'Kendra suddenly pulls away from you. "Don''t cum in her ass!" she says and he pulls out of you, much to your relief. "Get down on your knees, slut!" she says while point at the floor next to her. You slide off the desk again and get down on your knees next to her before she kneels down behind you and reaches around to roughly pull your jaw so your mouth is open as wide as it will go. "Stick out your tongue, slut." You do as you''re told as she looks up at the guy. "Shoot your load in her dirty mouth."' 
+	'Kendra suddenly pulls away from you. "Don''t cum in her ass!" she says and he pulls out of you, much to your relief. "Get down on your knees, slut!" she says while point at the floor next to her. You slide off the desk again and get down on your knees next to her before she kneels down behind you and reaches around to roughly pull your jaw so your mouth is open as wide as it will go. "Stick out your tongue, slut." You do as you''re told as she looks up at the guy. "Shoot your load in her dirty mouth."'
 	'He stands in front of you stroking his dick while aiming at your face. A few seconds later, the first stream of cum hits your chin before the next one goes right into your open mouth. Several more follow, with some going in your mouth while others hit you in the face around your mouth. He finally lets out one more loud groan and then relaxes, having spent his full load.'
 	gs 'cum_call', 'face', 0
 	gs 'cum_call', 'mouth', 0
@@ -802,8 +802,8 @@ if $ARGS[0] = 'obey_kendra_takecum':
 		*clr & cla
 		gs 'fame', 'city', 'sex', 5
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/sex/classroom/kendra16.jpg"></center>'
-		'"Don''t swallow that prime African cum until I tell you to!" Kendra demands, so you stay perfectly still with your mouth full of cum, letting the cum from your chin drip onto her hand. "Why don''t you take a picture of this dirty fucking white slut covered in your cum so you can show all your friends?"' 
-		'He grins at the notion before grabbing his phone and taking a picture of you with his cum in your mouth as Kendra holds your mouth open. He takes several more pictures before he puts the phone down on the desk and starts getting dressed. Kendra gets up as well and starts to get dressed as well, looking down at you as she does. "Stay... And don''t swallow."' 
+		'"Don''t swallow that prime African cum until I tell you to!" Kendra demands, so you stay perfectly still with your mouth full of cum, letting the cum from your chin drip onto her hand. "Why don''t you take a picture of this dirty fucking white slut covered in your cum so you can show all your friends?"'
+		'He grins at the notion before grabbing his phone and taking a picture of you with his cum in your mouth as Kendra holds your mouth open. He takes several more pictures before he puts the phone down on the desk and starts getting dressed. Kendra gets up as well and starts to get dressed as well, looking down at you as she does. "Stay... And don''t swallow."'
 		'Once they''re both fully dressed and cleaned up, Kendra turns to you again while you still kneel on the floor naked covered in cum. "Swallow, slut!"'
 		act 'Swallow':
 			*clr & cla
@@ -824,25 +824,25 @@ if $ARGS[0] = 'obey_kendra_takecum':
 	end
 end
 
-!! This is a modified copy of the regular study code from uni_library. 
+!! This is a modified copy of the regular study code from uni_library.
 !! It will go down the list of classes to study, and determine if there is benefit from studying it
 !! If there isn''t, it will go down the list. If there are none left, it will give intel exp
 if $ARGS[0] = 'study_with_friends':
 
 	temp_hours_studied_with_friend = 1
-	if hour <= 13: 
+	if hour <= 13:
 		minut += 285 - minut
 		temp_hours_studied_with_friend = 5
-	elseif hour = 14: 
+	elseif hour = 14:
 		minut += 225 - minut
 		temp_hours_studied_with_friend = 4
-	elseif hour = 15: 
+	elseif hour = 15:
 		minut += 165 - minut
 		temp_hours_studied_with_friend = 3
-	elseif hour = 16: 
+	elseif hour = 16:
 		minut += 105 - minut
 		temp_hours_studied_with_friend = 2
-	elseif hour = 17 and minut < 45: 
+	elseif hour = 17 and minut < 45:
 		minut += 45 - minut
 		temp_hours_studied_with_friend = 1
 	end
@@ -854,7 +854,7 @@ if $ARGS[0] = 'study_with_friends':
 
 			if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
 				gs 'grades', 'optional_activity_attribute', '<<$class_list_institution[i]>>', '<<$class_list_name[i]>>', 'yes', '<<temp_hours_studied_with_friend>>'
-				
+
 			else
 				i += 1
 				if ARRSIZE('class_list_institution') >= i: jump 'study_with_friends_loop'
@@ -862,14 +862,14 @@ if $ARGS[0] = 'study_with_friends':
 				gs 'exp_gain', 'intel', rand(temp_hours_studied_with_friend - 1, (temp_hours_studied_with_friend + 1))
 			end
 
-		else 
+		else
 			i += 1
 			if ARRSIZE('class_list_institution') >= i: jump 'study_with_friends_loop'
 			killvar 'i'
 			gs 'exp_gain', 'intel', rand(temp_hours_studied_with_friend - 1, (temp_hours_studied_with_friend + 1))
 		end
 	end
-	
+
 	gs 'stat'
 	killvar 'temp_hours_studied_with_friend'
 end

+ 12 - 10
locations/willpower.qsrc

@@ -937,17 +937,19 @@ end
 if $ARGS[0] = 'pay':
 	if will_cost < 1 and cheatVars['willpower'] = 0: will_cost = 1
 	pcs_willpwr -= will_cost
-	if $ARGS[1] = 'force':
-		if willpowermax < 150:
-			will_counter += 10
-		end
-		if will_enforced < 20: will_enforced += 1
-		gs 'exp_gain', 'persuas', rand(1,2)
-	elseif $ARGS[1] ! 'chore':
-		if willpowermax < 150:
-			will_counter += 1
+	if $ARGS[0] ! 'chore':
+		if $ARGS[1] = 'force':
+			if willpowermax < 150:
+				will_counter += 10
+			end
+			if will_enforced < 20: will_enforced += 1
+			gs 'exp_gain', 'persuas', rand(1,2)
+		else
+			if willpowermax < 150:
+				will_counter += 1
+			end
+			if $ARGS[1] = 'resist': gs 'exp_gain', 'sprt', rand(1,2)
 		end
-		if $ARGS[1] = 'resist': gs 'exp_gain', 'sprt', rand(1,2)
 	end
 	if will_counter >= 20: will_counter -= 20 & willpowermax += 1
 end

Some files were not shown because too many files changed in this diff