Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

hornguy6 4 years ago
parent
commit
1c41fc3314
43 changed files with 570 additions and 224 deletions
  1. 5 0
      locations/Cheatmenu_din.qsrc
  2. 2 1
      locations/FedorEv4.qsrc
  3. 1 0
      locations/Komp.qsrc
  4. 35 6
      locations/artemhome.qsrc
  5. 1 1
      locations/backwater.qsrc
  6. 1 1
      locations/bed2.qsrc
  7. 4 4
      locations/bicycle.qsrc
  8. 1 1
      locations/cikl.qsrc
  9. 13 13
      locations/gadforest.qsrc
  10. 10 10
      locations/gadforest_event.qsrc
  11. 2 2
      locations/gadforestlost.qsrc
  12. 11 11
      locations/gadforestrelax.qsrc
  13. 4 4
      locations/gadforestswamp.qsrc
  14. 6 6
      locations/gadgarden.qsrc
  15. 2 2
      locations/gopsex.qsrc
  16. 7 1
      locations/gschool_groups.qsrc
  17. 3 0
      locations/gschool_lessons4.qsrc
  18. 1 1
      locations/gschool_lessonsev3.qsrc
  19. 2 2
      locations/hotel_resep.qsrc
  20. 2 0
      locations/housecall.qsrc
  21. 1 1
      locations/hunter_interactions.qsrc
  22. 1 1
      locations/hunters.qsrc
  23. 74 74
      locations/journal.qsrc
  24. 67 14
      locations/katalkin.qsrc
  25. 18 13
      locations/kotovSex.qsrc
  26. 1 1
      locations/kruchess.qsrc
  27. 53 4
      locations/natbelapt.qsrc
  28. 10 2
      locations/phone_selfies_popup.qsrc
  29. 1 1
      locations/placer_sex.qsrc
  30. 1 0
      locations/pod_ezd.qsrc
  31. 1 1
      locations/porn_view.qsrc
  32. 33 16
      locations/preCUST.qsrc
  33. 4 4
      locations/preSYS.qsrc
  34. 1 1
      locations/preSYS2.qsrc
  35. 122 0
      locations/shortgs.qsrc
  36. 2 2
      locations/sister.qsrc
  37. 1 1
      locations/sister_chat.qsrc
  38. 2 0
      locations/sistersleep.qsrc
  39. 1 1
      locations/stat_sklattrib_lvlset.qsrc
  40. 2 1
      locations/stwork2.qsrc
  41. 6 6
      locations/swamp_yard.qsrc
  42. 50 10
      locations/telefon.qsrc
  43. 5 4
      locations/willpower.qsrc

+ 5 - 0
locations/Cheatmenu_din.qsrc

@@ -1855,6 +1855,11 @@ $cheatmenu['display'] = {
 	'<center><h1>Display Setting</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="20" valign="top">'
+	if usePopUps = 1:
+		'Allow Popup pictures: Currently ON - <a href="exec:usePopUps = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
+	else
+		'Allow Popup pictures: Currently OFF - <a href="exec:usePopUps = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
+	end
 	if set_imgh > 0: set_imgw = 0
 	if set_imgw > 0: set_imgh = 0
 	if set_imgh <= 0 and set_imgw <= 0: $set_imgh = ''

+ 2 - 1
locations/FedorEv4.qsrc

@@ -411,7 +411,7 @@ if $ARGS[0] = '3way2':
 		minut -= 5
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/3way/bed6.mp4"></video></center>'
-		'You begin riding Fedor''s dick as Ivan shoves his dick down your throat and starts to throat fuck you while Fedor continues fucking your pussy. You gag on Ivan''s cock and he pulls away. Ivan gives you a few seconds to catch your breath as he raises his dick to your mouth and begins brushing your lips with his cock. When you finish catching your breath, you casually wrap your lips around Ivan''s dick and do your best to lick and suck him off. After a few miniutes Ivan says, "Hey <<$pcs_firstname>>, Now that I''m all lubed up, It''s time to fuck your ass."'
+		'You begin riding Fedor''s dick as Ivan shoves his dick down your throat and starts to throat fuck you while Fedor continues fucking your pussy. You gag on Ivan''s cock and he pulls away. Ivan gives you a few seconds to catch your breath as he raises his dick to your mouth and begins brushing your lips with his cock. When you finish catching your breath, you casually wrap your lips around Ivan''s dick and do your best to lick and suck him off. After a few minutes Ivan says, "Hey <<$pcs_firstname>>, Now that I''m all lubed up, It''s time to fuck your ass."'
 		anal_slip += 4
 		gs 'arousal', 'anal', 5, 'sub'
 		gs 'boyStat', 'A3'
@@ -519,6 +519,7 @@ if $ARGS[0] = '3way3':
 			'After a few moments, Ivan pulls away from you, so you instinctively start sucking Fedor''s dick in Ivan''s place but soon you feel strong hands around your shoulders then realize that Ivan has lifted you 2 feet off the ground. Ivan carries you to the living room then drops you on your feet. Ivan roughly bends you over the edge of the sofa and before you know what''s happening, Ivan enters your anus causing you to groan in pain. Fedor then shouts "Ivan take it easy. Are you trying to cripple my girl!?"'
 			'Ivan responds, "Yeah, I guess I did get a bit carried away, Sorry <<$pcs_firstname>>. I''ll slow down for you." and true to his word he slows his pace allowing your ass to adjust for his dick before slowly increasing his pace. You are beginning to enjoy Ivan''s dick in your ass as Fedor sits down in front of you watching you get fucked which turns you on. While Ivan continues pounding your ass, Fedor gets up and tells Ivan. "Hey Ivan, don''t go hogging my girl now."'
 			gs 'boyStat', 'A3'
+			anal_slip += 4
 			gs 'arousal', 'anal', 5, 'sub'
 			gs'stat'
 

+ 1 - 0
locations/Komp.qsrc

@@ -73,6 +73,7 @@ if $ARGS[0] = 'brows':
 		act 'Search for cable TV services (1:00)':gt 'Komp', 'kabtv'
 		act 'Play an online game':gt 'KGstart'
 		if fuckornot = 3: act 'Visit ''Fuckable or not'' site': $view_location = 'komp' & gt 'komp', 'fuckornot'
+		if hotornot = 3: act 'Visit ''Hot or not'' site': $view_location = 'komp' & gt 'komp', 'hotornot'
 		if bankAccount > 0: act 'Visit your bank, maybe to purchase more online time': gt 'Komp', 'bank'
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'Komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'

+ 35 - 6
locations/artemhome.qsrc

@@ -1291,8 +1291,9 @@ if $ARGS[0] = 'chat':
 			'After you gather your things you leave his apartment, ignoring his pleas.'
 			act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
 		end
-	elseif artdate = 0 and artfall >= 10 and pav_slut < 75:
+	elseif artdate = 0 and artfall >= 10 and pav_slut < 75 and artemQW['dateask'] ! daystart:
 		*clr & cla
+		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you, and suggests: "<<$pcs_nickname>>, do you want to go for a walk in the park?"'
 		act 'Stay here': 
@@ -1314,8 +1315,9 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
 			act 'Walk in the park': gt 'artemdate','firstdate'
 		end
-	elseif artdate > 0 and artdate <= 3 and pav_slut < 75:
+	elseif artdate > 0 and artdate <= 3 and pav_slut < 75 and artemQW['dateask'] ! daystart:
 		*clr & cla
+		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you. "<<$pcs_nickname>>, would you like to go out on a date?"'
 		act 'Stay here': 
@@ -1336,8 +1338,9 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-	elseif artdate = 4 and pav_slut < 100:
+	elseif artdate = 4 and pav_slut < 100 and artemQW['dateask'] ! daystart:
 		*clr & cla
+		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 		'Artem has a embarrassed look on his face when he says:'
 		if artemStripSee = 0:
@@ -1346,7 +1349,8 @@ if $ARGS[0] = 'chat':
 			'"I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
 		end
 		gs 'artemhome', 'askedstrip'
-	elseif artdate = 5 and pav_slut < 100:
+	elseif artdate = 5 and pav_slut < 100 and artemQW['dateask'] ! daystart:
+		artemQW['dateask'] = daystart
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/flowers.jpg"></center>'
 		'As you sit down to talk, Artem suddenly produces a bouquet of flowers and offers it to you. "I got these for you, I hope you like them." He says.'
@@ -1419,8 +1423,9 @@ if $ARGS[0] = 'chat':
 				act 'Just talk': gt 'artemhome', 'chat'
 			end
 		end
-	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100:
+	elseif artdate >= 6 and artdate <= 8 and pav_slut < 100 and artemQW['dateask'] ! daystart:
 		*clr & cla
+		artemQW['dateask'] = daystart
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
 		act 'Stay here': 
@@ -1441,8 +1446,9 @@ if $ARGS[0] = 'chat':
 			'You quickly pack up your things and leave the apartment with him.'
 			act 'Go on a date': gt 'artemdate','artem_date'
 		end
-	elseif artdate = 9:
+	elseif artdate = 9 and artemQW['dateask'] ! daystart:
 		*clr & cla
+		artemQW['dateask'] = daystart
 		artdate += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/wine.jpg"></center>'
 		'When you enter the room, you immediately notice the small folding table with chairs set up in the room, it has several lighted candles on it, and a bottle of wine with two glasses.'
@@ -1502,6 +1508,29 @@ if $ARGS[0] = 'chat':
 				gs 'artemhome', 'artemgirlfriend'
 			end
 		end
+	elseif artembf = 1 and rand(0,3) = 0 and artemQW['dateask'] ! daystart:
+		*clr & cla
+		artemQW['dateask'] = daystart
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
+		'Artem smiles at you as he walks over and hugs you. "<<$pcs_nickname>>, would you like to go out on another date?"'
+		act 'Stay here': 
+			*clr & cla
+			npc_rel['A2'] -= 2
+			gs 'stat'
+			'You shake your head. "No thanks, but thank you for asking."'
+			'He looks a little disappointed. "Oh, ok."'
+			act 'Keep talking': gt 'artemhome', 'chat'
+			act 'Stop talking': gt 'artemhome', 'artemroom'
+		end
+		act 'Agree to go on a date':
+			*clr & cla
+			npc_rel['A2'] += 5
+			artdate += 1
+			gs 'stat'
+			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
+			'You quickly pack up your things and leave the apartment with him.'
+			act 'Go on a date': gt 'artemdate','artem_date'
+		end
 	else
 		act 'Make small talk':
 			*clr & cla

+ 1 - 1
locations/backwater.qsrc

@@ -165,7 +165,7 @@ end
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
 
-					if CloSkirtShortness > 0:
+					if PCloSkirt > 0:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress.jpg"></center>'

+ 1 - 1
locations/bed2.qsrc

@@ -468,7 +468,7 @@ if $ARGS[0] = 'wake':
 			gs 'stat'
 			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
 		end
-		act 'Get up out of bed and get dressed for school (0:15)':
+		act 'Get out of bed and get dressed for school (0:15)':
 			minut += 15
 			if schtype = 0:
 				$schbrand = 'school'

+ 4 - 4
locations/bicycle.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'sarai':
 					act 'Finish the trip':gt $loc, $metka
 					exit
 				end
-				if CloSkirtShortness > 0 and findvelrand > 70:
+				if PCloSkirt > 0 and findvelrand > 70:
 					if $pantyworntype ! 'none':
 						pcs_mood+=5
 						gs'stat'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'sarai':
 
 					exit
 				end
-				if CloSkirtShortness > 0 and findvelrand <= 70:
+				if PCloSkirt > 0 and findvelrand <= 70:
 					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'sarai':
 					act 'Finish the ride':gt $loc, $metka
 					exit
 				end
-				if CloSkirtShortness = 0:
+				if PCloSkirt = 0:
 					pcs_mood += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
@@ -239,7 +239,7 @@ end
 if $ARGS[0] = 'clothes_findvel':
 	if $clothingworntype = 'nude':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_nude.jpg"></center>'
-	elseif CloSkirtShortness > 0:
+	elseif PCloSkirt > 0:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_2.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'

+ 1 - 1
locations/cikl.qsrc

@@ -1259,7 +1259,7 @@ killvar 'pcs_drank'
 if storyline = 1:
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
-		if sisboyparty = -1: sisboyparty = 1
+		if sisterQW['party'] = -1: sisterQW['party'] = 1
 
 		if sisboypartyQW >= 2 and sisboyparty > 0:
 			sisboyparty_day = daystart + rand(3,5)

+ 13 - 13
locations/gadforest.qsrc

@@ -127,8 +127,8 @@ if $ARGS[0] = '1':
 				menu_off = 1
 				if pcs_inhib < 50:inhib_exp += rand(1,3)
 				minut += 5
-				if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-				if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+				if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+				if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 				gs 'underwear', 'remove'
 				gs 'clothing', 'strip', 'gadforest'
 				gs 'exhibitionism', 3
@@ -158,8 +158,8 @@ if $ARGS[0] = '1':
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
 			gs 'stat'
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 			'You change back into your clothes.'
 			act 'Back': gt 'gadforest','1'
 		end
@@ -211,9 +211,9 @@ if $ARGS[0] = '1':
 
 			if month >= 4 and month <= 10:
 				if MiraLoc ! 3:
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+					if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
 					if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude0.'+rand(1,4)+'.jpg"></center>'
 					'You are walking through the woods, enjoying the sounds of the forest and the fresh air.'
 				else
@@ -632,9 +632,9 @@ end
 !dynamics to ARGS by illume
 if $ARGS[0] = 'clothes1':
 	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,3)+'.jpg"></center>'
 
 	else
@@ -645,9 +645,9 @@ end
 
 if $ARGS[0] = 'clothes2':
 	if MiraLoc ! 3:
