1
0

10 Komitmen 0f50d90213 ... def9859dc4

Pembuat SHA1 Pesan Tanggal
  Lusticon def9859dc4 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 5 bulan lalu
  Lusticon 1172b3e0b7 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 5 bulan lalu
  Lusticon c2a1151292 [fixed] string vs integer 5 bulan lalu
  anjuna krokus aa4699a345 [fixed] Renamed the `i` variable to prevent further problems 5 bulan lalu
  anjuna krokus f62fae4f5f [fixed] Infinite loop in `rape_events`, fixed the missing image in the same event 5 bulan lalu
  Kevin_Smarts 11cfbfc0d6 [fixed] cls replaced by cla & *clr to stop add desc vanishing 5 bulan lalu
  Kevin_Smarts 3569f11538 Merge remote-tracking branch 'Anjuna/master' 5 bulan lalu
  Kevin_Smarts ae25092df2 Merge remote-tracking branch 'Lusticon/master' 5 bulan lalu
  anjuna krokus a1b5b338a2 [fixed] description window getting cleared during the lover phonecalls. Removed trailing spaces 5 bulan lalu
  Kevin_Smarts 172fb8463b [fixed] use of cls meant add desc was blank when chaning outfits 5 bulan lalu

+ 35 - 35
locations/Cheatmenu_din.qsrc

@@ -1,7 +1,7 @@
 # Cheatmenu_din
 if settingmode = 0: settingmode = 69
 menu_off = 1
