Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

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'

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

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'