-		if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
-		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
+		if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest2.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest3.jpg"></center>'
+		if $clothingworntype ! 'nude' and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga1.'+rand(1,2)+'.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_nude1.'+rand(1,4)+'.jpg"></center>'
 	else
 		if $clothingworntype ! 'nude':'<center><img <<$set_imgh>> src="images/characters/village/mira/miramushroom3.jpg"></center>'

+ 10 - 10
locations/gadforest_event.qsrc

@@ -2103,8 +2103,8 @@ if $ARGS[0] = 'nude_event':
 			gs 'exhibitionism', 3
 			gs 'stat'
 
-			if CloSkirtShortness = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if CloSkirtShortness > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 0 and MiraLoc ! 3:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 			if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest5.jpg"></center>'
 
 			if MiraLoc ! 3:'You do not hesitate and quickly get undressed, leaving your clothes in a pile on the forest floor.'
@@ -2125,9 +2125,9 @@ if $ARGS[0] = 'nude_event':
 
 		if MiraLoc = 3:'<center><img <<$set_imgh>> src="images/characters/village/mira/miraforest2.jpg"></center>'
 		if MiraLoc ! 3:
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
-			if $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
-			if $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest0.'+rand(1,2)+'.jpg"></center>'
+			if $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest1.'+rand(1,3)+'.jpg"></center>'
+			if $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gulforest_tanga0.'+rand(1,2)+'.jpg"></center>'
 		end
 
 		if MiraLoc ! 3:'Although the temptation to strip naked is very strong, you are too afraid of getting caught so you decide to keep your clothes on.'
@@ -2246,9 +2246,9 @@ if $ARGS[0] = 'mushroom':
 		boletus += rand(5,10)
 		gs 'stat'
 
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom1.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom2.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom3.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom4.'+rand(1,2)+'.jpg"></center>'
 
 		'You begin collecting mushrooms trying to make everything fit in the basket.'
@@ -2328,8 +2328,8 @@ if $ARGS[0] = 'picnic':
 			gs 'clothing', 'swamp_clothes', 0
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'gadforest', 1
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
-			if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest.jpg"></center>'
+			if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/nudeforest1.'+rand(1,2)+'.jpg"></center>'
 			'You changed into your clothes.'
 			act 'Continue': gt 'gadforest','1'
 		end

+ 2 - 2
locations/gadforestlost.qsrc

@@ -252,8 +252,8 @@ if $ARGS[0] = 'gadforestlost':
 end
 
 if $ARGS[0] = 'lostclothes':
-	if $clothingworntype ! 'nude' and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
-	if $clothingworntype ! 'nude' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch0.'+rand(1,4)+'.jpg"></center>'
+	if $clothingworntype ! 'nude' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_ski0.'+rand(1,4)+'.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestsearch_nude0.'+rand(1,4)+'.jpg"></center>'
 	'After wandering through the woods for an hour you decide to....'
 end

+ 11 - 11
locations/gadforestrelax.qsrc

@@ -12,11 +12,11 @@ wolfrand = rand(1,10)
 gs'stat'
 
 '<center><H4>Forest</H4></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
-if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax1.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0 and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax2.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and bonfire = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski1.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype ! 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski2.jpg"></center>'
+if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0 and $pantyworntype = 'none' and bonfire = 1:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski3.jpg"></center>'
 if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+ rand(1,3) +'.jpg"></center>'
 if $clothingworntype = 'nude':inhib_exp += rand(1,3)
 'You are tired and decided to rest a little.'
@@ -137,9 +137,9 @@ if $clothingworntype ! 'nude' and bonfire = 0:
         pcs_sleep += 6
         pcs_mood += 10
         
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'    
-	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'   
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>' 
+	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax3.jpg"></center>'    
+	    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski4.jpg"></center>'   
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_ski5.jpg"></center>' 
         if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_nude'+rand(1,2)+'.jpg"></center>'    	    
    	    
    	    'You sit in silence for hours looking at the fire. You feel warm and rested, perhaps it''s time to move on.'
@@ -157,9 +157,9 @@ if $clothingworntype ! 'nude' and bonfire = 0:
 		    pcs_mood += 20
 		    gs'stat'
 		    
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'   
-	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'    
-		    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>' 
+	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleep.jpg"></center>'   
+	        if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype ! 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski.jpg"></center>'    
+		    if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and $pantyworntype = 'none' and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepski1.jpg"></center>' 
             if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadforestrelax_sleepnude1.'+rand(1,2)+'.jpg"></center>'    
 		  	
 	        'You doze off for about 3 hours, you wake up feeling more cheerful and rested.'

+ 4 - 4
locations/gadforestswamp.qsrc

@@ -40,8 +40,8 @@ if $ARGS[0] = '1':
 		gs 'sweat', 'add', 15
 		gs 'stat'
 
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
-		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp.jpg"></center>'
+		if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski.jpg"></center>'
 		if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 		'You entered the swamp and felt your feet starting to sink into the mud...'
 		temp_gads = RAND(1,100)
@@ -201,8 +201,8 @@ if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry
 	end
 end
 $swampclothes = {
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
-	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
+	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp1.jpg"></center>'
+	if ($clothingworntype ! 'nude' and $clothingworntype ! 'swimwear') and PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_ski1.jpg"></center>'
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/goswamp_nude0.'+rand(4,5)+'.jpg"></center>'
 }
 

+ 6 - 6
locations/gadgarden.qsrc

@@ -160,9 +160,9 @@ if $ARGS[0] = 'strawberry':
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/collect_strawberries_tanga.jpg"></center>'
 			'You wander through the plot for several hours, collecting ripe strawberries and placing them in the basket.'
 
 			act 'Finish':gt'gadgarden','strawberry'
@@ -226,9 +226,9 @@ if $ARGS[0] = 'fruit_garden':
 			hndiwrk_exp += rand(3,9)
 			gs 'stat'
 
-			if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
+			if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_ski.jpg"></center>'
+			if PCloSkirt > 0 and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/village/fruit_collect_tanga.jpg"></center>'
 			'You walk around the orchard and pick the ripe fruit hanging from the trees.'
 
 			act 'Finish':gt 'gadgarden','fruit_garden'

+ 2 - 2
locations/gopsex.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'masturb_gg':
 		if pcs_horny >=50:
 			$dummywhere = 'into your panties'
 			if $pantyworntype = 'none': $dummywhere = 'down to your pussy'
-			if CloSkirtShortness > 0: $dummywhat = 'lift up your skirt'
+			if PCloSkirt > 0: $dummywhat = 'lift up your skirt'
 			if CloPantsShortness > 0: $dummywhat = 'unbutton and unzipp your pants'
 			if CloPantsShortness > 2: $dummywhat = 'unbutton and unzipp your shorts'
 			rnd_masturb_text = rand(1,3)
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'hide':
 	if $ARGS[1] = 'text_sex_doggy':
 		txt_sex_doggy = RAND(0,6)
 		if txt_sex_doggy = 0:
-			if CloSkirtShortness > 0: 
+			if PCloSkirt > 0: 
 				$dummytxt = 'He hikes up your skirt'
 			elseif CloPantsShortness > 2: 
 				$dummytxt = 'He pulls your shorts down to your knees'

+ 7 - 1
locations/gschool_groups.qsrc

@@ -183,7 +183,7 @@ if $ARGS[0] = 'fuckornot':
 					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="<<FUNC(''$face_image'')>>"><br>' + '<<$pcs_nickname>>, <<hotcat>>/10'
 				end
 			elseif hotcat ! j or hotcat_rating_set = 1:
-				if hotcat_rating['A<<i>>'] = j:
+				if hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 1:
 					fu_count += 1
 					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
 				end
@@ -214,11 +214,17 @@ if $ARGS[0] = 'hotornot':
 		i = 1
 		:ho_loop
 			if ho_count = 6 : $ho_text += '<tr>'
+			
+			if hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 0:
+				ho_count += 1
+				$ho_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
+			end
 			if ho_count < 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 0:
 				$ho_text += '</td>'
 			elseif ho_count = 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 0:
 				$ho_text +='</td></tr><tr>' & ho_count = 0
 			end
+			i += 1
 		if i <= aarraynumber:jump 'ho_loop'
 	if j > 1: jump 'ho_loop_2'
 

+ 3 - 0
locations/gschool_lessons4.qsrc

@@ -986,6 +986,7 @@ end
 
 if $ARGS[0] = 'jumping_jacks':
 	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	if hotcat >= 6:'Some of the boys stop what they''re doing when it''s your turn, coming over to shout some words of support.'
 	if pcs_cupsize <= 20:
@@ -1043,6 +1044,7 @@ end
 
 if $ARGS[0] = 'pushups':
 	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	if hotcat >= 6:'Some of the boys stop what they''re doing when it''s your turn, coming over to shout some words of support.'
 	if pcs_stren <= 20:
@@ -1065,6 +1067,7 @@ end
 
 if $ARGS[0] = 'postphys':
 	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	if zverevaQW = 1:

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -530,7 +530,7 @@ if $ARGS[0] = 'english':
 					npc_rel['A21'] -= 1
 					grupvalue[4] -= 1
 					grupvalue[1] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/events/eavesdrop.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/events/badlanguage.jpg"></center>'
 					'"Sure, repeat after me: I''m a worthless cock-sleeve who enjoys being a cumdump to all the boys in school."'
 					'Lera and Lena seem surprised with how much you say, but you reassure them it''s a really good insult; the worst of the worst. With a smile, they repeat the sentence, completely unaware of what they''re actually saying.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

+ 2 - 2
locations/hotel_resep.qsrc

@@ -1232,10 +1232,10 @@ if $ARGS[0] = 'ffshower':
 	pcs_makeup = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/ffshower01.jpg"></center>'
-	'You can hear the water start running before you get to the bathroom door yourself. <<$boydesc>> is already ejoying the hot water, looking at you with a big smile on her face.'
+	'You can hear the water start running before you get to the bathroom door yourself. <<$boydesc>> is already enjoying the hot water, looking at you with a big smile on her face.'
 	'"Come here, the water is just the right temperature." She says as she steps back making room for you.'
 	'Her wet, naked body looks delicious. You eagerly step under the stream of hot water next to her and press your body against hers.'
-	'Within moments the two of you are making out passionately. Enjoying the feeling of eachother''s wet skin.'
+	'Within moments the two of you are making out passionately. Enjoying the feeling of each other''s wet skin.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 	gs 'arousal', 'kiss', 5, 'prostitution'
 	gs 'stat'

+ 2 - 0
locations/housecall.qsrc

@@ -58,6 +58,7 @@ if $ARGS[0] = 'ninel0':
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom2.jpg"></center>'
 						'You obediently roll over and spread ass cheeks with your hands. The Doctor lubricates your anus thoroughly and deftly slides the thermometer in your ass. You flinch slightly, not from pain, but pleasure. The Doctor slowly slides the thermometer up and down in your ass, you find the sensation very pleasant feeling. As she does, you feel your excitement growing.'
 
+						anal_slip += 8
 						gs 'arousal', 'anal', 10, 'sub', 'lesbian'
 						gs 'stat'
 						
@@ -256,6 +257,7 @@ if $ARGS[0] = 'ninel1':
 						'You obediently roll over and spread ass cheeks with your hands. The Doctor lubricates your anus thoroughly and deftly slides the thermometer in your ass. You flinch slightly, not from pain, but pleasure. The Doctor slowly slides the thermometer up and down in your ass, you find the sensation very pleasant feeling. As she does, you feel your excitement growing and pussy getting wet.'
 						'Yet again for a moment you thought you felt power emanating from her fingers.'
 
+						anal_slip += 8
 						gs 'arousal', 'anal', 10, 'sub', 'lesbian'
 						gs 'stat'
 						

+ 1 - 1
locations/hunter_interactions.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = 'chat_with_hunters':
 			gs 'hunter_interactions', 'chat_with_hunters', 'boy_talk'
 		elseif boy_talk = 1 and virginity_talk = 0 and hunters_drink = 1 and rand(1,10) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'virginity_talk'
-		elseif CloSkirtShortness > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
+		elseif PCloSkirt > 0 and $pantyworntype = 'none' and rand(1,9) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'pantiless_flash'
 		elseif $clothingworntype = 'nude' and $pantyworntype = 'none' and rand(1,3) = 1:
 			gs 'hunter_interactions', 'chat_with_hunters', 'nude'

+ 1 - 1
locations/hunters.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'start':
 			if huntersSergeiQw < 10:huntersSergeiQw += 1
 			gs 'stat'
 
-			if CloSkirtShortness > 0 and $pantyworntype = 'none':
+			if PCloSkirt > 0 and $pantyworntype = 'none':
 				*clr & cla
 				if huntersKnowSlut > 0:hunterslut += 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersnotanga1.jpg"></center>'

+ 74 - 74
locations/journal.qsrc

@@ -269,37 +269,37 @@ end
 
 if $ARGS[0] = 'friends_family':
 	*clr & cla
-	'<center><img src="images/pc/npc_headshots/29.jpg"></center>'
+	'<center><img src="images/pc/notebook/29.png"></center>'
 	'Mother Natasha - Your mother was born in Gadukino village is still quite young and attractive, you have done the math and know she had Anya when she was only sixteen years old. She works at the station cafe. Your grandmother died in child birth with your mother and your grandfather a couple of years later in the Afghanistan war.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/35.jpg"></center>'
+	'<center><img src="images/pc/notebook/35.png"></center>'
 	'Father Mikhail Kuznetsov - You''ve never seen your biological father since their divorce, and as such you have no real memory of him.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/28.jpg"></center>'