-cls
+cla & *clr
 
 $cheatmenu['empty'] = {
 	!Yes, intentionally empty, do not remove it
@@ -23,7 +23,7 @@ $cheatmenu['music'] = {
 }
 
 $cheatmenu['setting'] = {
-	cls
+	cla & *clr
 	$cheatmenu['this_menu'] = 'setting'
 	$BACKIMAGE = ''
 	if $theme['name'] = 'Custom': gs 'themes', 'check_custom_vars' & gs 'themes', 'set_custom' & gs '$menu_obnovit'
@@ -79,7 +79,7 @@ $cheatmenu['quicktime'] = {
 	gs 'outdoors', 'weather'
 	gs 'stat'
 	gs 'fertility', 'cum_arrcheat'
-	cls
+	cla & *clr
 }
 
 $cheatmenu['dynamic'] = {
@@ -91,7 +91,7 @@ $cheatmenu['dynamic'] = {
 
 $cheatmenu['vartracker'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	act 'Return to cheat index': dynamic $cheatmenu['index']
 	'<center><h1>Cheat menu</h1></center>'
 	'<center>For testing purposes.<br>If reporting a bug only the lines in red are neccessary.</center>'
@@ -233,7 +233,7 @@ $cheatmenu['index'] = {
 	currhour = (daystart-1) * 24 + hour
 	currday = daystart
 	temp_week = week & temp_day = day & $temp_month = $month & temp_month = month & temp_year = year & temp_hour = hour & temp_minut = minut
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Index</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -363,7 +363,7 @@ $cheatmenu['slutshot'] = {
 
 $cheatmenu['permanent'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	$cheatmenu['this_menu'] = 'permanent'
 
@@ -444,7 +444,7 @@ $cheatmenu['therapist_reset'] = {
 }
 
 $cheatmenu['cycle'] = {
-	cls
+	cla & *clr
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -520,7 +520,7 @@ $cheatmenu['remove_preg'] = {
 
 $cheatmenu['state'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
 	'<center><h1>Cheat Menu - Character State Changes</h1></center>'
@@ -613,7 +613,7 @@ $cheatmenu['set_body_class'] = {
 }
 
 $cheatmenu['bodyMod'] = {
-	cls
+	cla & *clr
 	act 'Return to last menu': dynamic $cheatmenu['state']
 
 	'<center><h1>Cheat Menu - Body Modification</h1></center>'
@@ -776,7 +776,7 @@ $cheatmenu['looks'] = {
 		pcs_hgt = 200
 	end
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Character Appearance</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
@@ -1028,7 +1028,7 @@ if $ARGS[0] = 'assreduce':
 end
 
 if $ARGS[0] = 'vneshpara':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - ?</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1074,7 +1074,7 @@ if $ARGS[0] = 'vneshpara':
 end
 
 if $ARGS[0] = 'parameters':
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Appearance Stats</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1123,7 +1123,7 @@ end
 
 $cheatmenu['tatoo'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat Menu - Tattoos</h1></center>'
 	act 'Return to appearance menu':dynamic $cheatmenu['looks']
 	*nl
@@ -1247,7 +1247,7 @@ $cheatmenu['printStatLinksInverted'] = {
 
 $cheatmenu['stats'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
 	!Set a floor and ceiling for all attributes and skills
@@ -1380,7 +1380,7 @@ $cheatmenu['stats'] = {
 
 $cheatmenu['reputation'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Relationships and Renown</h1></center>'
 	'<center>Relationship values are from 0 - 100.</center>'
@@ -1684,7 +1684,7 @@ $cheatmenu['reputation'] = {
 
 $cheatmenu['documents'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Diplomas, Licences, and Certificates</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -1722,7 +1722,7 @@ $cheatmenu['input_time'] = {
 
 $cheatmenu['week'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1739,7 +1739,7 @@ $cheatmenu['week'] = {
 
 $cheatmenu['month'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
 	'Current time: <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
@@ -1809,7 +1809,7 @@ $cheatmenu['time'] = {
 		:femcycloop
 		if femcycloop > 0:gs 'femcyc' & femcycloop -= 1 & jump 'femcycloop'
 	end
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Manipulate Time and Weather</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats to manipulate time can <b>easily</b> break quests and cause bugs. Do not use them unless'
@@ -1983,7 +1983,7 @@ $cheatmenu['sucresetdo'] = {
 }
 
 $cheatmenu['succubreset'] = {
-	cls
+	cla & *clr
 	'Are you sure you want to reset your Succubus status? You will lose all levels, saved power, and succubus skill levels.'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''magic'']"><b>No, nevermind.</b></a>'
@@ -1993,7 +1993,7 @@ $cheatmenu['succubreset'] = {
 
 $cheatmenu['magic'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Magic</h1></center>'
 	'<center>Is magical: <a href="exec:pcs_magik += 1 & dynamic $cheatmenu[''magic'']">+1<<pcs_magik>></a></center>'
@@ -2047,7 +2047,7 @@ $cheatmenu['magic'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['display'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Display Setting</h1></center>'
 	*p '<center><table cellspacing="0" cellpadding="20" valign="top"><tr><td cellspacing="0" cellpadding="20" valign="top">'
@@ -2103,7 +2103,7 @@ $cheatmenu['display'] = {
 	if Enable_Android = 1:
 		'Set Fontsize for Status: Unsupported'
 		'Android Mode:Currently ON - <a href="exec:Enable_Android = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
-		! 'click <a href="exec:cls & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
+		! 'click <a href="exec:cla & *clr & FUNC (''$menu_obnovit'')">refresh</a> to refresh status window.'
 		'click <B>refresh</B> on top of status window to renew.'
 	else
 		'Android Mode: Currently OFF - <a href="exec:Enable_Android = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
@@ -2257,7 +2257,7 @@ $cheatmenu['theme_presets_copy'] = {
 }
 
 $cheatmenu['theme_export'] = {
-	cls
+	cla & *clr
 	act 'Return': dynamic $cheatmenu['theme_customize']
 	"$custom_theme['fname'] = '<<$custom_theme['fname']>>'"
 	"custom_theme['fsize'] = <<custom_theme['fsize']>>"
@@ -2423,7 +2423,7 @@ $cheatmenu['theme_customize'] = {
 
 $cheatmenu['status'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Status Window Settings</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2572,7 +2572,7 @@ $cheatmenu['status'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['theme'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	'<center><h1>Phone Theme Menu</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2661,7 +2661,7 @@ $cheatmenu['pain'] = {
 	if pain['clitoris'] < 0: pain['clitoris'] = 0
 	if pain['urethra'] < 0: pain['urethra'] = 0
 	if pain['cervix'] < 0: pain['cervix'] = 0
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Pain Management</h1></center>'
 	'<center><a href="exec:killvar ''pain'' & dynamic $cheatmenu[''pain'']">No pain</a></center>'
@@ -2740,7 +2740,7 @@ $cheatmenu['DNAC'] = {
 }
 
 $cheatmenu['DNA'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - DNA Generation</h1></center>'
 	'<center><table width="90%" cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -2925,7 +2925,7 @@ $cheatmenu['DNA'] = {
 !!----------------------------------------------------------------------------------------------------------------------------
 
 $cheatmenu['fame'] = {
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Fame</h1></center>'
 	$table['fame'] = '<center><table width="90%" cellspacing="0" cellpadding="5" valign="top" border="1">'
@@ -3074,7 +3074,7 @@ $cheatmenu['bdimcstaddpro'] = {
 }
 
 $cheatmenu['bdimcstadd'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Addition</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
 	*nl
@@ -3100,7 +3100,7 @@ $cheatmenu['bdimcstdesed'] = {
 
 $cheatmenu['bdimdisplay'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	'<center><h1>Cheat menu</h1></center>'
 	*nl
 	'<center><b>Body Image Set Display</b></center>'
@@ -3201,7 +3201,7 @@ $cheatmenu['bdimdisplay'] = {
 }
 
 $cheatmenu['bdimcstdel'] = {
-	cls
+	cla & *clr
 	'<center><b>Body Image Set Removal</b></center>'
 	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
 	*nl
@@ -3255,7 +3255,7 @@ $cheatmenu['bdimcstdel'] = {
 
 $cheatmenu['bdimmain'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -3330,7 +3330,7 @@ $cheatmenu['bdimmain'] = {
 
 $cheatmenu['about'] = {
 	gs 'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'settingtabs'
 	gs 'saveg'
 	gs 'addbuilddate'
@@ -3350,7 +3350,7 @@ $cheatmenu['about'] = {
 
 $cheatmenu['items'] = {
 	gs'stat'
-	cls
+	cla & *clr
 	gs 'obj_din', 'cheattabs'
 	'<center><h1>Cheat Menu - Items</h1></center>'
 

+ 5 - 10
locations/Cum_Manage.qsrc

@@ -713,20 +713,15 @@ if $ARGS[0] = 'cum_stat_display':
 			$icon_txtloc = $txtloc
 		elseif i = 11:
 			if pcs_haircol = 0:
-				$cum_face_image = 'brown/'
-				$cum_face_image += rand(1,31)
+				$cum_face_image = 'brown/<<rand(1,31)>>'
 			elseif pcs_haircol = 1:
-				$cum_face_image = 'black/'
-				$cum_face_image += rand(1,23)
+				$cum_face_image = 'black/<<rand(1,23)>>'
 			elseif pcs_haircol = 2:
-				$cum_face_image = 'red/'
-				$cum_face_image += rand(1,19)
+				$cum_face_image = 'red/<<rand(1,19)>>'
 			elseif pcs_haircol = 3:
-				$cum_face_image = 'blonde/'
-				$cum_face_image += rand(1,25)
+				$cum_face_image = 'blonde/<<rand(1,25)>>'
 			elseif pcs_haircol > 3:
-				$cum_face_image = 'custom/'
-				$cum_face_image += rand(1,20)
+				$cum_face_image = 'custom/<<rand(1,20)>>'
 			end
 			$txtloc_adj = 'across '
 			$icon_txtloc = 'your face'

+ 22 - 22
locations/city_experimental_trials_list.qsrc

@@ -138,78 +138,78 @@ if $ARGS[0] = $trial_sections[0]:
 		if temp_rand < 10:
 			$temp_pill_color = 'cyan'
 			$experimentQW['trial_active']     = 'pill_cyan'
-			$experimentQW['pill_cyan_taken'] += 1
-			 experimentQW['trial_duration']   = rand(1,3)
+			experimentQW['pill_cyan_taken'] += 1
+			experimentQW['trial_duration']   = rand(1,3)
 
 		!! Change stren, vital, or agil
 		elseif temp_rand < 20:
 			$temp_pill_color = 'red'
 			$experimentQW['trial_active']    = 'pill_red'
-			$experimentQW['pill_red_taken'] += 1
-			 experimentQW['trial_duration']  = rand(2,4)
+			experimentQW['pill_red_taken'] += 1
+			experimentQW['trial_duration']  = rand(2,4)
 
 		!! Change intel, cha, perception?
 		elseif temp_rand < 30:
 			$temp_pill_color = 'blue'
 			$experimentQW['trial_active']     = 'pill_blue'
-			$experimentQW['pill_blue_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			experimentQW['pill_blue_taken'] += 1
+			experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change skin
 		elseif temp_rand < 40:
 			$temp_pill_color = 'yellow'
 			$experimentQW['trial_active']       = 'pill_yellow'
-			$experimentQW['pill_yellow_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,5)
+			experimentQW['pill_yellow_taken'] += 1
+			experimentQW['trial_duration']     = rand(2,5)
 
 		!! Change butt
 		elseif temp_rand < 50:
 			$temp_pill_color = 'orange'
 			$experimentQW['trial_active']       = 'pill_orange'
-			$experimentQW['pill_orange_taken'] += 1
-			 experimentQW['trial_duration']     = rand(2,4)
+			experimentQW['pill_orange_taken'] += 1
+			experimentQW['trial_duration']     = rand(2,4)
 
 		!! Change inhib
 		elseif temp_rand < 60:
 			$temp_pill_color = 'violet'
 			$experimentQW['trial_active']       = 'pill_violet'
-			$experimentQW['pill_violet_taken'] += 1
-			 experimentQW['trial_duration']     = 1
+			experimentQW['pill_violet_taken'] += 1
+			experimentQW['trial_duration']     = 1
 
 		!! Change min_arousal
 		elseif temp_rand < 65:
 			$temp_pill_color = 'brown'
 			$experimentQW['trial_active']      = 'pill_brown'
-			$experimentQW['pill_brown_taken'] += 1
-			 experimentQW['trial_duration']    = rand(2,4)
+			experimentQW['pill_brown_taken'] += 1
+			experimentQW['trial_duration']    = rand(2,4)
 		
 		!! Change clit
 		elseif temp_rand < 70:
 			$temp_pill_color = 'purple'
 			$experimentQW['trial_active']     = 'pill_purple'
-			$experimentQW['pill_purple_taken'] += 1
-			 experimentQW['trial_duration']   = rand(2,4)
+			experimentQW['pill_purple_taken'] += 1
+			experimentQW['trial_duration']   = rand(2,4)
 
 		!! Change alko_status
 		elseif temp_rand < 80:
 			$temp_pill_color = 'green'
 			$experimentQW['trial_active']      = 'pill_green'
-			$experimentQW['pill_green_taken'] += 1
-			 experimentQW['trial_duration']    = 1
+			experimentQW['pill_green_taken'] += 1
+			experimentQW['trial_duration']    = 1
 
 		!! Give exhib level or change willwpower
 		elseif temp_rand < 85:
 			$temp_pill_color = 'gray'
 			$experimentQW['trial_active']     = 'pill_gray'
-			$experimentQW['pill_gray_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			experimentQW['pill_gray_taken'] += 1
+			experimentQW['trial_duration']   = 1
 
 		!! Give bimbo lvl or change willpower?
 		elseif temp_rand < 90:
 			$temp_pill_color = 'pink'
 			$experimentQW['trial_active']     = 'pill_pink'
-			$experimentQW['pill_pink_taken'] += 1
-			 experimentQW['trial_duration']   = 1
+			experimentQW['pill_pink_taken'] += 1
+			experimentQW['trial_duration']   = 1
 		end
 
 		experimentQW['times_participated_0'] += 1

+ 117 - 116
locations/npcgeneratec.qsrc

@@ -48,19 +48,20 @@ if mid($cemptyarray[0],1,1) = 'C':
 	killvar '$cemptyarray', 0
 else
 	:npcgencsanityloop
-	i = 0
+	ngc_scheck = 0
 	$npclastgenerated = 'C' + '<<carraynumber>>'
 	$npctemparrc = 'C' + '<<(carraynumber)-(1)>>'
 	if $npc_perstype[$npctemparrc] = '' and carraynumber > 0:
 		carraynumber -= 1
-		i = 1
+		ngc_scheck = 1
 	elseif $npc_perstype[$npclastgenerated] = '':
-		i = 0
+		ngc_scheck = 0
 	else
 		carraynumber += 1
-		i = 1
+		ngc_scheck = 1
 	end
-	if i = 1: jump 'npcgencsanityloop'
+	if ngc_scheck = 1: jump 'npcgencsanityloop'
+	killvar 'ngc_scheck'
 end
 carraynumber += 1
 
@@ -154,62 +155,62 @@ end
 if npc_dick[$npclastgenerated] < 9:
 	$npc_dick_class[$npclastgenerated] = 'short'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'tiny'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'short'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'chode'
-		
+
 	end
-	
+
 !! average length dicks
-elseif npc_dick[$npclastgenerated] < 15:	
+elseif npc_dick[$npclastgenerated] < 15:
 	$npc_dick_class[$npclastgenerated] = 'average'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'skinny'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'normal'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'thick'
-		
+
 	end
 !! long dicks
 elseif npc_dick[$npclastgenerated] < 20:
 	$npc_dick_class[$npclastgenerated] = 'big'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'long'
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'huge'
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'enormous'
-		
+
 	end
 !! extremely long dicks
 else
 	$npc_dick_class[$npclastgenerated] = 'extra_big'
 	if $npc_thdick[$npclastgenerated] = 'skinny' or $npc_thdick[$npclastgenerated] = 'slim':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'lengthy'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'well proportioned' or $npc_thdick[$npclastgenerated] = 'thicker than average':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'gigantic'
-		
+
 	elseif $npc_thdick[$npclastgenerated] = 'thick' or $npc_thdick[$npclastgenerated] = 'massive' or $npc_thdick[$npclastgenerated] = 'monstrous':
-	
+
 		$npc_dick_desc[$npclastgenerated] = 'monster'
 	end
 end
@@ -325,7 +326,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_residence[$npclastgenerated] = 'city_center'
 	end
 
-	
+
 	if npc_finance[$npclastgenerated] = 0:
 		if npc_residence[$npclastgenerated] ! 1 and npc_residence[$npclastgenerated] ! 4 and npctempgage < 22:
 			npc_student[$npclastgenerated] = rand(0,1)
@@ -340,20 +341,20 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		if rand(1,3) = 1:
 			npc_start_free_time[$npclastgenerated] = 8
 			npc_end_free_time[$npclastgenerated] = 12
-			
+
 			npc_work_start[$npclastgenerated] = 13
 			npc_work_end[$npclastgenerated] = 21
-			
+
 		elseif rand(1,2) = 1:
 			npc_start_free_time[$npclastgenerated] = 15
 			npc_end_free_time[$npclastgenerated] = 20
-			
+
 			npc_work_start[$npclastgenerated] = 6
 			npc_work_end[$npclastgenerated] = 14
 		else
 			npc_start_free_time[$npclastgenerated] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
@@ -361,33 +362,33 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_finance[$npclastgenerated] = 1:
 		npc_apt_type[$npclastgenerated] = rand(2,5)
 		npc_occupation[$npclastgenerated] = rand(7,15)
-		
+
 		if rand(1,2) = 1:
 			npc_start_free_time[$npclastgenerated] = 8
 			npc_end_free_time[$npclastgenerated] = 12
-			
+
 			npc_work_start[$npclastgenerated] = 13
 			npc_work_end[$npclastgenerated] = 21
 		else
 			npc_start_free_time[$npclastgenerated] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
-		
+
 		if npc_car[$npclastgenerated] = 0: npc_car[$npclastgenerated] = rand(-3,1)
 	elseif npc_finance[$npclastgenerated] = 2:
 		if rand(1,2) = 1:
 			npc_start_free_time[$npclastgenerated] = 8
 			npc_end_free_time[$npclastgenerated] = 12
-			
+
 			npc_work_start[$npclastgenerated] = 13
 			npc_work_end[$npclastgenerated] = 21
 		else
 			npc_start_free_time[$npclastgenerated] = 18
 			npc_end_free_time[$npclastgenerated] = 22
-			
+
 			npc_work_start[$npclastgenerated] = 9
 			npc_work_end[$npclastgenerated] = 17
 		end
@@ -397,13 +398,13 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(14,18)
 		npc_car[$npclastgenerated] = rand(0,1)
 	end
-	
+
 	!! failsafe until possibility of roommates is sorted out
 	if npc_apt_type[$npclastgenerated] = 4: npc_apt_type[$npclastgenerated] = 5
-	
+
 	npc_day_off[$npclastgenerated] = rand(1,7)
-	
-	
+
+
 !!	npc_style[$npclastgenerated] determines generally how they dress and what their "persona" is
 !!	Each style is limited by their financial status and occupation
 !!	e.g. You can''t have someone who dresses like a businessman but works as a line cook
@@ -419,10 +420,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	else
 		npc_style[$npclastgenerated] = (rand(2,6) mod 6) + 1
 	end
-	
+
 	if npc_apt_type[$npclastgenerated] = 6:
 		!! high rise
-		
+
 		!! this is to determine what their spare room is used for based on their personality type
 		if npc_style[$npclastgenerated] = 3:
 			npc_apt_spare[$npclastgenerated] = 1
@@ -441,11 +442,11 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
-		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'		
+		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 	elseif npc_apt_type[$npclastgenerated] = 4 or npc_apt_type[$npclastgenerated] = 5:
 		!! multi-bedroom
 		!! npc_apt_type[$npclastgenerated] = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
-		
+
 		!! this is to determine what their spare room is used for based on their personality type
 		if npc_style[$npclastgenerated] = 3:
 			npc_apt_spare[$npclastgenerated] = 1
@@ -459,7 +460,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		elseif npc_apt_spare[$npclastgenerated] = 2:
 			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
-		
+
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/kitchen.jpg"></center>'
@@ -492,39 +493,39 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 	end
-	
-	if npc_occupation[$npclastgenerated] = 1: 
+
+	if npc_occupation[$npclastgenerated] = 1:
 		$npc_occupation[$npclastgenerated] = 'cashier_supermarket'
-	elseif npc_occupation[$npclastgenerated] = 2: 
+	elseif npc_occupation[$npclastgenerated] = 2:
 		$npc_occupation[$npclastgenerated] = 'cashier_liquor'
-	elseif npc_occupation[$npclastgenerated] = 3: 
+	elseif npc_occupation[$npclastgenerated] = 3:
 		$npc_occupation[$npclastgenerated] = 'cashier_coffee'
-	elseif npc_occupation[$npclastgenerated] = 4: 
+	elseif npc_occupation[$npclastgenerated] = 4:
 		$npc_occupation[$npclastgenerated] = 'barista'
-	elseif npc_occupation[$npclastgenerated] = 5: 
+	elseif npc_occupation[$npclastgenerated] = 5:
 		$npc_occupation[$npclastgenerated] = 'fast_food'
-	elseif npc_occupation[$npclastgenerated] = 6: 
+	elseif npc_occupation[$npclastgenerated] = 6:
 		$npc_occupation[$npclastgenerated] = 'taxi_driver'
 		npc_car[$npclastgenerated] = 1
-	elseif npc_occupation[$npclastgenerated] = 7: 
+	elseif npc_occupation[$npclastgenerated] = 7:
 		$npc_occupation[$npclastgenerated] = 'masseuse'
-	elseif npc_occupation[$npclastgenerated] = 8: 
+	elseif npc_occupation[$npclastgenerated] = 8:
 		$npc_occupation[$npclastgenerated] = 'masseuse_sexual'
-	elseif npc_occupation[$npclastgenerated] = 9: 
+	elseif npc_occupation[$npclastgenerated] = 9:
 		$npc_occupation[$npclastgenerated] = 'factory'
-	elseif npc_occupation[$npclastgenerated] = 10: 
+	elseif npc_occupation[$npclastgenerated] = 10:
 		$npc_occupation[$npclastgenerated] = 'bartender'
-	elseif npc_occupation[$npclastgenerated] = 11: 
+	elseif npc_occupation[$npclastgenerated] = 11:
 		$npc_occupation[$npclastgenerated] = 'mechanic'
-	elseif npc_occupation[$npclastgenerated] = 12: 
+	elseif npc_occupation[$npclastgenerated] = 12:
 		$npc_occupation[$npclastgenerated] = 'line_cook'
-	elseif npc_occupation[$npclastgenerated] = 13: 
+	elseif npc_occupation[$npclastgenerated] = 13:
 		$npc_occupation[$npclastgenerated] = 'waiter'
-	elseif npc_occupation[$npclastgenerated] = 14: 
+	elseif npc_occupation[$npclastgenerated] = 14:
 		$npc_occupation[$npclastgenerated] = 'personal_trainer'
-	elseif npc_occupation[$npclastgenerated] = 15: 
+	elseif npc_occupation[$npclastgenerated] = 15:
 		$npc_occupation[$npclastgenerated] = 'programmer'
-	elseif npc_occupation[$npclastgenerated] = 16: 
+	elseif npc_occupation[$npclastgenerated] = 16:
 		npc_criminal[$npclastgenerated] = 1
 		!! npc_criminal_open determines whether or not they will hide their criminality from the player
 		npc_criminal_open[$npclastgenerated] = rand(0,1)
@@ -537,15 +538,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		else
 			$npc_occupation[$npclastgenerated] = 'thief'
 		end
-	elseif npc_occupation[$npclastgenerated] = 17: 
+	elseif npc_occupation[$npclastgenerated] = 17:
 		$npc_occupation[$npclastgenerated] = 'businessman'
-	elseif npc_occupation[$npclastgenerated] = 18: 
+	elseif npc_occupation[$npclastgenerated] = 18:
 		$npc_occupation[$npclastgenerated] = 'lawyer'
-	elseif npc_occupation[$npclastgenerated] = 19: 
+	elseif npc_occupation[$npclastgenerated] = 19:
 		$npc_occupation[$npclastgenerated] = 'investment_banker'
 	end
 
-	
+
 !! ------------------------- lifestyle and personality choices ----------------------------------
 
 
@@ -578,15 +579,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	if npc_door_pref[$npclastgenerated] = 1:
 		!! they like going out for things and doing things outside
 		$npc_door_pref[$npclastgenerated] = 'outdoor'
-	elseif npc_door_pref[$npclastgenerated] = 2: 
+	elseif npc_door_pref[$npclastgenerated] = 2:
 		!! they like more quiet activities and staying at home
 		$npc_door_pref[$npclastgenerated] = 'indoor'
 	end
-	
-	
+
+
 !!	npc_goal is what they want out of a relationship
-!!	1 = just sex 
-!!	2 = casual relationship 
+!!	1 = just sex
+!!	2 = casual relationship
 !!	3 = serious relationship
 	npc_goal[$npclastgenerated] = rand(1,3)
 	if npc_goal[$npclastgenerated] = 1:
@@ -626,7 +627,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 !!	if npc_lover_keys = 1: the player has keys to their apartment and can access it whenever they want
 	npc_lover_keys[$npclastgenerated] = 0
-	
+
 !!	quirk/trait generation
 	if rand(0,2) > 0:
 		if rand(0,1) = 1:
@@ -637,7 +638,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_earlyriser[$npclastgenerated] = 0
 		end
 	end
-	
+
 	if rand(0,2) > 0:
 		if rand(0,1) = 1:
 			npc_generous[$npclastgenerated] = 1
@@ -647,8 +648,8 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_generous[$npclastgenerated] = 0
 		end
 	end
-	
-	
+
+
 	!! npc_gentle = 1: npc is likely to have a soft emotional and physical touch outside of sex
 	!! npc_rough = 1: npc is likely to have a rough/aggressive emotional and physical touch outside of sex
 	if rand(0,2) > 0:
@@ -671,7 +672,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_risktaker[$npclastgenerated] = 0
 		end
 	end
-	
+
 	if rand(0,2) > 0:
 		if rand(1,3) + npc_diligent[$npclastgenerated] > 2:
 			npc_neat[$npclastgenerated] = 1
@@ -681,7 +682,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			npc_neat[$npclastgenerated] = 0
 		end
 	end
-	
+
 	npc_manscaped[$npclastgenerated] = rand(0,2) - npc_neat[$npclastgenerated]
 	if npc_manscaped[$npclastgenerated] < 1:
 		npc_manscaped[$npclastgenerated] = 0
@@ -691,42 +692,42 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_manscaped[$npclastgenerated] = 2:
 		$npc_pubes[$npclastgenerated] = 'bush'
 	end
-	
-	
+
+
 	!! if npc_argumentative = 1: they will get into more arguments with you about things
 	!! it is also harder to persuade them
 	npc_argumentative[$npclastgenerated] = rand(0,2)
-	
+
 	!! if npc_assertive = 1: they will know what they want
 	!! if npc_assertive = -1: they will often ask what the player wants
 	!! it is also harder to persuade them
 	npc_assertive[$npclastgenerated] = rand(-1,1)
-	
+
 	!! how easy or difficult it is to persuade them into doing something
 	npc_willpwr[$npclastgenerated] = rand(1,50)
 	npc_willpwr[$npclastgenerated] += npc_argumentative[$npclastgenerated] * 10
-	
+
 	!! if npc_arrogant = 1: they will act arrogantly
 	npc_arrogant[$npclastgenerated] = rand(-1,1)
-	
+
 	!! if npc_competitive = 1: they are overly competitive in contests against you or others
 	npc_competitive[$npclastgenerated] = rand(-1,1)
-	
-	
+
+
 	!! if npc_insecure = 1: they are insecure in their masculinity and won''t respond well to teasing
 	npc_insecure[$npclastgenerated] = rand(-1,1)
-	
+
 	!! if npc_gymrat = 1: they like working out
 	npc_gymrat[$npclastgenerated] = rand(-1,1)
-	
+
 	!! if npc_abusive = 1: the npc will be abusive
 	npc_abusive[$npclastgenerated] = rand(-3,1)
-	
-	
+
+
 	!! if npc_caretaker = 1: they will frequently show love through acts of service
 	!! example: making you breakfast in bed
 	if npc_selfish[$npclastgenerated] ! 1: npc_caretaker[$npclastgenerated] = rand(-3,1)
-	
+
 !! ------------------------- sex related preferences ----------------------------------
 
 	if rand(0,1) >= 1:
@@ -748,7 +749,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	end
 	if npc_condom_conscious[$npclastgenerated] < 0: npc_condom_conscious[$npclastgenerated] = 0
 	if npc_no_condoms[$npclastgenerated] < 0: npc_no_condoms[$npclastgenerated] = 0
-	
+
 	if rand(1,50) = 1:
 		npc_latex_allergy[$npclastgenerated] = 1
 		npc_no_condoms[$npclastgenerated] = 1
@@ -757,7 +758,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 !! Preferred sexual position
 	npc_fav_pos[$npclastgenerated] = rand(1,7)
-	
+
 	if npc_fav_pos[$npclastgenerated] = 1:
 		$npc_fav_pos[$npclastgenerated] = 'miss'
 	elseif npc_fav_pos[$npclastgenerated] = 2:
@@ -773,19 +774,19 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_fav_pos[$npclastgenerated] = 7:
 		$npc_fav_pos[$npclastgenerated] = 'anal'
 	end
-	
+
 	!! npc_sex_speed determines whether they like it slow, steady, or fast and will cause them to select that speed more frequently
 	!! 1 is slow, 2 is steady, 3 is fast/rough
 	npc_sex_speed[$npclastgenerated] = rand(1,3)
-	
-	
+
+
 	npc_sex_volume[$npclastgenerated] = rand(0,3)
 	!! npc_sex_volume refers to how much noise they make during sex
 	!! npc_sex_volume = 0: virtually quiet during sex
 	!! npc_sex_volume = 1: grunting noises only
 	!! npc_sex_volume = 2: will add dirty talk
 	!! npc_sex_volume = 3: loud "obnoxious" noises
-	
+
 	if npc_sex_speed[$npclastgenerated] = 1 and rand(1,3) = 1:
 		!! npc has a tendency to be overly gentle and cautious
 		npc_gentle_lover[$npclastgenerated] = 1
@@ -801,7 +802,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !! Preferred cumming location
 !!	0 = no preference
 	npc_cum_pref[$npclastgenerated] = rand(0,5)
-	
+
 	if npc_cum_pref[$npclastgenerated] = 1:
 		$npc_cum_pref[$npclastgenerated] = 'creampie'
 	elseif npc_cum_pref[$npclastgenerated] = 2:
@@ -813,14 +814,14 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	elseif npc_cum_pref[$npclastgenerated] = 5:
 		$npc_cum_pref[$npclastgenerated] = 'pullout'
 	end
-	
+
 	if rand(1,5) = 1:
 		npc_bukakke_fetish[$npclastgenerated] = 1
 	elseif rand(1,3) = 1 and npc_cum_pref[$npclastgenerated] ! 3:
 		npc_dislikes_facials[$npclastgenerated] = 1
 	end
-	
-	
+
+
 !!	npc_tit_pref determines an npcs preference for breast size
 !!	if npc_tit_pref = 0: they don''t care
 !!	if npc_tit_pref = 1: they like small tits (A or smaller)
@@ -828,14 +829,14 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	if npc_tit_pref = 3: they like busty girls (D to E)
 !!	if npc_tit_pref = 4: they like oversized breasts (F+)
 	npc_tit_pref[$npclastgenerated] = rand(0,4)
-	
+
 !!	npc_bush_pref determines an npcs preference for the player''s shaving habits
 !!	if npc_bush_pref = 0: they don''t care
 !!	if npc_bush_pref = 1: they prefer it cleanshaven
 !!	if npc_bush_pref = 2: they like it trimmed or cleanshaven
 !!	if npc_bush_pref = 3: they like it bushy
 	npc_bush_pref[$npclastgenerated] = rand(0,3)
-	
+
 !! $npc_fav_body_part
 	if rand(1,4) = 1:
 		$npc_fav_body_part[$npclastgenerated] = 'pussy'
@@ -846,7 +847,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 	else
 		$npc_fav_body_part[$npclastgenerated] = 'thighs'
 	end
-	
+
 
 	!! if npc_sexdrive determines how likely the npc will be to engage in sexual behavior and how many times they can orgasm in a single sexual encounter
 	if rand(1,10) <= 4:
@@ -862,10 +863,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_sexdrive[$npclastgenerated] = rand(1,10)
 		if npc_sexdrive[$npclastgenerated] > 5: npc_energetic[$boy] = rand(0,1)
 	end
-	
+
 	!! if npc_sex_stamina determines how long they can last in bed without cumming
 	npc_sex_stamina[$npclastgenerated] = rand(1,10)
-	
+
 !!{	if rand(1,10) <= 4:
 		npc_sex_stamina[$npclastgenerated] = rand(3,5)
 	elseif rand(1,10) <= 3:
@@ -881,26 +882,26 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 	!! npc_spanker determines whether or not they''re into spanking during sex
 	if rand(1,3) = 1: npc_sex_spanker[$npclastgenerated] = 1
-	
+
 	!! npc_childfree determines that they never want to have kids and will react poorly to pregnancy related topics
 	if rand(1,5) = 1: npc_childfree[$npclastgenerated] = 1
-	
+
 	!! if npc_pussyeater = 1: they have a fetish for eating pussy
 	!! if npc_pussyeater = -1: they refuse to eat pussy
 	if rand(1,3) = 1: npc_pussyeater[$npclastgenerated] = 1
-	
+
 	!! if npc_cuddler = 1: the npc likes to cuddle
 	if rand(1,3) = 1: npc_cuddler[$npclastgenerated] = 1
-	
+
 	!! if npc_cum_cannon = 1: the npc ejaculates particularly large loads
 	if rand(1,5) = 1: npc_cum_cannon[$npclastgenerated] = 1
-	
+
 	!! if npc_sex_filmer = 1: the npc likes to make sex videos
 	if rand(1,5) = 1: npc_sex_filmer[$npclastgenerated] = 1
-	
+
 	!! if npc_two_pump = 1: the npc will always cum immediately in the first penetration act of sex
 	if rand(1,6) = 1: npc_two_pump[$npclastgenerated] = 1
-	
+
 !! ------------------------- date preferences ----------------------------------
 	!! favorite kind of date
 	if $npc_door_pref[$npclastgenerated] = 'indoor' and rand(1,3) < 3:
@@ -950,7 +951,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 			$npc_fav_date[$npclastgenerated] = 'movie_date'
 		end
 	end
-	
+
 	!! npc_fav_genre determines what kind of media they like to consume
 	if rand(1,10) > 7:
 		$npc_fav_genre[$npclastgenerated] = 'action'

+ 9 - 9
locations/park_walkevents.qsrc

@@ -671,7 +671,7 @@ if $ARGS[0] = '6b':
 
 					act 'Stop resisting':
 						cla & *clr
- 
+
 						'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/event/rape/11.jpg"></center>'
 						'For every thrust he goes deeper into you and with a violent thrust he reaches your cervix and you squeal as he smirks. He continues thrusting and by now you don''t even know if you''re enjoying yourself or if you''re in pain.'
 						'You keep on screaming but to no avail, he''s pulled you deep into the woods and no one can hear your screams. Realizing this, you give up and let him have his way with you.'
@@ -932,14 +932,14 @@ if $ARGS[0] = 'run':
 							elseif temp['catcall'] = 3:
 								'"Wooooeee! That ass! I wanna take it home with me and make it mine!"'
 							end
-							
+
 							act'Ignore him':
 								cla & *clr
 								gs 'park_walkevents', 'running_image'
 								'You roll your eyes but otherwise ignore him, continuing to run until his hollering is nothing but a distant buzz behind you. And soon enough, there''s no hollering at all.'
 								act 'Finish your run': gt 'park_walkevents', 'run_end'
 							end
-							
+
 							act'Ignore him (annoyed)':
 								cla & *clr
 								temp['catcall'] = 4
@@ -949,7 +949,7 @@ if $ARGS[0] = 'run':
 								'Fuck! Who does he think he is? Are you just a piece of meat to him? Fuck that guy and fuck everybody like him!'
 								act 'Finish your run': gt 'park_walkevents', 'run_end'
 							end
-							
+
 							act'Walk up to him':
 								cla & *clr
 								!! IMAGE HERE
@@ -965,7 +965,7 @@ if $ARGS[0] = 'run':
 									'"You know I would baby! Just come back here and we''ll make it happen!" the guy shouts after you.'
 									act 'Finish your run': gt 'park_walkevents', 'run_end'
 								end
-								
+
 								act'Wanna fuck?':
 									cla & *nl
 									'"<<$pcs_nickname>>." you say flatly. "Nice to meet you. But really. You mean all that stuff you said? Cause if you''re serious, we could go back to your place and get it on. I could go for a good fuck right now."'
@@ -1023,13 +1023,13 @@ if $ARGS[0] = 'run':
 				elseif $daystage['desc'] = 'pre_dawn':
 					'It''s still dark out. Are you sure it''s such a good idea to go running so early in the morning?'
 				end
-				
+
 				act'Maybe not':
 					cla & *nl
 					'On second thought, maybe a young girl like yourself <i>shouldn''t</i> go running in the dark...'
 					act 'Continue': gt $loc, $loc_arg
 				end
-				
+
 				act'It''ll be fine':
 					!! if running late at night
 					*clr & cla
@@ -1051,7 +1051,7 @@ if $ARGS[0] = 'run':
 							!! not added yet because don''t have single rapist event written yet
 							$temp['rape_type'] = 'gang'
 							cla & *clr
-							'<center><img <<$set_imgh>> src="images/shared/misc/jumped.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/pc/activities/exercises/running/park_jogn1.jpg"></center>'
 							'About halfway through your run, you hear a branch snap to your left. You turn to see a shadow crouching in the bushes, but before you can react, arms grip you from behind and a dirty hand clamps over your mouth. Your eyes go wide with fear as several more shapes emerge from the darkness, moving towards you.'
 							*nl
 							'"Well well well, what do we have here?" a gravely voice says from behind you. "A tasty little treat for us to enjoy?"'
@@ -1329,7 +1329,7 @@ if $ARGS[0] = 'find_baby':
 				minut += 30
 				act 'Finish': gt 'city_clinic', 'start'
 			end
-			if pcs_mood < 20:				
+			if pcs_mood < 20:
 				act 'Call an ambulance and leave.':
 					*clr & cla
 					minut += 10

+ 65 - 62
locations/rape_events.qsrc

@@ -1,67 +1,69 @@
 # rape_events
 
 if $ARGS[0] = 'rapist_generate':
-	i = 0
+	re_i = 0
 	temp['rapist_age'] = rand(19,45)
 	:rape_gangbang_loop
-	gs 'npcgeneratec', 0, 'rapist', rand(temp['rapist_age'],(temp['rapist_age'] + 8))
-	$rapist[i] = $npclastgenerated
-	if i < 2 and $temp['rape_type'] = 'gang':
-		i += 1
+	gs 'npcgeneratec', 0, 'rapist', rand(temp['rapist_age'], (temp['rapist_age'] + 8))
+	$rapist[re_i] = $npclastgenerated
+	if re_i < 2 and $temp['rape_type'] = 'gang':
+		re_i += 1
 		jump 'rape_gangbang_loop'
 	end
+	killvar 're_i'
 end
 
 if $ARGS[0] = 'fight_init':
 	$temp['rape_loc'] = $loc
-	
+
 	gs 'fight', 'initFight'
-	i = 0
-	temp['rapist_age'] = rand(19,45)
+	re_i = 0
+	temp['rapist_age'] = rand(19, 45)
 	:rape_gang_fight_loop
-	gs 'npcgeneratec', 0, 'rapist', rand(temp['rapist_age'],(temp['rapist_age'] + 8))
-	$rapist[i] = $npclastgenerated
-	$opp_name[i] = 'Rapist <<i+1>>'
-	$opp_image[i] = '<img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg">'
-	opp_def[i] = rand(40,60)
-	opp_run[i] = rand(40,60)
-	opp_wrstlng[i] = rand(5,15)
-	opp_kick[i] = 0
-	opp_punch[i] = rand(40,60)
-	opp_jab[i] = rand(40,60)
-	opp_stren[i] = rand(70,90)
-	opp_agil[i] = rand(30,50)
-	opp_vital[i] = rand(40,60)
-	opp_react[i] = rand(30,50)
-	opp_health[i] = dyneval($calcNPCFightHealth)
-	opp_willpwr[i] = 100
-	
-	if i < 2 and $temp['rape_type'] = 'gang':
-		i += 1
+	gs 'npcgeneratec', 0, 'rapist', rand(temp['rapist_age'], (temp['rapist_age'] + 8))
+	$rapist[re_i] = $npclastgenerated
+	$opp_name[re_i] = 'Rapist <<re_i+1>>'
+	$opp_image[re_i] = '<img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg">'
+	opp_def[re_i] = rand(40, 60)
+	opp_run[re_i] = rand(40, 60)
+	opp_wrstlng[re_i] = rand(5, 15)
+	opp_kick[re_i] = 0
+	opp_punch[re_i] = rand(40, 60)
+	opp_jab[re_i] = rand(40, 60)
+	opp_stren[re_i] = rand(70, 90)
+	opp_agil[re_i] = rand(30, 50)
+	opp_vital[re_i] = rand(40, 60)
+	opp_react[re_i] = rand(30, 50)
+	opp_health[re_i] = dyneval($calcNPCFightHealth)
+	opp_willpwr[re_i] = 100
+
+	if re_i < 2 and $temp['rape_type'] = 'gang':
+		re_i += 1
 		jump 'rape_gang_fight_loop'
 	else
 		fightEnding = 23
 		gt 'fight', 'start'
 	end
+	killvar 're_i'
 end
 
 if $ARGS[0] = 'fight_win':
 	if $temp['rape_type'] = 'gang':
 		money += rand(1500,6000)
-		if $loc = 'pav_park' or $loc = 'city_park':
+		if $loc = 'pav_park' or $loc = 'city_park' or $loc = 'pushkin_parks':
 			'You defeat the rapists and empty their wallets as they lie unconscious in the dirt.'
 		else
 			'You defeat the rapists and empty their wallet as they lie unconscious on the street.'
 		end
 	else
 		money += rand(500,2000)
-		if $loc = 'pav_park' or $loc = 'city_park':
+		if $loc = 'pav_park' or $loc = 'city_park' or $loc = 'pushkin_parks':
 			'You defeat the rapists and empty their wallets as they lie unconscious on the street.'
 		else
 			'You defeat the rapist and empty his wallet as he lies unconscious on the street.'
 		end
 	end
-	
+
 	act 'Leave': gt $loc, $loc_arg
 end
 
@@ -71,7 +73,7 @@ if $ARGS[0] = 'urban_fight_rape':
 	else
 		temp['skip'] = 0
 	end
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 	'Try as you might, you just can''t win and you''re violently knocked to the ground, breath driven from your body as your back slams into the concrete. Your vision swims and you roll over onto your stomach, trying to get your hands and feet underneath you, simultaneously trying to crawl away.'
 	'"Fucking bitch! You''re going to pay for that!" A muted clinking rings in the alley and some part of your brain registers that it sounds like a belt buckle.'
@@ -113,8 +115,8 @@ if $ARGS[0] = 'urban_rape':
 		gs 'rape_events', 'urban_rape_struggle'
 		gs 'rape_events', 'urban_rape_limp'
 	end
-	
-	act 'Fight back': 
+
+	act 'Fight back':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 		'You hesitate a moment, relaxing your body, making him think you''re about to submit. Then without warning, you throw your head back, smashing it into your attacker''s forehead. He stumbles backward and you bring your hands up. You''re not going to go down on this guy without a fight!'
@@ -142,7 +144,7 @@ if $ARGS[0] = 'urban_rape_struggle':
 				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
 			end
 		end
-		
+
 		if rand(0,1) = 1:
 			!! vaginal rape
 			$temp['rape'] = 'vaginal'
@@ -342,7 +344,7 @@ if $ARGS[0] = 'urban_panties_after':
 				gs 'rape_events', 'urban_rape_end'
 			end
 		end
-		
+
 		act'Discard them':
 			gs 'panties', 'dispose'
 			cla & *nl
@@ -362,7 +364,7 @@ if $ARGS[0] = 'urban_panties_after':
 				end
 				gs 'rape_events', 'urban_repress_end'
 			else
-				
+
 				*nl
 				if PCloSkirt > 0:
 					if $temp['rape'] = 'vaginal':
@@ -382,7 +384,7 @@ if $ARGS[0] = 'urban_panties_after':
 				gs 'rape_events', 'urban_rape_end'
 			end
 		end
-	
+
 	end
 end
 
@@ -395,7 +397,7 @@ if $ARGS[0] = 'urban_rape_end':
 		'You''re tired. You''re sore. All you want is to go home and cry.'
 		act 'Leave': gt $loc, $loc_arg
 	end
-	
+
 	act'Go home (stoic)':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -406,7 +408,7 @@ if $ARGS[0] = 'urban_rape_end':
 		'But that doesn''t mean you need to remain a victim. You''re still alive. The rapist didn''t kill you. You''re not going to let yourself succumb after the fact.'
 		act 'Leave': gt $loc, $loc_arg
 	end
-	
+
 	gs 'rape_events', 'urban_police_after'
 end
 
@@ -419,7 +421,7 @@ if $ARGS[0] = 'urban_repress_end':
 		'You''re tired. You''re sore. All you want is to go home and put an end to this day.'
 		act 'Leave': gt $loc, $loc_arg
 	end
-	
+
 	act'Pretend nothing ever happened':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -446,7 +448,7 @@ if $ARGS[0] = 'urban_police_after':
 			end
 			act 'Continue': gt'rape_events', 'rape_report'
 		end
-		
+
 		act'Don''t go':
 			cla & *nl
 			'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
@@ -495,9 +497,9 @@ if $ARGS[0] = 'park_rape_fight_start':
 	'Try as you might, you just can''t win and you''re violently knocked to the ground, breath driven from your body as you''re slammed into the mud. Your vision swims and you roll over onto your stomach, struggling to crawl away.'
 	*nl
 	'"Fucking bitch! You''re going to pay for that!" A multitude of hands grab you and drag you back into the bushes.'
-	
+
 end
-	
+
 if $ARGS[0] = 'park_rape_struggle_start':
 	$temp['rape_type'] = 'gang'
 	gs 'rape_events', 'rapist_generate'
@@ -528,7 +530,7 @@ if $ARGS[0] = 'park_rape_solo':
 			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
 		end
 	end
-	
+
 	if rand(0,1) = 1:
 		!! vaginal rape
 		act'<i><b>MMMMMRRMMPH-!!!</b></i>':
@@ -574,7 +576,7 @@ if $ARGS[0] = 'park_rape_solo':
 						end
 						act 'Continue': gt'rape_events', 'rape_report'
 					end
-					
+
 					act'Don''t go':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -628,7 +630,7 @@ if $ARGS[0] = 'park_rape_solo':
 						end
 						act 'Continue': gt'rape_events', 'rape_report'
 					end
-					
+
 					act'Don''t go':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
@@ -644,16 +646,17 @@ if $ARGS[0] = 'park_rape_solo':
 end
 
 if $ARGS[0] = 'park_gangrape_start':
-!!	i = 0
+!!	re_i = 0
 !!	:rapist_generate_loop
 !!	temp['rapist_age'] = rand(19,45)
-!!	if i <= 3:
+!!	if re_i <= 3:
 !!		gs 'npcgeneratec', 0, 'rapist', rand(temp['rapist_age'],(temp['rapist_age'] + 8))
 !!		$rapist[i] = $npclastgenerated
-!!		i += 1
+!!		re_i += 1
 !!	end
 !!	jump 'rapist_generate_loop'
-	
+!!	killvar 're_i'
+
 	gs 'boyStat', $rapist[0]
 !!	'<center><img <<$set_imgh>> src="images/shared/sex/rape/gangrape1.jpg"></center>'
 	'<center><video autoplay loop src="images/shared/sex/rape/park_gangrape_undress1.mp4"></video></center>'
@@ -661,9 +664,9 @@ if $ARGS[0] = 'park_gangrape_start':
 	*nl
 	'You can''t escape.'
 	gs 'rape_events', 'park_gangrape_struggle1'
-	
+
 !!	act'Go limp':
-	
+
 !!	end
 end
 
@@ -803,7 +806,7 @@ if $ARGS[0] = 'park_gangrape_end1':
 		'Even as you try to scream, hot bitter sperm fills your mouth and your rapist jams his entire cock down your throat. Tears fill your eyes as you are forced to swallow or drown.'
 		gs 'rape_events', 'park_gangrape_end2'
 	end
-	
+
 	act'Pass out':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
@@ -831,7 +834,7 @@ if $ARGS[0] = 'park_gangrape_end2':
 		'You writhe on the ground, trembling as they walk away laughing, as casual as if they had just finished getting drunk at the cinema. By the time you manage to struggle to your knees, they''re already gone.'
 		gs 'rape_events', 'park_walkaway1'
 	end
-	
+
 	act'Pass out':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
@@ -861,7 +864,7 @@ if $ARGS[0] = 'park_wakeup':
 	act'Wake up':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_after_nude1.jpg"></center>'
-		
+
 		'Slowly, you come back to consciousness and your eyes creak open.'
 		*nl
 		'You''re laying naked in the mud. Your body aches and something leaks from your sore ass and pussy and your mouth has an odd taste in it.'
@@ -883,7 +886,7 @@ if $ARGS[0] = 'park_wakeup':
 end
 
 if $ARGS[0] = 'park_wakeup_morning':
-	
+
 end
 
 if $ARGS[0] = 'park_walkaway1':
@@ -900,11 +903,11 @@ if $ARGS[0] = 'park_walkaway1':
 		else
 			'Your outfit is in tatters, torn to shreds.'
 		end
-		
+
 		if $braworntype ! 'none':
 			'Your bra''s clasps have been ripped off, the cups badly ripped.'
 		end
-		
+
 		if $pantyworntype ! 'none':
 			'Your panties have been snapped, now nothing more than a randomly shaped string of fabric.'
 		end
@@ -919,7 +922,7 @@ if $ARGS[0] = 'park_walkaway2':
 		'Naked and with cum leaking from every orifice, you limp away, looking for the road...'
 		act 'Continue': gt $loc, $loc_arg
 	end
-	
+
 	act'Back to the road (stoic)':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
@@ -941,7 +944,7 @@ if $ARGS[0] = 'park_walkaway3':
 		'You don''t even bother trying to find your clothes. Instead you limp away, naked and with cum leaking from every orifice, looking for the road...'
 		act 'Continue': gt $loc, $loc_arg
 	end
-	
+
 	act'Back to the road (stoic)':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/rape/park_after_nude_walk1.mp4"></video></center>'
@@ -1014,7 +1017,7 @@ if $ARGS[0] = 'rape_report':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/locations/shared/police/pavrec.jpg"></center>'
 							'With that, you conclude the interview and are led to the front door.'
-							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
+							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.'
 							*nl
 							'Leaving you alone with your thoughts and memories of your rape...'
 							act 'Leave': gt'pav_market'
@@ -1096,7 +1099,7 @@ if $ARGS[0] = 'rape_report':
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
 							'Closing the bathroom door, you open the kit and you swab your insides, feeling humiliated and disgusted when it comes back covered in semen. Packaging it up, you re-open the door and hand the evidence to the officer.'
 							'With that, you conclude the interview and are led to the front door.'
-							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
+							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.'
 							*nl
 							'Leaving you alone with your thoughts and memories of your rape...'
 							act 'Leave': gt'city_center'

+ 11 - 0
locations/saveupdater.qsrc

@@ -3201,6 +3201,17 @@ end
 
 if temp_current_save_version < 00090301:
 !! use this for updates in 0.9.3
+	if val($experimentQW['pill_cyan_taken'])   > experimentQW['pill_cyan_taken']   : experimentQW['pill_cyan_taken']   = val($experimentQW['pill_cyan_taken'])
+	if val($experimentQW['pill_red_taken'])    > experimentQW['pill_red_taken']    : experimentQW['pill_red_taken']    = val($experimentQW['pill_red_taken'])
+	if val($experimentQW['pill_blue_taken'])   > experimentQW['pill_blue_taken']   : experimentQW['pill_blue_taken']   = val($experimentQW['pill_blue_taken'])
+	if val($experimentQW['pill_yellow_taken']) > experimentQW['pill_yellow_taken'] : experimentQW['pill_yellow_taken'] = val($experimentQW['pill_yellow_taken'])
+	if val($experimentQW['pill_orange_taken']) > experimentQW['pill_orange_taken'] : experimentQW['pill_orange_taken'] = val($experimentQW['pill_orange_taken'])
+	if val($experimentQW['pill_violet_taken']) > experimentQW['pill_violet_taken'] : experimentQW['pill_violet_taken'] = val($experimentQW['pill_violet_taken'])
+	if val($experimentQW['pill_brown_taken'])  > experimentQW['pill_brown_taken']  : experimentQW['pill_brown_taken']  = val($experimentQW['pill_brown_taken'])
+	if val($experimentQW['pill_purple_taken']) > experimentQW['pill_purple_taken'] : experimentQW['pill_purple_taken'] = val($experimentQW['pill_purple_taken'])
+	if val($experimentQW['pill_green_taken'])  > experimentQW['pill_green_taken']  : experimentQW['pill_green_taken']  = val($experimentQW['pill_green_taken'])
+	if val($experimentQW['pill_gray_taken'])   > experimentQW['pill_gray_taken']   : experimentQW['pill_gray_taken']   = val($experimentQW['pill_gray_taken'])
+	if val($experimentQW['pill_pink_taken'])   > experimentQW['pill_pink_taken']   : experimentQW['pill_pink_taken']   = val($experimentQW['pill_pink_taken'])
 end
 
 killvar 'temp_current_save_version'

+ 32 - 28
locations/telefon.qsrc

@@ -62,7 +62,11 @@ $telefon['footer'] = {
 !! ''''This is how we print the screen on to the Additional Dscription window
 $telefon['print'] = {
 	clr
-	pl func('cleanHTML',dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	if menu_off = 0:
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	else
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'])
+	end
 }
 
 !! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
@@ -340,7 +344,7 @@ if $ARGS[0] = 'IncomingCallChooser':
 	if i < 3 and hour > 5 and hour < 20:
 		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,100) > 95:
 			j = arrsize('$telefIncCall')
-			$telefIncCall[j] = "cls & gs 'telefon', 'lover', <<i>>"
+			$telefIncCall[j] = "gs 'telefon', 'lover', <<i>>"
 			$telefIncIcon[j] = 'images/characters/shared/headshots_generic/<<lover_picture[i]>>.jpg'
 			$telefIncName[j] = $loverdesc[i]
 		end
@@ -754,8 +758,8 @@ end
 !{
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
-	
-	To add an incoming message 
+
+	To add an incoming message
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	You can have up to 4 pictures attached to the message
@@ -780,19 +784,19 @@ end
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	SMSMessageRead[] = 0 unread, 1 read
 
-	Send Messages 
+	Send Messages
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendCode[] = Code to execute for Incoming call
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
-	$SMSSendDeleteId[] = id passed by the caller 
+	$SMSSendDeleteId[] = id passed by the caller
 }
 
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	
+
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
 
@@ -810,7 +814,7 @@ if $ARGS[0] = 'Phone_sms':
 		else
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-		end 
+		end
 
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
@@ -824,7 +828,7 @@ if $ARGS[0] = 'Phone_sms':
 	killvar 'i'
 end &! --- Phone_sms ---
 
-!{ 
+!{
 	New SMS Message
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
@@ -863,7 +867,7 @@ if $ARGS[0] = 'delete_sms':
 	telefon['SMSCount'] -= 1
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 		gs 'telefon','delete_sms','0','all'
-	end	
+	end
 	gs 'telefon', 'Phone_sms'
 end
 
@@ -883,7 +887,7 @@ if $ARGS[0] = 'show_sms':
 	else
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-	end 
+	end
 
 	!!If file extension is not given, .png is assumed
 	if instr($telefonCon['Icon'],'.') = 0:
@@ -924,9 +928,9 @@ if $ARGS[0] = 'show_sms':
 end
 
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
-!{	
+!{
 	SMS Row in messages table
-	ARGS[0] = message id 
+	ARGS[0] = message id
 	$ARGS[1] = NPC icon
 	$ARGS[2] = NPC Nickname
 	$ARGS[3] = Time received
@@ -969,12 +973,12 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0: 
+	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0:
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 !! Colour correction for editor ''''
-	
+
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	i=0
@@ -1256,7 +1260,7 @@ end &! --- phone_call_receive ---
 
 if $ARGS[0] = 'phone_balance':
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
-		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
@@ -1300,11 +1304,11 @@ if $ARGS[0] = 'phone_call_reject':
 end &! --- phone_call_reject ---
 
 if $ARGS[0] = 'Phone_megafon':
-	if subscription['monthly_calls'] = 1: 
-		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>' 
+	if subscription['monthly_calls'] = 1:
+		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>'
 	elseif subscription['metered_calls'] = 1:
-		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left' 
-	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left'
+	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
@@ -1669,13 +1673,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 end
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 
 	if svetrand = 0:$sveta = 'cutie'
@@ -1815,13 +1819,13 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 end
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 
 	if svetrand = 0:$sveta = 'cutie'

+ 8 - 8
locations/wardrobe.qsrc

@@ -595,19 +595,19 @@ if $ARGS[0] = 'default_entry_wear':
 
 	!! default school girl uniform is always allowed to be worn if still in school
 	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc
 	!! do not own this clothing anymore
 	elseif dyneval('RESULT = <<$temp1>>[<<temp2>>]') = 0 and temp2 ! 0:
-		cls
+		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your <<$def_clothing_name[default_entry]>> outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
 		act 'Return': gt 'wardrobe', $wloc
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$temp1>>_h[<<temp2>>]') <= 0 and $temp1 ! 'nude':
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your <<$def_clothing_name[default_entry]>> outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
 		act 'Strip out of worn out clothing':
@@ -639,7 +639,7 @@ if $ARGS[0] = 'default_entry_wear':
 		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"></video></center>'
 		'You don''t feel daring enough to wear your <<$def_clothing_name[default_entry]>> outfit. Maybe you will be confident enough in the future? Guess you will have to find something else to wear.'
 		act 'Strip out of revealing clothing':
@@ -653,7 +653,7 @@ if $ARGS[0] = 'default_entry_wear':
 		!! check for if the hipsize is too far from your hipsize
 		dynamic 'RESULT = <<$temp1>>_b[<<temp2>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
-			cls
+			cla & *clr
 			iif(RESULT < pcs_hips - 8,'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/dressup.mp4"></video></center>','<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,4)>>.mp4"></video></center>')
 			'As you put on your <<$def_clothing_name[default_entry]>> outfit you notice it doesn''t fit correctly anymore. It''s ' + iif(RESULT < pcs_hips - 8,'unbearably tight and uncomfortable to wear.','extremely loose and won''t stay in place no matter how hard you try.') + ' You must have ' + iif(RESULT < pcs_hips - 8,'gained','lost') + ' some weight since this was purchased or last tailored. You will have to get this clothing resized before you can wear it again.'
 			act 'Strip out of ill-fitting clothing':
@@ -664,14 +664,14 @@ if $ARGS[0] = 'default_entry_wear':
 			end
 		!! clothing ok to wear after passing hip check
 		else
-			cls
+			cla & *clr
 			'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
+			'You put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 			act 'Return': gt 'wardrobe', $wloc
 		end
 	!! clothing ok to wear without needing hip check and passing all other checks
 	else
-		cls
+		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return': gt 'wardrobe', $wloc