+	'<center><img src="images/pc/notebook/28.png"></center>'
 	'Step Father Vladimir - Your stepfather is a greying, slightly flabby man working as a truck driver. Your mother divorced your biological father and married Vladimir when you were less than a year old. One year after being married your parents welcomed your little brother Kolka, Valdimir''s first born that you know of. While not working your stepfather will often be found working on his cars by the garage.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/33.jpg"></center>'
+	'<center><img src="images/pc/notebook/33.png"></center>'
 	'Sister Anya - She is your older sister. She is two years your senior, she still lives at home sharing a bedroom with you. She works at the local supermarket instead of going to the University like your mother wanted. She spends most of her free time either partying, hanging out with her friends or with her boyfriend Roma.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/34.jpg"></center>'
+	'<center><img src="images/pc/notebook/34.png"></center>'
 	'Brother Kolka - He is your younger brother, born about a year after you. While you share the same mother, unlike you and your sister, Kolka''s dad is your stepfather. He is a student at the same school as you, and enjoys football. When he is not playing football, or doing homework, he spends much of his free time hanging out with his friends.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/30.jpg"></center>'
+	'<center><img src="images/pc/notebook/30.png"></center>'
 	'Aunt Lyudmila Knavs - Your aunt Luda works at the pharmacy in Pavlovsk. She is your mothers older sister, she has a live in boyfriend named Olu that she meet while traveling. He is an African man which causes more than a few rumors and sour looks at your aunt. Your aunt doesn''t seem to care about the looks and talks and if anything seems to enjoy flaunting her boyfriend in front of others.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/55.jpg"></center>'
+	'<center><img src="images/pc/notebook/55.png"></center>'
 	'Oluuosegun "Olu" Maina - You don''t know much about your aunts live in boyfriend. Only that he doesn''t speak Russian very well, he is from Africa and is a very large man. You know many in the area that find it disgraceful that your aunt lives with him.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/31.jpg"></center>'
+	'<center><img src="images/pc/notebook/31.png"></center>'
 	'Great Grandpa Zlatek Knavs - 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 barely being fit to live in. He can walk, but requires a cane. He doesn''t really leave the house any more, unless he really has to. Your mother and aunt were raised by your great grandparents.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/32.jpg"></center>' 
+	'<center><img src="images/pc/notebook/32.png"></center>' 
 	'Great Grandma Elena Knavs - 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. Having raised two generations of kids your great grandparents are now content with the peace and quiet of the village.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/54.jpg"></center>'
+	'<center><img src="images/pc/notebook/54.png"></center>'
 	'Mikhail "Misha" - Your neighbor''s name is Mikhail, though everyone calls him uncle Misha. He lives in the other apartment on the same floor as yours. Your mother always forbade you to talk to him, warning you that he used to be a local crime lord, and that you shouldn''t get involved with him. However, he has always been polite and nice to you. He is close friends with your stepfather, both have been evasive about how they met and became friends.'
 	*nl
-	'<center><img src="images/pc/npc_headshots/112.jpg"></center>'
+	'<center><img src="images/pc/notebook/112.png"></center>'
 	'Sergey Shulgin - He lives in the same building as you with his son, your childhood friend Vasily. He has gray hair and a small beer belly, but still hearty looking. His wife, Vasily''s mother left when Vasily was still a small child. He has been close friends with your stepfather and mother for as long as you can remember. Oddly enough he never re-married after being left by his ex-wife.'
 	
 	act 'Go back': gt 'journal', 'records'
@@ -368,19 +368,19 @@ end
 if $ARGS[0] = 'teachers':
 	*clr & cla
 	'<center><h2>Teachers & Facility</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/134.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/134.png"></center>'
 	'<center>Aleksandrina Volkov</center>'
 	'Aleksandrina Volkov is the school''s new headmistress. An attractive woman in her mid to late thirties, who always dresses well. She was recently brought in to improve the school results after the school was falling behind in the national test scores. She has a reputation for being a strict disciplinarian, but fair. She also comes off as cold and distant to the students.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/132.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/132.png"></center>'
 	'<center>Ruslan Kuznetsov</center>'
 	'Ruslan Kuznetsov is the school''s special ed, career advisor and shop teacher, he also the assistant Headmaster. Is one of the few teachers that''s passionate about his job. He really believes that he can impact on the students future but is mostly ignored by everyone even his colleagues. Which recently has seen him start becoming bitter.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/26.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/26.png"></center>'
 	'<center>Anatoly E. Tsarev</center>'
 	'Anatoly Tsarev is the school''s math teacher. He''s a stern teacher, who always demands the best out of his students. His daughter Lera is in your class and a gopnik. He''s married to Vera, who works at the train station as a ticket saleswoman and as a cleaner in the garment factory. There are rumors that since Lesco his nephew has come to live with them, his marriage has been on the rocks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/135.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/135.png"></center>'
 	'<center>Yeva Sokoloff</center>'
 	if grupTipe = 4:
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school, she likes to think she is tough often giving those in her class a hard look, which is funny coming from someone that looks like the little old lady in the market. But she is quick to send you to the Headmistress if you misbehave to much.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'teachers':
 		'Yeva Sokoloff is the school''s geography and history teacher. She is the oldest teacher at school and has a very firm no nonsense teaching style, but can also be very kind and motherly to students that work hard and behave.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/129.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/129.png"></center>'
 	'<center>Serafim Ivanov</center>'
 	if grupTipe = 3:
 		'Serafim Ivanov is the school''s science and computer Science teacher. A former student of the school that returned to the town after college. He is a no nonsense, teacher, who is known to pile on the homework, have many pop quizzes and is brutal when it comes to his grading, to push his students to their greatest potential. He always has time to answer questions or help out if a student has trouble as long as they put in the effort. Many of the other students complains about how he picks on them, but the truth is he only accept the best from his students and has no sympathy for those that refuse to put in the work.'
@@ -396,19 +396,19 @@ if $ARGS[0] = 'teachers':
 		'Serafim Ivanov is the school''s science and computer Science teacher. A former student of the school that returned to the town after college. He is a no nonsense, bitter teacher, who is known to pile on the homework, have many pop quizzes and is brutal when it comes to his grading. He is also known to be unfair, he gives the nerds a free pass with homework or even quizzes, that he never would do with another student group. He seems to take delight when he catches one of the cool kids, jocks or Gopniks out, ridiculing them on how little they know.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/128.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/128.png"></center>'
 	'<center>Makar Vasilyev</center>'
 	'Makar Vasilyev is the school''s music, art, and drama teacher. He is always warm and friendly to all of his students and even those not in his class. He always smiles and will always take the time to listen or help out the students. He is well liked by most of the students.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/137.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/137.png"></center>'
 	'<center>Raven Braakman</center>'
 	'Raven Braakman is the school''s social sciences and English teacher. She is from South Africa, she married a Russian man and moved to Pavlovsk, a few years ago her husband died in a car accident. She has a strict teaching style, accepting only the best out of her students. It is rumored she is a bit of a party goer in her free time.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/130.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/130.png"></center>'
 	'<center>Ilya Yenotin</center>'
 	'Ilya Yenotin is the school''s literature, language and your homeroom teacher. He does his best at keeping everyone happy but is unliked by most of the students, simply because he''s comes off as fake. You can often see him running down the halls chasing down the Gopniks, trying getting them to attend class.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/131.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/131.png"></center>'
 	'<center>Viktor Pavlovich</center>'
 	if grupTipe = 3:
 		'Viktor Pavlovich is the school''s P.E. teacher and is the coach for the basketball and track teams. He looks like a former weight lifter, having a power build with a massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from his office. He is tough on anyone that isn''t athletically gifted, he often yells at those lacking any athletic ability to the point of bringing them to tears. He is one of the meanest if not the meanest teacher in school.'
@@ -416,7 +416,7 @@ if $ARGS[0] = 'teachers':
 		'Viktor Pavlovich is the school''s P.E. teacher and is the coach for the basketball and track teams. He looks like a former weight lifter, having a power build with a massive upper body strength. He keeps a black painted paddle he calls the "Black Widow" hanging from his office. He likes to use it on students, especially female students. He is single, and rumored to be a player. You''ve often seen him with different women around town.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/69.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/69.png"></center>'
 	'<center>Mikhail Nikolaevich</center>'
 	if grupTipe = 3:
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and is the coach of the Pavlovsk girls volleyball team and football team. He is almost as bad as Mr Pavlovich with how he treats the students, he almost worships the best of the jocks, always talking and laughing with them.'
@@ -426,15 +426,15 @@ if $ARGS[0] = 'teachers':
 		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and is the coach of the Pavlovsk girls volleyball team and football team. Some say he almost went pro in some sport but hurt himself or something like that and now he tries to live through the glory of his students.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/138.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/138.png"></center>'
 	'<center>Arina Orlov</center>'
 	'Arina Orlov is the school''s biology and health teacher. She is the youngest teacher at school, having just finished college and this is her first job. She is a bit shy and mousey, which makes many of the students to ignore her during class, she has a bit of a problem controlling her classes. She''s not much older than her students and very cute as well, which causes the boys to pay extra special attention to her sometimes.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/136.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/136.png"></center>'
 	'<center>Olga Aleksandrov</center>'
 	'Olga Aleksandrov is the school''s nurse. Miss Aleksandrov just transferred to your school at the start of the year. All the boys have fallen head over heel over this true beauty. The boys describe her as slim and stacked, the ideal woman.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/133.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/133.png"></center>'
 	'<center>Rolan Matveev</center>'
 	if grupTipe = 1:
 		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught as he was rummaging through the girls lockers stealing their panties, while others say he stalks the girls and photographs them. Regardless if the rumors are true or not, you and the other girls have caught him staring at you when he doesn''t think you are watching and then will quickly look away.'
@@ -449,7 +449,7 @@ end
 if $ARGS[0] = 'nerds':
 	*clr & cla
 	'<center><h2>Nerds</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/152.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/152.png"></center>'
 	'<center>Feofan Krupin</center>'
 	if grupTipe = 3:
 		'Feofan Krupin is heavily into science fiction, fantasy, and the like. He has a serious love for super heroes and talking about them, their movies and comic books all the time, not to mention his collection of cosplay outfits of all the most famous super heroes. He does well in school, but not as well as most would expect. He is the most outgoing of the nerds, not afraid to talk to the other students or even flirt with some of the girls way out of his league. He is the weekly game night Game Master and often invites others over to play games at his house.'
@@ -457,11 +457,11 @@ if $ARGS[0] = 'nerds':
 		'Feofan Krupin is heavily into science fiction, fantasy, and the like. He has a serious love for super heroes and talking about them, their movies and comic books all the time, not to mention his collection of cosplay outfits of all the most famous super heroes. He does well in school, but not as well as most would expect. He is a nerd''s nerd but not bad looking in a somewhat nerdy manner. He is the most outgoing of the nerds, not afraid to talk to the other students or even flirt with some of the girls way out of his league. Rumor is he runs some silly game night for the other nerds, which has gotten some to call him the King of the Nerds.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/2.png"></center>'
 	'<center>Artem Chebotarev</center>'
 	'Artem Chebotarev is a typical geek but one could easily be deceived by his looks as he is actually not that bad looking. He does very well in school and is popular with the other geeks, not to mention that thanks to his looks and good grades he has befriended a lot of jocks as he is also their tutor outside of school. Otherwise he tries to keep a low profile at school, especially around the cool kids and gopniks.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/142.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/142.png"></center>'
 	'<center>Zinaida "Zina" Alkaev</center>'
 	if grupTipe = 3:
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is great a video games and knows all about fantasy, sci-fi, super hero''s and other important things. The boys seem to love she knows as much as they do about that stuff and that she can beat most of them at games they play.'
@@ -469,7 +469,7 @@ if $ARGS[0] = 'nerds':
 		'Zinaida Alkaev is a mousey girl who is very plain looking. She never wears makeup, dresses in baggy clothes and barely bothers to brush her hair. She mostly keeps to herself, playing various games on her phone, although she is fairly popular with the nerd boys, for reasons unknown to everyone else. She seems to be a complete loner unless she is around her fellow nerds.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/6.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/6.png"></center>'
 	'<center>Petka Klyuyev</center>'
 	if grupTipe = 3:
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other students preferring to only talk to his fellow nerds, he mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes.'
@@ -477,19 +477,19 @@ if $ARGS[0] = 'nerds':
 		'Petka Klyuyev is a nerd who usually doesn''t interact with other people, he mostly spends his time reading. He''s good friends with Artem and you can usually hear them recommending what to read to each other. He does very well in school and has been known to tutor others sometimes. If you need homework he is easy to bully homework out of, he is afraid of his own shadow.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/153.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/153.png"></center>'
 	'<center>Gerasim Vasilyev</center>'
 	'Gerasim Vasilyev is confined to a wheelchair, from an early childhood accident. He is kind and nice to everyone, even if most don''t return the favor. He is well accepted by his fellow nerds and surprisingly a few of the jocks. Most of the rest see him as an easy target to bully and/or force him to do their homework.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/12.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/12.png"></center>'
 	'<center>Julia Milov</center>'
 	'Julia is a diligent and silent girl. She''s very nerdy, and doesn''t really have any friends in school other than her fellow nerds. She seems to like keeping to herself, but has sometimes been caught eyeing the other girls while they changing after the gym lessons, likely jealous of their popularity.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/151.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/151.png"></center>'
 	'<center>Evgeny Kuznetsov</center>'
 	'Evgeny Kuznetsov is the school chess champion, and you can always find him at the chess club at the community center. He is shy and very intelligent, he has not shown any interest in girls or anyone else for that matter. No one would be surprised if he has mild autism.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/16.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/16.png"></center>'
 	'<center>Natasha Belova</center>'
 	'Natasha is an excellent student and one of the smartest people in your school. Even though you are living in the same building, her parents are very poor, and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends, as most of the other girls shun her or mock her poor clothing.'
 	
@@ -500,49 +500,49 @@ end
 if $ARGS[0] = 'jocks':
 	*clr & cla
 	'<center><h2>Jocks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/149.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/149.png"></center>'
 	'<center>Lazar Pajari</center>'
 	'Lazar Pajari is the school football star and best athlete in school. He is a central midfielder and team captain. He excels in other sports as well, but his passion is football, least when he is not chasing girls or more often being chased by girls, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with different girls. Ivan is his biggest competition in sports, while Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/3.png"></center>'
 	'<center>Ivan Prokhorov</center>'
 	'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part of. He is mostly into boxing and running at this time and is considered to be very good looking by the girls in school. He spends a lot of time training and regularly is away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, a true lone wolf, though he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/18.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/18.png"></center>'
 	'<center>Christina Zvereva</center>'
 	'Christina is one of your school''s best athletes, and is the most athletic girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her having a dominant presence wherever she goes. She is also more than a bit of a bully to most of the other girls in school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/8.png"></center>'
 	'<center>Svyatoslav Voinov</center>'
 	'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest boy at school. His other focus is football as well as many other sports the school offers. He''s always trying to one up Ivan or Lazar but rarely manages to beat either of them at anything.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/22.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/22.png"></center>'
 	'<center>Elžbieta "Bella" Artamonov</center>'
 	'Bella Artamonov is the most beautiful girl in school and knows it, which makes her come off as really arrogant. You don''t know her very well as she doesn''t want to deal with "kids". She seems to consider herself a adult already and the rest of her classmates are beneath her, as being to young and childish. You''ve heard some rumors about her only hanging around older people.'
 
 	if npc_grupTipe['A5'] = 2:
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
 		'<center>Fedor Kozlov</center>'
 		'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have. He is decent looking and often is seen chasing Ivan''s leftovers.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/141.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/141.png"></center>'
 	'<center>Veronika "Ronnie" Sokolov</center>'
 	'Veronika Sokolov is called the ice queen by her fellow students behind her back, for a couple of reasons. One of the reasons is that she is very talented ice skater, there is even talk about she might compete in the next winter Olympics. The other reason is because she is cold and indifferent. She never lets anyone get close to her. She comes from one of the wealthier families in Pavlovsk.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/165.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/165.png"></center>'
 	'<center>Vanya Yanka</center>'
 	'Vanya Yanka is a little goofy jock, playing jokes on his teammates and annoying the coaches. He never goes too far with his jokes and is a good moral booster so most everyone likes him and despite his easy going attitude is a better athlete than most would suspect. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. Vanya is also popular with the girls at school but only seems to have eyes for Vicky.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/150.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/150.png"></center>'
 	'<center>Erast Vagin</center>'
 	'Erast Vagin is a huge boy and very strong, he is not a looker or even clever, but is always polite and a little shy. When he is playing sports he changes into a demon, always fighting to win, putting his all into winning and nothing else. He is a average athlete and relies and his size and strength to win the day for him. Other than playing sports he also sometimes boxes with Ivan.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/19.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/19.png"></center>'
 	'<center>Avelina "Lina" Starov</center>'
 	'Lina Starov is a mediocre athlete. She''s sort of Christina''s friend... but not really, the right term you would use is Christina''s lapdog. She usually does anything Christina wants her to do as if she doesn''t have a mind of her own. She is a very pretty girl and if she would think for herself she would be a lot more popular.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/13.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/13.png"></center>'
 	'<center>Lariska Gruzdeva</center>'
 	'Larissa is a very athletic girl, with an exceptional talent for volleyball. She has a very weak personality though, and is very dependent on other people''s opinions of her, she spends most of her time trying to appease others, especially Christina. Her best friend is Christina and one can often see Larissa chasing after Christina.'
 	
@@ -553,22 +553,22 @@ end
 if $ARGS[0] = 'outcasts':
 	*clr & cla
 	'<center><h2>Outcast</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/7.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/7.png"></center>'
 	'<center>Lesco Tsarev</center>'
 	'Everyone at school always bullies Lesco about anything and everything. He is the nephew of Mr. Tsarev and cousin of Lera. He resides with the Tsarev''s after his mother abandoned him for a week on one of her drug binges. He is very ugly and not very social, he seems to always be sad and just want to be left alone.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/159.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/159.png"></center>'
 	'<center>Petia Alkaev</center>'
 	'Petia Alkaev is the class mooch. He persistently asks others for food, money, cigarettes, etc. Can''t take a hint, and doesn''t know the meaning of "personal space", which is made worse by the fact, he seems to be unaware what soap is. He is an unattractive overweight guy who makes the pretty girls uncomfortable by hitting on them repeatedly and constantly. No matter how many beat downs or cruel pranks pulled on him, he doesn''t seem to learn his lesson.'
 
 	if npc_grupTipe['A25'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
 		'<center>Sonia Ivanko</center>'
 		'After a series of slutty behavior incidents, that crescendoed at the dance when Sonia got way too drunk and gave five guys including Vitek and his buddies a simultaneous blowjob near the community center. Only to return with her face covered in their cum, ever since her reputation has been in shambles. Most of the girls in school all give her the silent treatment, pretending she does not exist anymore. Meanwhile all the guys treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to say no. Many say she has embraced being a cheap slut happily letting anyone use her, while others say she has started to prostitute herself.'
 	end
 
 	if npc_grupTipe['A5'] = 5:
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/notebook/5.png"></center>'
 		'<center>Fedor Kozlov</center>'
 		'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone he has become a outcast, Fedor claims he was forced and had no choice but most thinks he just wanted to. Many of the boys call him a fag and often ask him if he has sucked any dicks lately. Even his former friend Ivan ignores him. The girls are nearly as bad, as many of them make fun of him as well. Now Fedor mostly keeps to himself and tries to avoid the other students.'
 	end
@@ -580,7 +580,7 @@ end
 if $ARGS[0] = 'popular':
 	*clr & cla
 	'<center><h2>Cool kids</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/1.png"></center>'
 	'<center>Dimka Nosov</center>'
 	if grupTipe = 1:
 		'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. He is the king of the school, everyone wants to either be his friend or hang out with him.'
@@ -588,7 +588,7 @@ if $ARGS[0] = 'popular':
 		'Dimka Nosov is a cute guy and all the girls adore him, he is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family, and is always dressed in expensive stylish clothes. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants. He seems to love verbally tormenting the nerds and outcasts when given a chance.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/23.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/23.png"></center>'
 	'<center>Albina Barlovskaya</center>'
 	if grupTipe < 3:
 		'Albina Barlovskaya comes from a wealthy family. She always does her best to look and dress well, she is considered to have the best sense of style in school and one of the prettiest girls in school. She is also an excellent dancer. Always conducting herself properly as her father is trying to become the town mayor. Image is everything is probably Albina''s motto. She runs a dance troop at the community center, only the prettiest and best dancers make it on her troop, is is a real boon to be picked.'
@@ -596,15 +596,15 @@ if $ARGS[0] = 'popular':
 		'Albina Barlovskaya comes from a wealthy family. She always does her best to look and dress well, she is considered to have the best sense of style in school and one of the prettiest girls in school. She is also an excellent dancer. Always conducting herself properly as her father is trying to become the town mayor. Image is everything is probably Albina''s motto.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/147.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/147.png"></center>'
 	'<center>Andrey Aleksandrov</center>'
 	'Andrey Aleksandrov family took part in the exchange student program. Rumor is they was less than happy when the student they sent was an African American, but Andrey doesn''t seem to mind. He and Marcus quickly became friends, he tends to use Marcus rising popularity to boost his own and in the process spend a lot less time with his long time girl friend Stasya. The school nurse is his aunt.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/17.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/17.png"></center>'
 	'<center>Irina Devyatova</center>'
 	'Irina Devyatova is a tall and pretty girl, she knows it and takes full advantage of it. She has a very arrogant and haughty personality hidden behind her sweet smile. She often makes the boys do her dirty work.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/140.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/140.png"></center>'
 	'<center>Yelizaveta "Lizaveta" Petrov</center>'
 	if grupTipe = 1:
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, and is the first to arrive at the scene of any commotion, eager to pry into the details. Pretty, and willing to use her looks to sweet talk boys into sharing any juicey gossip. If you want to know anything about anyone she is the one to ask, luckily she doesn''t use your knowledge to tear others about. She seems more interesting in collecting and sharing gossip than using it for her own gain.'
@@ -612,23 +612,23 @@ if $ARGS[0] = 'popular':
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, and is the first to arrive at the scene of any commotion, eager to pry into the details. Pretty, but most boys seem torn, attracted to her but afraid she will tell everyone everything about them and their whole life becomes public knowledge.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/15.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/15.png"></center>'
 	'<center>Viktoriya "Vicky" Meynold</center>'
 	'Vicky Meynold is the opposite of her sister, on one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya Yanka. A good humored girl she loves bright and crazy colored clothing. As a child she took gymnastics and as a result has excellent flexibility. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head more often than not. Despite her flighty and unpredictable nature her liveliness and spontaneity make her fun to hang out with.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/4.png"></center>'
 	'<center>Igor Kruglov</center>'
 	'Igor Kruglov is Dimka''s best friends and whenever you see one of them the other is usually not too far away. With a small stature, high pitched voice, and pretty face many consider him to be very feminine. Normally a boy like him would be mocked but his friendship with Dimka, the most popular boy in school, shields him from such abuse. Many wonder about their friendship as Igor follows Dimka around so often and they seem to have always been friends. Some would even say that Igor is overly attached to Dimka. Other than Dimka though Igor doesn''t seem to have any other close friends.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/139.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/139.png"></center>'
 	'<center>Stanislava "Stasya" Pavlov</center>'
 	'Stasya Pavlov is a complete bitch, and always has been one, but now that her boyfriend Andrey seems to hanging around the new exchange student Marcus more than her, she has become a lot worse. She doesn''t care for Marcus at all, but never says anything around Marcus or Andrey. Instead she seems to take out her anger on everyone around her, but especially the nerds and the outcasts.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/14.png"></center>'
 	'<center>Ekaterina "Katja" Meynold</center>'
 	'Katja Meynold is a very attractive and petite girl, a redhead with a special interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but at times can also be impulsive. She can often be found at the disco with her sister.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/146.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/146.png"></center>'
 	'<center>Marcus Larson</center>'
 	if grupTipe = 1:
 		'Marcus Larson is an African American exchange student, he arrived in school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful, than the girls back home. He is a decent looking guy, combined with his exotic looks, accent, athletic ability, and different views has made him pretty popular with the cool kids and jocks. He is friendly and outgoing, if he wasn''t so close friends with Andrey he would have likely been a jock instead.'
@@ -636,12 +636,12 @@ if $ARGS[0] = 'popular':
 		'Marcus Larson is an African American exchange student, he arrived in school last year and opted to stay for a second year. He does well in school and is a good athlete. He seems to really enjoy Russia and has an eye for Russian girls, always going on about how they are so much more beautiful, than the girls back home. He is a decent looking guy, combined with his exotic looks, accent, athletic ability, and different views has made him pretty popular with the cool kids and jocks. He is friendly and outgoing, he stays with Andrey''s family, whom he has become close friends with.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/148.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/148.png"></center>'
 	'<center>Mefodiy Utkin</center>'
 	'Mefodiy Utkin is reasonably intelligent, with middle-of-the-road grades. Fairly average looking, but possess a good sense of humor and timing. He isn''t to popular, just popular enough to hang among the cool kids, who like his humor.'
 
 	if npc_grupTipe['A25'] = 1:
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/25.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/notebook/25.png"></center>'
 		'<center>Sonia Ivanko</center>'
 		if grupTipe = 4:
 			'Sonia Ivanko is an ordinary girl and doesn''t stand out much. A pretty, smart, and sociable girl Sonia loves to party and is rarely in a bad mood, lately she has started hanging out with the gopniks trying to go to their parties. She lives with her mother in a small apartment after her father left some time ago. Her mother is a nervous, hysterical, and scandalous woman who, when not at work in the Garment Factory, is often out drinking and flirting with men.'
@@ -659,43 +659,43 @@ end
 if $ARGS[0] = 'gopniks':
 	*clr & cla
 	'<center><h2>Gopniks</h2></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/9.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/9.png"></center>'
 	'<center>Vitek Kotov</center>'
 	'Vitek Kotov is an aggressive and strong guy, who considers himself a gangsta. He is very loud, obnoxious and not very attractive. Lena is his twin-sister, whom he is overly protective of and that has caused more than a fair share of drama. He is the local leader of the Gopniks and as such is the most feared boy in school. Even some adults are afraid of him. He is even rumored to be involved with the local organized crime selling drugs.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/154.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/154.png"></center>'
 	'<center>Radomir Popov</center>'
 	'Radomir Popov is the lead singer, backup guitarist, and leader of a local underground rock/punk band the Pizdá Buystvo(Pussy Riot), they are considered fairly talented. He is more or less an asshole, thinking he should already be a star, thus being arrogant to almost everybody. Some of the girls obviously adore him, because they think he is cool or are just groupies, latching onto his limited fame. He is more than happy to use his mini fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/157.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/157.png"></center>'
 	'<center>Roman Yakovlev</center>'
 	'Roman Yakovlev is a psychopath, he''s one of the smaller kids, but is always causing trouble. He''ll start fights knowing that the other Gopniks will have his back. He always has a snide remark and is not afraid to speak back to the teachers and other adults. Not doing great at school, not that he cares. The other gopnik''s find his attitude amusing and seem to like that he''s always getting them into funny situations.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/10.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/10.png"></center>'
 	'<center>Dan Ryzhov</center>'
 	'Dan Ryzhov is a tall and skinny guy, whose body language screams his disdain and contempt for others. He''s a very stubborn guy who will never let an argument be. He''s best friends with Vitek and Vasily, and is considered to be the smartest one of the bunch. Though most consider that to not be much of a feat.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/145.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/145.png"></center>'
 	'<center>Ekaterina "Katyusha" Maksimov</center>'
 	'Ekaterina Maksimov also known as Katyusha. She is not a traditional beauty, her face is too masculine for that. She only seems to care about two things, booze and fighting. She gets the booze in any way she can, stealing or convincing others to get it for her. When she "plays" with the boys, it only goes as far as she wants it. She is the only girl other than Lena who can do that, but while the boys are afraid of Lena''s brother, Katyusha prefers fighting the boys herself. She practices Sambo in the park every day before school, regardless of weather. She often taunts or makes fun of the boxers, claiming boxing is for pussies, real fighters fight without rules. She doesn''t see herself as a gopnik, it''s others that consider her one. This doesn''t bother her because she only cares about the opinion of the people whom earn her respect. Which is really hard to do.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/158.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/158.png"></center>'
 	'<center>Valentin Bogdanov</center>'
 	'Valentin Bogdanov is the bassist in Radomir''s band, he the nicest guy in the band. This still doesn''t stop him from using his mini fame with the girls, to use them in return, it is just he is rarely a dick about it. His goal is to make enough cash from the band to buy an old American motor bike and ride across the country. He can often be found hanging out with Anushka''s dad working on his motorcycle, when he is not hanging out with the band.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/24.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/24.png"></center>'
 	'<center>Pauline Sebagotulina</center>'
 	'Pauline Sebagotulina is a bit of a wild child making her very unpredictable. She often hangs out with the Gopniks in your class and is liked by them. No one dares to mess with her cause she''s been in more fights than anyone else, her and Katyusha can sometimes be found sparring together and starting fights with others.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/156.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/156.png"></center>'
 	'<center>Arkadi Fyodorov</center>'
 	'Arkadi Fyodorov is the drummer in Radomir''s band. His family recently moved from the Saint Petersburg, to Pavlovsk, he was also held back a year, he also looks a bit old for his age. He is very violent when angry, especially with anyone outside the Gopniks. He is also not shy about reminding everyone how much harder the city is and how lame Pavlovsk is.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/20.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/20.png"></center>'
 	'<center>Yalena "Lena" Kotova</center>'
 	'Lena Kotov is Vitek''s twin sister. Just like her brother, she is one of the local Gopniks. With a chip on her shoulder, she can be aggressive and unpredictable. She''s best friends with Lera, and they can often be found together smoking in the school''s restrooms during school, or hanging out together after school.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/11.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/11.png"></center>'
 	'<center>Vasily Shulgin</center>'
 	if grupTipe = 4:
 		'Vasily is always hanging out with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically considered the weakest one of the bunch, but is a bit of a prankster and is always making the other ones laugh, which makes him popular with the gopniks. He was raised just by his father, after his mother left when he was still an infant. When you where younger you was good friends with him and as you both drifted towards the gopniks have stayed good friends.'
@@ -703,23 +703,23 @@ if $ARGS[0] = 'gopniks':
 		'Vasily is always hanging out with Dan and Vitek, who are his best friends. His nickname is Shulga. He''s physically considered the weakest one of the bunch, but is a bit of a prankster and is always making the other ones laugh, which makes him popular with the gopniks. He was raised just by his father, after his mother left when he was still an infant. When you where younger you was good friends with him, but as you grew up you have somewhat drifted apart.'
 	end
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/144.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/144.png"></center>'
 	'<center>Anushka "Nush" Konstantinov</center>'
 	'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band, she and her band often use her good looks to their advantage. She is very adventurous and not shy about her bisexuality, she is also a bit of a exhibitionist, her main goal in life seems to just be having fun. She does surprisingly well in school, she seems to like getting into and causing trouble. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally, what ever she deems the most fun at the time. Other than the band she hangs out a lot with Alyona, she and Radomir use to date.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/143.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/143.png"></center>'
 	'<center>Alyona Zima</center>'
 	'Alyona Zima is a hardcore troublemaker, she lives to cause trouble or jumps into any trouble she can find. She comes from a fucked up family, her parents are alcoholics and drug addicts, most view her as the apple that didn''t fall far from the tree. Knowing this the teachers don''t even bother to try and help her out anymore. She can often be found drinking alcohol, the only person she seems to spend a lot of time around is Anushka. Her father is well known as a bad guy and a bully.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/21.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/21.png"></center>'
 	'<center>Valeria "Lera" Tsarev</center>'
 	'Lera Tsarev comes from a poor family, her father works at the school as a teacher. She often hangs out with the Gopniks in your class and is liked by them. She''s best friends with Lena, and they can often be found together smoking in the school''s restrooms, or hanging out together after school. She is protective of Lena and always takes Lena''s lead. It is rumored she is a lesbian and in love with Lena.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/155.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/155.png"></center>'
 	'<center>Lavrenti Romanov</center>'
 	'Lavrenti Romanov comes from a wealthy family, an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which lead to him and Dimika having a major falling out at the same time, since the fight he started hanging with the Gopniks. He is more of a follower, and the Gopniks like using his money, while tolerating him.'
 
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/189.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/notebook/189.png"></center>'
 	'<center>Nikolai Volkov</center>'
 	'Niko Volkov is clever, but short tempered. When he is not drinking, and partying then he is hanging out with Lavrenti Romanov. Many say that he only spends time with Lavrenti, for his money. Niko always seems confident, and well spoken, but he can sometimes come off as paranoid, and unstable.'
 	

+ 67 - 14
locations/katalkin.qsrc

@@ -17,7 +17,7 @@ if hour >= 8 and hour < 22:
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 				'You agree and sit down at a table near his desk, while captain Katalkin pours two cups of tea. He puts the two cups on the table and sits down next to you. While you chat about Pavlovsk, you can tell he''s practically undressing you with his eyes. Suddenly, you feel his hand resting on your thigh, gently squeezing it. You quietly begin to sputter some objections just as he moves his face closer to yours and cuts you off: "You''re cute, miss. You have to forgive me, us police officers are just people too..."'
-				
+
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Leave (<<will_cost>> Willpower)':
@@ -29,7 +29,7 @@ if hour >= 8 and hour < 22:
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end	
-				
+
 				act 'Do not move':gt 'katalkinSex','sex'
 			end
 		elseif schtraf > 0:
@@ -71,9 +71,8 @@ if hour >= 8 and hour < 22:
 				'You can''t go to jail! You try to look cute and innocent for him when you say: "Please sir, I can''t go to jail! Can''t you let me go just this once?"'
 				'He checks to make sure the room is empty, and turns his face to you. His eyes are exploring your body while he puts his sweaty hand on your knee: "Well, we might be able to arrange something..."'
 
+				'You think to yourself: "Do I really have to sex with him, just to avoid a fine? '+iif(money >= schtraf,'I do have the money, so I could just pay..."','I can''t afford to pay the fine. If I have to have sex with him to avoid going to jail, I guess that''s something I might be willing to do..."')
 				if money >= schtraf:
-					'You think to yourself: "Do I really have sex with him, just to avoid a fine? I do have the money, so I could just pay..."'
-
 					act 'Pay the fine after all':
 						*clr & cla
 						money -= schtraf
@@ -85,10 +84,32 @@ if hour >= 8 and hour < 22:
 
 						act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 					end
-				elseif money < schtraf:
-					'You think to yourself: "I can''t afford to pay the fine. If I have to have sex with him to avoid going to jail, I guess that''s just the way it has to be..."'
-					
-					act 'Smile at him':gt 'katalkinSex','sex'
+				else
+					act 'Spend the night in jail':
+						*clr & cla
+						money = 0
+						schtraf = 0
+						katalkinNoexit = 0
+						kutime = 24
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+						'You shake your head sadly: "I''m sorry officer, I can''t afford that."'
+						'He looks at you indifferently and says in a matter-of-factly tone: "In that case, you spend the next 24 hours in jail."'
+						'He collects your possessions, and counts out the money you do have. You lose that money, but because you can''t pay the full amount you have to spend the next 24 hours in jail. He tells you to follow him and guides you to a prison cell.'
+
+						act 'Enter the prison cell':gt 'kutuzka'
+					end
+				end
+
+				gs 'willpower', 'sex', 'self', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Accept his offer (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'self'
+						gs 'stat'
+						gt 'katalkinSex','sex'
+					end
+				else
+					act 'Accept his offer (<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
@@ -112,16 +133,36 @@ if hour >= 8 and hour < 22:
 			'Captain Katalkin has a greedy smile on his face when he asks: "Well <<$pcs_nickname>>, I see you have to pay a fine. Do you have the money, or are you going to entertain me to make it go away?"'
 
 			if money >= schtraf:
-				act 'Give him the money':
+				gs 'willpower', 'sex', 'resist', 'hard'
+				if will_cost <= pcs_willpwr:
+					act 'Give him the money (<<will_cost>> Willpower)':
+						*clr & cla
+						money -= schtraf
+						schtraf = 0
+						katalkinNoexit = 0
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+						'You see a tinge of regret in his face when you give him the money. "Oh. Very well then, miss <<$pcs_lastname>>. You''re free to go."'
+
+						act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+					end
+				else
+					act 'Give him the money (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			else
+				act 'Spend the night in jail':
 					*clr & cla
-					money -= schtraf
+					money = 0
 					schtraf = 0
 					katalkinNoexit = 0
+					kutime = 24
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-					'You see a tinge of regret in his face when you give him the money. "Oh. Very well then, miss <<$pcs_lastname>>. You''re free to go."'
+					'You shake your head sadly: "I''m sorry officer, I can''t afford that."'
+					'He looks at you with regret and says: "In that case, you spend the next 24 hours in jail."'
+					'He collects your possessions, and counts out the money you do have. You lose that money, but because you can''t pay the full amount you have to spend the next 24 hours in jail. He tells you to follow him and guides you to a prison cell.'
 
-					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+					act 'Enter the prison cell':gt 'kutuzka'
 				end
 			end
 
@@ -200,12 +241,13 @@ elseif hour >= 22:
 					end
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
-				
+				end
+
 				act 'Do not move':gt 'katalkinSex','sex'
 			end
 		elseif schtraf > 0:
 			'Captain Katalkin looks at you with an uninterested look in his eyes. Even though he''s drunk, he won''t let you off the hook: "You have to pay a fine of <<schtraf>> <b>₽</b>. Once you pay, you can go."'
+			'He checks to make sure the room is empty, and turns his face to you. His eyes are exploring your body while he puts his sweaty hand on your knee: "Even if you don''t have the money, well, we might be able to arrange something..."'
 
 			if money >= schtraf:
 				act 'Pay the fine':
@@ -235,6 +277,17 @@ elseif hour >= 22:
 					act 'Enter the prison cell':gt 'kutuzka'
 				end
 			end
+
+			gs 'willpower', 'sex', 'self', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Accept his offer (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gt 'katalkinSex','sex'
+				end
+			else
+				act 'Accept his offer (<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

+ 18 - 13
locations/kotovSex.qsrc

@@ -847,6 +847,7 @@ if $ARGS[0] = 'hand2':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/hug/kotovsex51.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You support your weight by wrapping your arms around his neck and ride his cock with reckless abandon, feeling his cock bottoming out in your cunt with every thrust.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -868,6 +869,7 @@ if $ARGS[0] = 'hand1':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/hug/kotovsex50.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek puts his strong hands on your legs while you wrap your arms around his neck, and he pulls you up effortlessly. It''s as if you''re as light as a feather to him... he''s so strong! He enters you abruptly, and begins to fuck you with long firm strokes.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -889,6 +891,7 @@ if $ARGS[0] = 'bell3':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/facedown/kotovsexbonus10.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek puts his hand on your neck, and stops moving when he notices you''re lazily moving your ass in circles with his cock in you.'
 	'He tightens his grip on your neck, and whispers: "Oh yeah, kitten. Fuck yourself with that cock. Wiggle that ass for me..."'
 	'You blush for a moment, realizing you fully gave into your pleasure and forgot all about what was happening. Nevertheless, it''s kind of a turn-on when he takes control like this! And it feels great...'
@@ -913,6 +916,7 @@ if $ARGS[0] = 'bell2':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/facedown/kotovsexbonus20.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You want to kiss him as much as he wants to kiss you. You raise your head and close your eyes, and return his kiss passionately when you feel his lips against yours. All the while, Vitek continues to fuck you at a steady pace from behind, making you quiver with desire.'
 	gs 'arousal', 'kiss', 5, 'sub'
 	gs 'arousal', 'vaginal', 5, 'sub'
@@ -936,6 +940,7 @@ if $ARGS[0] = 'bell1':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/facedown/kotovsex4'+rand(0,5)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You smile and just lay down on your stomach, offering him the chance to fuck you how he likes. Vitek wastes no time getting on top of you and eagerly guides his cock to your wet snatch, while he puts one hand in your neck.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -957,6 +962,7 @@ if $ARGS[0] = 'sex_cow5':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/hug/kotovsex61.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You kiss passionately, while you continue to buck your hips against his. He pulls you even tighter against him, and you can''t help but feel safe and secure in his arms while you share an intimate moment together.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -978,6 +984,7 @@ if $ARGS[0] = 'sex_cow4':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/hug/kotovsex60.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Almost immediately, Vitek sits up and puts his strong muscular arms around you, pulling you tightly against his chest. Meanwhile you put your slender arms around his neck, and try not to moan too loudly in his ear when he keeps driving his cock deep inside your cunt.'
 	'He''s firmly in control of you in this position, and groans softly: "You''re such a hot little bitch, <<$pcs_nickname>>. <i>My</i> hot little bitch."'
 	'Before you can respond he puts his mouth on your nipple, and you do your best to stifle a cry when he bites down on it softly.'
@@ -1002,6 +1009,7 @@ if $ARGS[0] = 'sex_cow3':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/kotovsexbonus'+rand(17,19)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'With your back turned to him, the way his dick enters your pussy feels different. Maybe even better? You mostly pretend to ignore him, just using his body for your pleasure while you keep sliding his stiff cock in your wet pussy.'
 	'Vitek can''t resist playing with your ass cheeks, and gently kneads them while he moans: "Damn, babe... your ass looks so fucking great..."'
 	gs 'arousal', 'vaginal', 5, 'sub'
@@ -1024,6 +1032,7 @@ if $ARGS[0] = 'sex_cow2':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/kotovsexbonus'+rand(14,16)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek can''t believe his luck, you''re so eager to please him! He stopped moving his hips completely, offering you the initiative.'
 	'You fuck him like you have something to prove and bounce up and down on his cock rhythmically, grinding your hips against his every once in a while.'
 	'When he begins to move his hips involuntarily, you lightly slap him on the chest and tell him: "No. It''s all me now babe, just relax... let me make you feel good..."'
@@ -1048,6 +1057,7 @@ if $ARGS[0] = 'sex_cow1':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/kotovsex2'+rand(0,1)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek gets on his back, and offers you a helping hand while you sit down on his lap, guiding his cock inside your eager pussy.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -1069,6 +1079,7 @@ if $ARGS[0] = 'dog4':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/sequence/kotovsexbonus'+rand(11,13)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You''re not about to let him show you up! While you grind your ass back against his hips you say: "Hold still babe, I''m going to fuck myself with your cock."'
 	'He reluctantly stops, looking at you questioningly. When he sees what you means, he grins and encourages you: "You''re like a little bitch in heat, <<$pcs_nickname>>! I love it... keep going! Come on, harder!"'
 	gs 'arousal', 'vaginal', 5, 'dom'
@@ -1091,6 +1102,7 @@ if $ARGS[0] = 'dog3':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsexbonus'+rand(7,9)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'You lazily lean down against the mattress, happy to let him do the work while you focus on the pleasure he is giving you. With a blissful smile you rest your face on his soft sheets, while Vitek continues to pound you from behind.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -1112,6 +1124,7 @@ if $ARGS[0] = 'dog2':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/sequence/kotovsexbonus'+rand(21,22)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek puts his powerful arms around you and helps you get up, his cock never leaving your pussy. When you''re standing up straight, he holds you tightly and redoubles his efforts. The sounds of him violently slamming his hard cock into your hole over and over and your loud moaning fill the room, and you feel like a ragdoll in his hands when he treats you like this. And to be honest... you love every second of it!'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -1133,6 +1146,7 @@ if $ARGS[0] = 'dog1':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex1'+rand(0,3)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek picks you up and throws you down onto the bed, making you land on your hands and knees in front of him. With a devious smile you arch your back and stick out your ass as much as you can while you look over your shoulder, asking in a seductive voice: "See anything you like, babe?"'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -1157,6 +1171,7 @@ if $ARGS[0] = 'misionary4':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsexbonus'+rand(5,6)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'When you put your lips on his and kiss him passionately, Vitek slows down a bit and kisses you back. After your kiss, his warm breath on your neck makes you shiver with delight.'
 	'For the next few minutes he keeps kissing you passionately while he fucks you slowly, making it a very intimate session. He can be so tender sometimes, when you least expect it...'
 	gs 'arousal', 'vaginal', 5, 'sub'
@@ -1180,6 +1195,7 @@ if $ARGS[0] = 'misionary3':
 	menu_off = 1
 	agil_exp += 1
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsexbonus4.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'He reluctantly does as you say, not really wanting to pause. However, when he sees you put your legs behind your head his jaw drops.'
 	'"Wow, babe... I can''t believe you can do that, that looks so hot!" he mutters, staring blankly at your body for a second.'
 	'You give him a cute smile, revelling in his admiring gaze. Then you snap him out of it and encourage him: "Don''t just look at it, silly... get back to making me feel good!"'
@@ -1204,6 +1220,7 @@ if $ARGS[0] = 'misionary2':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsexbonus'+rand(0,3)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'With your legs pulled up even further, you give Vitek an incredible view of your pussy. Your pussy lips are slightly parted in this position, and you give him an inviting smile without saying a word.'
 	'The sight of your exposed pussy greatly arouses him, and Vitek eagerly climbs on top of you and fucks you roughly in this position. Just the way you like it.'
 	gs 'arousal', 'vaginal', 5, 'sub', 'rough'
@@ -1296,6 +1313,7 @@ if $ARGS[0] = 'misionary1':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsex'+rand(0,3)+'.mp4"></video></center>'
+	if protect = 0: gs 'dinsex', 'boy_puts_condom'
 	'Vitek pushes you down on your back eagerly, and you automatically spread your legs for him.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
@@ -1318,7 +1336,6 @@ if $ARGS[0] = 'titjob':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj14'+rand(0,2)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You give him a devious smile and ask him: "Honey... you like my boobs, don''t you?"'
 	'He nods eagerly: "You know I do, babe... they''re amazing!"'
 	'"Why don''t you show me?" you challenge him.'
@@ -1346,7 +1363,6 @@ if $ARGS[0] = 'bj13':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj13'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You firmly grasp his member, and rub the head of his cock against your nipple while you talk dirty to him. Your nipple hardens at the touch of his erection, and you get even more turned on when the precum he''s leaking makes everything even slicker.'
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
@@ -1369,7 +1385,6 @@ if $ARGS[0] = 'bj12':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj12'+rand(0,2)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'He looks down at you happily, and suggests: "How about you blow me, babe? But to make it more challenging, without using your hands..."'
 	'A challenge? You''re not one to back down from a challenge! You close your lips around his cock while you theatrically show that your hands are nowhere near it, and slowly begin to bob your head up and down. His cock is pretty big, and you don''t feel confident you can take it down much more than half-way.'
 	gs 'arousal', 'bj', 5, 'sub'
@@ -1393,7 +1408,6 @@ if $ARGS[0] = 'bj11':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj11'+rand(0,4)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You grab the base of his penis and guide it to your mouth, beginning to suck on it greedily.'
 	'His cock is fairly large, and you''re not sure you want to shove it all the way into that little mouth of yours right now. Instead, you suck on the head of his cock and look at him seductively while your slender fingers work his shaft.'
 	gs 'arousal', 'bj', 5, 'sub'
@@ -1418,7 +1432,6 @@ if $ARGS[0] = 'bj10':
 	pcs_throat += 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj10'+rand(0,3)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'Even though he''s more gentle with you than you thought he would be before hooking up with him, you know he likes to assert his dominance over girls from time to time.'
 	'When he tells you he''s going to fuck your throat next, you meekly nod and fully relax your throat while he begins to work his cock further into your mouth.'
 	'You nearly choke and have to do your best to suppress your gag reflex while he slowly fucks your throat. Nevertheless, the proud grin on his face makes it all worth it. It''s not something you would do all the time, but maybe you secretly enjoy surrendering yourself to him like this every once in a while?'
@@ -1444,7 +1457,6 @@ if $ARGS[0] = 'bj9':
 	pcs_throat += 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj9'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You tell him to keep his hands to himself, and slowly wrap your lips around his cock before taking more and more of his length in your mouth.'
 	'Eventually the head of his cock is around where your throat begins, and you stimulate it teasingly by swallowing, squeezing your throat tightly against the head every time.'
 	gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
@@ -1468,7 +1480,6 @@ if $ARGS[0] = 'bj8':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj8'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You work your way down and gently lick the underside of his testicles, before you slip your tongue over his anus. At first he assumes it''s a mistake, but he looks a bit panicked when you keep teasing it rhythmically with the tip of your tongue.'
 	'He groans: "Oh shit, <<$pcs_nickname>>! What are you doing!?"'
 	'When you look into his eyes and just keep licking it with the tip of your tongue, a soft moan escapes his lips. After a few seconds he admits: "That... that feels great! Just don''t tell the boys, okay?"'
@@ -1493,7 +1504,6 @@ if $ARGS[0] = 'bj7':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj7'+rand(0,4)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You slowly work your way down, and caress his balls with your tongue. His groaning makes you feel like he''s enjoying it, and encourages you to lick them more vigorously.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
@@ -1516,7 +1526,6 @@ if $ARGS[0] = 'bj6':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj6'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You take his dick in your hand, and begin to stroke him off while you look at him confidently. You know this isn''t what he wants, but it''s fun to get a rise out of him!'
 	'It doesn''t take long for him to say: "<<$pcs_nickname>>... it doesn''t feel bad, but I can just jerk myself off whenever I want. Why aren''t you putting your lady parts to use?"'
 	gs 'arousal', 'hj', 5, 'sub'
@@ -1540,7 +1549,6 @@ if $ARGS[0] = 'bj5':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj5'+rand(0,3)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You don''t take his cock in your mouth just yet. Instead you lick its entire length in long, firm strokes, enjoying the warm rigid feeling against your tongue, and the slightly salty taste of his precum whenever you reach the head. Slowly but surely, you''re coating his entire dick with your saliva.'
 	*pl
 	gs 'arousal', 'foreplay', 5, 'sub'
@@ -1564,7 +1572,6 @@ if $ARGS[0] = 'bj4':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj4'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'It feels so nice in your hand. You rub the shaft, admiring the way his foreskin pops over the head of his cock and back when you masturbate him slowly. The head of his cock becomes more and more slippery with precum.'
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
@@ -1587,7 +1594,6 @@ if $ARGS[0] = 'bj3':
 	menu_off = 1
 	kotov_bj_times += 1
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj3'+rand(0,1)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You wrap your delicate fingers around the shaft of his cock, guiding it to your mouth. Ignoring his pleas, you don''t take it in your mouth and just put your <<$liptalk>> lips against it, kissing it over and over.'
 	*pl
 	gs 'arousal', 'foreplay', 5, 'sub'
@@ -1616,7 +1622,6 @@ if $ARGS[0] = 'bj2':
 		$textsexkotov = 'close your <<$liptalk>> lips around the head of his cock and suck him off eagerly'
 	end
 	'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj2'+rand(0,6)+'.mp4"></video></center>'
-	h = rand(1,3)
 	'You <<$textsexkotov>>. You clench your <<$liptalk>> lips around his cock tightly, and try to give him the best blowjob you''ve ever given.'
 	'The tenderness of your lips is driving Vitek crazy, and he can do little more than moan uncontrollably while you keep sucking.'
 	*pl

+ 1 - 1
locations/kruchess.qsrc

@@ -53,7 +53,7 @@ else
 			npc_rel['A151'] += 5
 			gs 'stat'
 
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big35.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big151.jpg"></center>'
 			*nl
 			'You sit down next to Evgeny to talk. At first you try to catch his interest with ordinary things; he barely even responds to you, preoccupied playing against himself. Then you bring up a recent opening you have been trying and he perks up. Soon the two of you are talking about various openings and he shares with you some of his favorite ones and how he moves them to the mid game. You learn a bit about chess and feel like you are better friends with Evgeny.'
 

+ 53 - 4
locations/natbelapt.qsrc

@@ -458,11 +458,60 @@ if $ARGS[0] = 'natroom':
 
 		if NatbelQW['pregday'] > 0 and daystart-NatbelQW['pregday'] > 90 and NatbelQW['askedbaby'] ! daystart:
 			act 'Touch her belly':
+				*clr & cla
+				minut += 5
 				NatbelQW['askedbaby'] = daystart
-				*nl
-				'She looks at you with a strange smile.'
-				'"Yes," she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
-				'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
+				gs 'npc_relationship', 'modify', 'A16', 'like'
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/natbelapt/touch_belly'+iif(npc_pregtalk['A16'] = 1,'_preg','')+'.jpg"></center>'
+				if daystart-NatbelQW['pregday'] < 120:
+					'She looks at you with a strange smile.'
+					'"Yes," she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
+					'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
+					if npc_pregtalk['A16'] = 1: '"It''s really reassuring to know I won''t be going through this alone though," she says softly and gives you a hug.'
+				elseif daystart-NatbelQW['pregday'] < 190:
+					'"I felt the baby kick earlier today!" she says with a big smile on her face, "keep your hands there for a bit, maybe it''ll happen again."'
+					if rand(0,20) = 0: 'About a minute later you do indeed feel a tiny kick from inside Natasha''s belly, making both of you jump a little.'
+					if NatbelQW['KolkaSex'] > 20 and rand(0,2) = 1: 'With a beet-red face and a dreamy look in her eyes she adds "Don''t tell Kolka, but every time we have our little... fun... it gets really active in there."'
+					*nl
+					if npc_pregtalk['A16'] = 1:
+						'A few moments later she asks "What about yours, felt anything yet?"'
+						if pregtime < 120:
+							'"I don''t think so," you respond, slightly sad about the fact for some reason.'
+							'Natasha quickly picks up on that and tries to cheer you up "Don''t worry, you''re just not far along yet. It''ll make you so happy when it happens for the first time, you''ll see!"'
+						elseif pregtime < 190:
+							'"Yep, I feel it kicking in the morning sometimes," which prompts Natasha to start rubbing your belly too.'
+						else
+							'"Oh yeah, it''s gotten quite lively in there lately," which prompts Natasha to start rubbing your belly too.'
+							if rand(0,7) = 0:
+								dynamic $d_pregmovement
+								'"As if on queue..." you happily muse aloud.'
+								if $wombthfath = 'Kolka': 'With a tinge of wonder Natasha mumbles "Your little brother makes some energetic children, doesn''t he?"'
+							end
+						end
+					end
+				else
+					'"The baby''s really restless lately. Turned my belly button into an outie with all that kicking," she says jokingly, barely keeping back her giggling.'
+					if rand(0,7) = 0: 'Natasha has barely finished her joke, before you feel a kick coming from within.<br>"There we go again, see?"'
+					*nl
+					if npc_pregtalk['A16'] = 1:
+						'She puts her hands on your belly a moment later and asks "How is your pregnancy going <<$pcs_nickname>>?"'
+						if pregtime < 120:
+							'"Oh, you know... I keep getting morning sickness, but it''s not as bad as I read it would be. And luckily my belly doesn''t show much for now, '+iif(npc_pregtalk['A29'] = 1, 'so people at school haven''t noticed yet."', 'so my <<$npc_nickname[''A29'']>> hasn''t found out I''m pregnant yet. I really don''t know what I''ll do when she does though..."')
+							'Natasha gives you a reassuring hug, telling you it''s all going to be alright and that she''s there for you.'
+						elseif pregtime < 190:
+							'"I feel the baby kicking in the morning sometimes," you say with a smile.'
+						else
+							'"Tell me about it, it''s like there''s a constant party going on in there."'
+							if rand(0,7) = 0:
+								dynamic $d_pregmovement
+								'"As if on queue..." you happily muse aloud.'
+								if $wombthfath = 'Kolka': 'You see Natasha blush slightly before she says with a wink "Just like their dad, huh?"'
+							end
+						end
+					end
+				end
+				act 'Continue': gt 'natbelapt', 'natroom'
 			end
 		end
 

+ 10 - 2
locations/phone_selfies_popup.qsrc

@@ -4,12 +4,20 @@
 
 !! show uses $phone_loc to determine where the picture is located
 if $ARGS[0] = 'show':
-	msg '<img src="images/pc/selfies/<<$phone_loc>>/<<$ARGS[1]>>/<<$ARGS[2]>>.jpg">'
+	if usePopUps = 1:
+		msg '<img src="images/pc/selfies/<<$phone_loc>>/<<$ARGS[1]>>/<<$ARGS[2]>>.jpg">'
+	else
+		view 'images/pc/selfies/<<$phone_loc>>/<<$ARGS[1]>>/<<$ARGS[2]>>.jpg'
+	end
 end
 
 !! show2 passes the location and image number
 if $ARGS[0] = 'show2':
-	msg '<img src="<<$ARGS[1]>><<$ARGS[2]>>.jpg">'
+	if usePopUps = 1:
+		msg '<img src="<<$ARGS[1]>><<$ARGS[2]>>.jpg">'
+	else
+		view '<<$ARGS[1]>><<$ARGS[2]>>.jpg'
+	end
 end
 
 

+ 1 - 1
locations/placer_sex.qsrc

@@ -1890,7 +1890,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 			else
 				'You wake up with a smile, stretching your arms and legs, flashing your bare pussy to the entire Park.'
 			end
-		elseif CloSkirtShortness > 0:
+		elseif PCloSkirt > 0:
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park.jpg"></center>'
 			if $pantyworntype ! 'none':
 				gs 'underwear', 'dispose'

+ 1 - 0
locations/pod_ezd.qsrc

@@ -5,6 +5,7 @@ CLOSE ALL
 gs 'themes', 'indoors'
 $metka = ''
 $loc = 'pod_ezd'
+$location_type = 'public_indoors'
 !elevator does not work
 if liftnotwork_day ! daystart: liftnotwork_count = 1
 !Apartment Uncle Misha

+ 1 - 1
locations/porn_view.qsrc

@@ -77,7 +77,7 @@ if seepornofut < 10:
 				func('porn_view_strings', 'view_7_virgin'+iif(pcs_horny > 70,'_horny_no_tanga','_no_tanga'))
 
 				! we`ve got skirt!
-				if PCloSkirtShortness > 0:
+				if PCloSkirt > 0:
 					func('porn_view_strings','view_7_virgin_horny_no_tanga_skirt')
 				end
 

+ 33 - 16
locations/preCUST.qsrc

@@ -371,7 +371,7 @@ if $ARGS[0] = 'Done':
 
 !! Adding underwear and default shoes and assigning them
 
-	if $ARGS[1] ! 'CSB':
+	if $ARGS[1] ! 'CSB' and goth_clothing ! 1:
 		cheap_panties[37] = 1
 		cheap_bras[11] = 1
 		$pantyworntype = 'cheap'
@@ -400,9 +400,14 @@ if $ARGS[0] = 'Done':
 		sportsclothingnumber = 29
 		gs 'clothing', 'wear', 'cheap', 370
 	elseif goth_clothing = 1:
-		killvar 'goth_clothing'
-		exercise[4] = 1
-		exerciseH[4] = 100
+		kats_panties[44] = 1
+		kats_bras[28] = 1
+		$pantyworntype = 'kats'
+		pantywornnumber = 44
+		$braworntype = 'kats'
+		brawornnumber = 28
+		exercise[45] = 1
+		exerciseH[45] = 100
 		strainers[21] = 1
 		sgandm[43] = 1
 		shoewornnumber = 43
@@ -561,9 +566,6 @@ if $ARGS[0] = 'Done':
 		sportsclothingnumber = 58
 		gs 'clothing', 'wear', 'cheap', 118
 	end
-	coat[5] = 1
-	coatH[5] = 200
-	defaultcoat = 5
 	if swim_start = 58:
 		swimwear[58] = 1
 		swimwearH[58] = 60
@@ -578,18 +580,33 @@ if $ARGS[0] = 'Done':
 		swimwearB[69] = pcs_hips
 	end
 	
-!!setting default exercise outfit
-	if $ARGS[1] ! 'CSB':
-		sportspantynumber = 37
-		sportsbranumber = 11
+!!setting default exercise outfit and setting coats
+	if goth_clothing = 1:
+		killvar 'goth_clothing'
+		sportspantynumber = 44
+		sportsbranumber = 28
+		$sportsbratype = 'kats'
+		$sportspantytype = 'kats'
+		coat[14] = 1
+		coatH[14] = 200
+		defaultcoat = 14
+		sportscoat = 14
 	else
-		sportspantynumber = 5
-		sportsbranumber = 12
+		if $ARGS[1] ! 'CSB':
+			sportspantynumber = 37
+			sportsbranumber = 11
+		else
+			sportspantynumber = 5
+			sportsbranumber = 12
+		end
+		$sportsbratype = 'cheap'
+		$sportspantytype = 'cheap'
+		coat[5] = 1
+		coatH[5] = 200
+		defaultcoat = 5
+		sportscoat = 5	
 	end
-	$sportsbratype = 'cheap'
-	$sportspantytype = 'cheap'
 	sportsshoenumber = 21
-	sportscoat = 5	
 	$sportspursetype = $currentpursetype
 	sportspursenumber = currentpursenumber
 	$sports_clothing_name = 'default sports outfit'

+ 4 - 4
locations/preSYS.qsrc

@@ -617,7 +617,7 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_heels = 10
 		pirsC = 2
 		PirsC2_owned = 1
-		$currentpursetype = 'cheap'
+		$currentpursetype = 'fashionista'
 		currentpursenumber = 13
 		fashionista_purses[13] = 1
 		bag = 1
@@ -737,7 +737,7 @@ if $ARGS[0] = 'jock':
 	swim_start = 69
 	pirsC = 1
 	PirsC1_owned = 1
-	$currentpursetype = 'cheap'
+	$currentpursetype = 'fashionista'
 	currentpursenumber = 11
 	fashionista_purses[11] = 1
 	bag = 1
@@ -865,7 +865,7 @@ if $ARGS[0] = 'football':
 		npc_rel['A34'] += 10
 		grupvalue[2] = 65
 		willpowermax = 140
-		$currentpursetype = 'cheap'
+		$currentpursetype = 'fashionista'
 		currentpursenumber = 11
 		fashionista_purses[11] = 1
 		bag = 1
@@ -953,7 +953,7 @@ if $ARGS[0] = 'beautiful':
 			pcs_lip = 3
 			pcs_lashes = 2
 		end
-		pcs_skin = 25
+		pcs_skin = 100
 		pcs_tan = 50
 		genbsize = 37
 		pcs_inhib = 25

+ 1 - 1
locations/preSYS2.qsrc

@@ -171,7 +171,7 @@ end
 if $ARGS[0] = 'modrel_setup4':
 	dynamic 'if <<$ARGS[1]>> < 0: <<$ARGS[1]>> = 0'
 	dynamic 'if <<$ARGS[1]>> > 100: <<$ARGS[1]>> = 100'
-	dynamic 'x = <<100-$ARGS[1]>>'
+	dynamic 'x = 100-<<$ARGS[1]>>'
 	'<TR bgcolor=#ffffff><TD><<$ARGS[2]>> (<<x>>/100)</TD><TD><a href="exec:<<$ARGS[1]>> = 100 & gt ''preSYS2'', $metka">zero</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>> += 10 & gt ''preSYS2'', $metka">minus 10</a></TD><TD bgcolor=#ff9999><a href="exec:<<$ARGS[1]>>  += 5 & gt ''preSYS2'', $metka">minus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 5 & gt ''preSYS2'', $metka">plus 5</a></TD><TD bgcolor=#99ff99><a href="exec:<<$ARGS[1]>>  -= 10 & gt ''preSYS2'', $metka">plus 10</a></TD><TD><a href="exec:<<$ARGS[1]>>  = 0 & gt ''preSYS2'', $metka">100</a></TD>'
 end
 

+ 122 - 0
locations/shortgs.qsrc

@@ -640,5 +640,127 @@ if $ARGS[0]='img msg':
 	killvar '$shortgstemp'
 end
 
+!! Used for dividing with accurate rounding up/down
+if $ARGS[0] = 'round_divide':
+	!! ARGS[1] = value you want divided
+	!! ARGS[2] = divider
+	!!  func('shortgs','round_divide', number, divider)
+	!!  func('shortgs','round_divide', 12345, 7)
+	if ARGS[2] ! 0:
+		temp_number = ARGS[1]/ARGS[2]
+		if (ARGS[2] mod 2 ! 0 and ARGS[1] mod ARGS[2] > ARGS[2]/2) or (ARGS[2] mod 2 = 0 and ARGS[1] mod ARGS[2] >= ARGS[2]/2): temp_number += 1
+		result = temp_number
+		killvar 'temp_number'
+	else
+		msg '<b>Error: No dividing by 0! You trying to make the universe disappear?</b>'
+	end
+end
+
+!! Used for rounding numbers to the nearest multiple of ARGS[2]
+if $ARGS[0] = 'round_tool':
+	!! ARGS[1] = value you want rounded
+	!! ARGS[2] = nearest multiple to round to
+	!!  func('shortgs','round_tool', number, multiple)
+	!!  func('shortgs','round_tool', 12345, 10)
+	if ARGS[2] ! 0:
+		temp_multiple = ARGS[2]
+		result = func('shortgs','round_divide', ARGS[1], ARGS[2]) * temp_multiple
+		killvar 'temp_multiple'
+	else
+		msg '<b>Error: Can''t round to 0!</b>'
+	end
+end
+
+!! Randomly picks one of the items plugged in
+!!
+!!  Option 1: (has 6 input limit)
+!!  $ARGS[1] =		'string' or 'number' to specify what youre plugging in (can also be blank for numbers)
+!!  $ARGS[2-7] =	 strings or numbers to pick from, limited to 6
+!!  Example 1: func('shortgs', 'rand_pick', 'string', 'alpha', 'beta', 'gamma', 'delta', 'epsilon', 'zeta')
+!!  Example 2: func('shortgs', 'rand_pick', '', 2, 3, 5, 7, 11, 13)
+!!
+!!  Option 2: (no limitations, has to be delimited)
+!! 	$ARGS[1] =		'delimit'  -  used for larger numbers of items to pick from
+!!  $ARGS[2] =		'string' or 'number' to specify what youre plugging in (can also be blank for numbers)
+!!  $ARGS[3] =		 Delimited string to parse
+!!  $ARGS[4] =		 Delimiter used (Default = '|' pipe)
+!!  Example 1: func('shortgs', 'rand_pick', 'delimit', 'string', 'alpha|beta|gamma|delta|epsilon|zeta')
+!!  Example 2: func('shortgs', 'rand_pick', 'delimit', 'number', '1-12-123-1234-12345-123456', '-')
+!!  Example 3: func('shortgs', 'rand_pick', 'delimit', '', '0.1.2.3.5.7.11', '.')
+if $ARGS[0] = 'rand_pick':
+	if $ARGS[1] = 'delimit':
+		if $ARGS[2] = 'string':
+			gs 'shortgs', 'parse_string', '$rand_pick_temp', $ARGS[3], $ARGS[4]
+			$result = $rand_pick_temp[rand(0, arrsize('$rand_pick_temp')-1)]
+			killvar '$rand_pick_temp'
+		else
+			gs 'shortgs', 'parse_string', 'rand_pick_temp', $ARGS[3], $ARGS[4]
+			result = rand_pick_temp[rand(0, arrsize('rand_pick_temp')-1)]
+			killvar 'rand_pick_temp'
+		end
+	else
+		if arrsize('ARGS') > 2:
+			if $ARGS[1] = 'string':
+				$result = $ARGS[rand(2, arrsize('$ARGS')-1)]
+			else
+				result = ARGS[rand(2, arrsize('ARGS')-1)]
+			end
+		else
+			msg '<b>Error: ''rand_pick'' is missing ARGS</b>'
+		end
+	end
+end
+
+!! Parse delimited string into an array
+!!	$ARGS[1] =		ArrayName (has to include $ for string values)
+!!	$ARGS[2] =		Delimited string to parse
+!!	$ARGS[3] =		Delimiter used (Default = '|' pipe)
+!!  Example 1: gs 'shortgs', 'parse_string', '$my_array', 'alpha|beta|gamma|delta|epsilon|zeta'
+!!  Example 2: gs 'shortgs', 'parse_string', 'my_array', '1-12-123-1234-12345-123456', '-'
+if $ARGS[0] = 'parse_string':
+	!! Some failsafes (blank array name, blank string or no delimiters in string)
+	if $ARGS[1] ! '':
+		if $ARGS[2] ! '' and instr($ARGS[2],iif($ARGS[3] = '', '|', $ARGS[3])) > 0:
+			!! Set delimiter with default if needed
+			if $ARGS[3] = '':
+				$ParserTmpDelim = '|'
+			else
+				$ParserTmpDelim = $ARGS[3]
+			end
+			!! Clear temp array if needed
+			killvar 'ParserTmpArr' & killvar '$ParserTmpArr'
+			$ParserTmpStr = $ARGS[2]
+			!! Loop through string until no more delimiters found
+			:StringParser01
+			ParserTmpIdx = instr($ParserTmpStr, $ParserTmpDelim)
+			if ParserTmpIdx > 0:
+				if mid($ARGS[1],1,1) = '$':
+					$ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
+					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
+				else
+					ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
+					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
+				end
+				jump 'StringParser01'
+			!! Get last part since no more delimiters were found and copy to the final array
+			elseif mid($ARGS[1],1,1) = '$':
+				$ParserTmpArr[] = $ParserTmpStr
+				copyarr $ARGS[1], '$ParserTmpArr'
+			else
+				ParserTmpArr[] = $ParserTmpStr
+				copyarr $ARGS[1], 'ParserTmpArr'
+			end
+			killvar '$ParserTmpDelim'
+			killvar '$ParserTmpStr'
+			killvar 'ParserTmpIdx'
+			killvar 'ParserTmpArr' & killvar '$ParserTmpArr'
+		else
+			msg '<b>Error: No delimited string found!</b>'
+		end
+	else
+		msg '<b>Error: No array name found!</b>'
+	end
+end
+
 --- shortgs ---------------------------------
 

+ 2 - 2
locations/sister.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'gdk':
 		'Anya and some of her friends are dressed up organizing themselves before going to the party. Anya sees you and waves you to her. "Come on, I was starting to wonder if you were going to show up."'
 		gs 'sister', 'partyanswer', 'anya'
 	! Anya heading to party
-	elseif npc_rel['A33'] >= 70 and week = 5 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and sisterQW['party'] = 0:
+	elseif npc_rel['A33'] >= 70 and week = 5 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and (sisterQW['party'] = 0 or sisterQW['party'] = 2):
 		minut += 5
 		gs 'stat'
 		if npc_rel['A57'] >= 80:
@@ -413,7 +413,7 @@ if $ARGS[0] = 'scene1':
 !1 - knows about the parties
 !2 - agreed to go to the party
 !!again want to change rexs party to only every other Friday
-		elseif week < 5 and week > 1 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and pcs_vag > 0 and sisterQW['party'] = 0 and daystart - sisterQW['partyday'] > 3:
+		elseif week < 5 and week > 1 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and pcs_vag > 0 and (sisterQW['party'] = 0 or sisterQW['party'] = 2) and daystart - sisterQW['partyday'] > 3:
 			'Roma looks up at you, suddenly remembering something. "<<$pcs_nickname>>, Rex''s apartment is available on Friday and he''s having a party, do you want to go?"'
 			sisterQW['partyday'] = daystart
 			minut += 5

+ 1 - 1
locations/sister_chat.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'sister_chat':
 					'"Oh, sister, <<$tmpstr>>I think the father is <<$tmpstr2>>"'
 				end
 			end
-		elseif week < 5 and week > 1 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and pcs_vag > 0 and npc_rel['A33'] >= 80 and sisterQW['party'] = 0 and daystart - sisterQW['partyday'] > 3:
+		elseif week < 5 and week > 1 and ((daystart - (daystart mod 7)) / 7) mod 2 = 0 and pcs_vag > 0 and npc_rel['A33'] >= 80 and (sisterQW['party'] = 0 or sisterQW['party'] = 2) and daystart - sisterQW['partyday'] > 3:
 			*clr & cla
 			minut += 5
 			sisterQW['partyday'] = daystart

+ 2 - 0
locations/sistersleep.qsrc

@@ -8,6 +8,8 @@ if $ARGS[0] = 'sister_sleep':
 	'Anya is sleeping face down on her bed, with her covers tossed aside, exposing her panty clad ass. You admit she has a really nice ass, you never see her workout, you wonder how she keeps so fit.'
 	if sisterLesb >= 6 or sisterLesb = -1:
 		'You want to touch her again but you keep from doing it, you agreed to not wake her up like this anymore. You sigh and then move away.'
+		gs 'arousal', 'voyeur', -2
+		gs 'stat'
 		act 'Move away': gt 'bedrPar'
 	else
 		act 'Move away': gt 'bedrPar'

+ 1 - 1
locations/stat_sklattrib_lvlset.qsrc

@@ -181,7 +181,7 @@ pcs_pool = ((pool_lvl * 3) + pcs_intel)/4
 pool[1] = 3 & pool[2] = -1
 
 !! inhibition 
-pcs_inhib = inhib_lvl
+pcs_inhib = inhib_lvl + (alko * 3) & if pcs_inhib > 100: pcs_inhib = 100
 inhib[1] = 3 & inhib[2] = -1
 
 !!Performance; Skill at things like acting or putting on a show

+ 2 - 1
locations/stwork2.qsrc

@@ -321,7 +321,8 @@ end
 
 if $ARGS[0] = 'privatdance':
 	*clr & cla
-	minut += 30
+	minut += 20
+	gs 'arousal', 'foreplay', 10
 	money += 400
 	if pcs_sweat < 30 : gs 'sweat', 'add', 10
 	pcs_hairbsh = 0

+ 6 - 6
locations/swamp_yard.qsrc

@@ -570,13 +570,13 @@ if $ARGS[0] = 'start':
 				gs 'stat'
 
 				if huntersIgorLove = 0 and huntersIgorQw >= 20 and huntersIgorQw < 25:
-					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2_ski.jpg"></center>'
-					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2.jpg"></center>'
+					if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2_ski.jpg"></center>'
+					if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers2.jpg"></center>'
 					'Smiling, you take the bouquet out of his hand and walk away yearning for something more.'
 				end
 				if huntersIgorLove = 0 and huntersIgorQw >= 25 and huntersIgorQw < 30 or huntersIgorLove > 0:
-					if CloSkirtShortness > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3_ski.jpg"></center>'
-					if CloSkirtShortness = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3.jpg"></center>'
+					if PCloSkirt > 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3_ski.jpg"></center>'
+					if PCloSkirt = 0:'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflowers3.jpg"></center>'
 					'Smiling, you take the bouquet from his hands and walk away cherfully.'
 				end
 				if huntersIgorLove = 0 and huntersIgorQw >= 30:
@@ -977,7 +977,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		!! wind lifts skirt
-		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
+		if hunters_outside = 1 and huntersknow = 0 and PCloSkirt > 1 and $pantyworntype = 'none' and RAND(1,20) = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'
@@ -1022,7 +1022,7 @@ if $ARGS[0] = 'start':
 		end
 		! wind lifts skirt
 		skirtsrand = RAND(1,10)
-		if hunters_outside = 1 and huntersknow = 0 and CloSkirtShortness > 1 and $pantyworntype = 'none' and skirtsrand = 1:
+		if hunters_outside = 1 and huntersknow = 0 and PCloSkirt > 1 and $pantyworntype = 'none' and skirtsrand = 1:
 			*clr & cla
 			hunterslut += 1
 			gs 'stat'

+ 50 - 10
locations/telefon.qsrc

@@ -1398,7 +1398,11 @@ if $ARGS[0] = 'Phone_camera_selfie':
 		phone_rand = RAND(1,2)
 		phone_selfie[phone_rand] = 1
 		gs 'stat'
-		msg '<img src="images/system/phone/selfie/phone_selfie<<phone_rand>>.jpg">'
+		if usePopUps = 1:
+			msg '<img src="images/system/phone/selfie/phone_selfie<<phone_rand>>.jpg">'
+		else
+			view 'images/system/phone/selfie/phone_selfie<<phone_rand>>.jpg'
+		end
 	end
 	!if spdirtyf > 0: phone_rand = RAND (m,n) - for SELF in the semen
 	!if photo_event_pic = x: phone_rand = RAND (x,y) - for photos during the events (by heart)
@@ -1415,7 +1419,11 @@ if $ARGS[0] = 'Phone_selfie_image':
 			!!Setting the image owned flag to 1
 			dynamic '<<$phone_loc>>_swim[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/bikini/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/bikini/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/bikini/<<phone_rand>>.jpg'
+			end
 		elseif $clothingworntype ! 'nude':
 			!!changing to and unmixed variable so the rng will work
 			dynamic 'temp_clotot = <<$phone_loc>>_clotot'
@@ -1423,19 +1431,31 @@ if $ARGS[0] = 'Phone_selfie_image':
 			!!Setting the image owned flag to 1
 			dynamic '<<$phone_loc>>_closelfie[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/clothed/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/clothed/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/clothed/<<phone_rand>>.jpg'
+			end
 		elseif $pantyworntype ! 'none':
 			dynamic 'temp_undtot = <<$phone_loc>>_undtot'
 			phone_rand = rand(1,temp_undtot)
 			dynamic '<<$phone_loc>>_undselfie[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/underwear/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/underwear/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/underwear/<<phone_rand>>.jpg'
+			end
 		else
 			dynamic 'temp_nudtot = <<$phone_loc>>_nudtot'
 			phone_rand = rand(1,temp_nudtot)
 			dynamic '<<$phone_loc>>_nudselfie[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/nude/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/nude/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/nude/<<phone_rand>>.jpg'
+			end
 		end
 	else
 		if $flashing = 'tits':
@@ -1443,19 +1463,31 @@ if $ARGS[0] = 'Phone_selfie_image':
 			phone_rand = rand(1,temp_titflash)
 			dynamic '<<$phone_loc>>_titflash[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/titflash/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/titflash/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/titflash/<<phone_rand>>.jpg'
+			end
 		elseif $flashing = 'ass':
 			dynamic 'temp_assflash = <<$phone_loc>>_assflash'
 			phone_rand = rand(1,temp_assflash)
 			dynamic '<<$phone_loc>>_assflash[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/assflash/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/assflash/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/assflash/<<phone_rand>>.jpg'
+			end
 		elseif $flashing = 'pussy':
 			dynamic 'temp_pussyflash = <<$phone_loc>>_pussyflash'
 			phone_rand = rand(1,temp_pussyflash)
 			dynamic '<<$phone_loc>>_pussyflash[<<phone_rand>>] = 1'
 			gs 'stat'
-			msg '<img src="images/pc/selfies/<<$phone_loc>>/pussyflash/<<phone_rand>>.jpg">'
+			if usePopUps = 1:
+				msg '<img src="images/pc/selfies/<<$phone_loc>>/pussyflash/<<phone_rand>>.jpg">'
+			else
+				view 'images/pc/selfies/<<$phone_loc>>/pussyflash/<<phone_rand>>.jpg'
+			end
 		end
 		$flashing = ''
 	end
@@ -1473,13 +1505,21 @@ if $ARGS[0] = 'Phone_selfie_image_bathing':
 		!!Setting the image owned flag to 1
 		dynamic '<<$phone_loc>>_showerselfie[<<phone_rand>>] = 1'
 		gs 'stat'
-		msg '<img src="images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg">'
+		if usePopUps = 1:
+			msg '<img src="images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg">'
+		else
+			view 'images/pc/selfies/<<$phone_loc>>/shower/<<phone_rand>>.jpg'
+		end
 	elseif $ARGS[1] = 'bath':
 		dynamic 'temp_bathtot = bathroom_bathtot'
 		phone_rand = rand(1,temp_bathtot)
 		dynamic '<<$phone_loc>>_bathselfie[<<phone_rand>>] = 1'
 		gs 'stat'
-		msg '<img src="images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg">'
+		if usePopUps = 1:
+			msg '<img src="images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg">'
+		else
+			view 'images/pc/selfies/<<$phone_loc>>/bath/<<phone_rand>>.jpg'
+		end
 	end
 end
 

+ 5 - 4
locations/willpower.qsrc

@@ -716,20 +716,21 @@ if $ARGS[0] = 'skill':
 
 	if $ARGS[1] = 'resist' or $ARGS[1] = 'force' or $ARGS[1] = 'self':
 		if $ARGS[2] = 'inhib_lvl':
-			will_cost = (pcs_inhib + will_calc)/10
+			will_cost = (100 - pcs_inhib + will_calc)/10
 		else
 			dynamic 'will_cost = (100 - <<$ARGS[2]>> + will_calc)/10'
 		end
+		gs 'willpower', 'difficulty', '<<$ARGS[3]>>'
 	else
 		if $ARGS[1] = 'inhib_lvl':
-			will_cost = (pcs_inhib + will_calc)/10
+			will_cost = (100 - pcs_inhib + will_calc)/10
 		else
 			dynamic 'will_cost = (100 - <<$ARGS[1]>> + will_calc)/10'
 		end
+		gs 'willpower', 'difficulty', '<<$ARGS[2]>>'
 	end
-	gs 'willpower', 'difficulty', '<<$ARGS[2]>>'
 end
-		
+
 if $ARGS[0] = 'rape':
 	gs 'willpower', 'calc'