7 次代碼提交 0f62737a9e ... d0f79c9a87

作者 SHA1 備註 提交日期
  Kevin_Smarts d0f79c9a87 [text edit] grammar and spelling mistakes etc reported by Rirene and fixed by nutluck 1 月之前
  Kevin_Smarts bc35ec721c Merge remote-tracking branch 'Anjuna/master' 1 月之前
  Kevin_Smarts 3a46302923 [fixed] spelling errors and grammer errors Alenstalker pointed out 1 月之前
  anjuna krokus 277284c7e8 [fixed] hotfix to `boygirl` 1 月之前
  anjuna krokus f68a28fefa [added] the option to use `gs 'boygirl', 'm', ...` and `gs 'boygirl', 'f', ..` as well 1 月之前
  anjuna krokus d5fd162748 [changed] `boy` and `girl` merged into a singular `boygirl` location for generating potential lovers. Removing a large amount of redudent overlap. Eventually `boygirl` will be merged into `npcgeneratec` 1 月之前
  anjuna krokus 5faeed67e1 [changed] extracted repeated code in the Give birth action from `city_clinic` and `pav_clinic` to `medical_din`. Updated the birth mass function to better model reality (lose half the weight on birth (#the-baby) and lose the rest over the next 6 to 10 weeks. Part of the weight is moved to the body instead 1 月之前

+ 24 - 25
glife.qproj

@@ -627,8 +627,8 @@
 		<Location name="fbDormD"/>
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
-        <Location name="pav_park_meet_event"/>
-        <Location name="pav_park_meet_kol_event"/>
+		<Location name="pav_park_meet_event"/>
+		<Location name="pav_park_meet_kol_event"/>
 	</Folder>
 	<Folder name="Employment Systems">
 		<Location name="emp_functions"/>
@@ -835,6 +835,7 @@
 		<Location name="podezdM"/>
 		<Location name="sexm"/>
 		<Location name="dateM"/>
+		<Location name="dateF"/>
 		<Location name="kinoM"/>
 		<Location name="parkM"/>
 		<Location name="kafeM"/>
@@ -845,6 +846,24 @@
 		<Location name="brosok"/>
 		<Location name="gossips"/>
 	</Folder>
+	<Folder name="Boys">
+		<Location name="BDman"/>
+		<Location name="BDsex"/>
+		<Location name="boyfrend"/>
+		<Location name="boylove"/>
+	</Folder>
+	<Folder name="Lover">
+		<Location name="boygirl"/>
+		<Location name="girlfriend"/>
+		<Location name="lover"/>
+		<Location name="lover_change"/>
+		<Location name="lover_likes"/>
+		<Location name="lover_love"/>
+		<Location name="lover_meet"/>
+		<Location name="lover_pref"/>
+		<Location name="lover_pronouns"/>
+		<Location name="pronouns"/>
+	</Folder>
 	<Folder name="Salon">
 		<Location name="salon"/>
 		<Location name="masseuse_work"/>
@@ -888,36 +907,16 @@
 		<Location name="pornhist"/>
 		<Location name="pornschedule"/>
 	</Folder>
-	<Folder name="Boys">
-		<Location name="BDman"/>
-		<Location name="BDsex"/>
-		<Location name="boy"/>
-		<Location name="boyfrend"/>
-		<Location name="boylove"/>
-	</Folder>
 	<Folder name="music">
 		<Location name="music_actions"/>
 		<Location name="music_bedroompractice"/>
 		<Location name="music_onlinemusic"/>
- 		<Location name="music_gigstarts"/>
-   		<Location name="music_guitarlesson"/>
-   		<Location name="music_buskingevents"/>
+		<Location name="music_gigstarts"/>
+		<Location name="music_guitarlesson"/>
+		<Location name="music_buskingevents"/>
 		<Location name="music_delparco"/>
 		<Location name="music_checks"/>
 	</Folder>
-	<Folder name="Lover">
-		<Location name="girl"/>
-		<Location name="girlfriend"/>
-		<Location name="dateF"/>
-		<Location name="lover"/>
-		<Location name="lover_change"/>
-		<Location name="lover_likes"/>
-		<Location name="lover_love"/>
-		<Location name="lover_meet"/>
-		<Location name="lover_pref"/>
-		<Location name="lover_pronouns"/>
-		<Location name="pronouns"/>
-	</Folder>
 	<Folder name="City Center">
 		<Location name="city_center"/>
 		<Location name="city_train"/>

+ 3 - 3
locations/Komp.qsrc

@@ -365,7 +365,7 @@ if $ARGS[0] = 'znak':
 		if pcs_lover < 3:
 			act 'Look for a kind man':
 				cla
-				gs 'boy'
+				gs 'boygirl', 0
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -375,7 +375,7 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a normal guy':
 				cla
-				gs 'boy'
+				gs 'boygirl', 0
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'
@@ -385,7 +385,7 @@ if $ARGS[0] = 'znak':
 
 			act 'Look for a strong man':
 				cla
-				gs 'boy'
+				gs 'boygirl', 0
 				gs 'boyfrend', 'start'
 				haraklover[lover_number] = 2
 				'You find a guy named <<$loverdesc[lover_number]>> and send him your number after checking out his profile. You hope he''ll call you!'

+ 0 - 1
locations/LakeBoyZ.qsrc

@@ -24,7 +24,6 @@ $gL_boy_z = {
 			act 'Give him your phone number':
 				*clr & cla
 				pcs_mood += 10
-				gs 'boy', 'details'
 				if rand(0,2) = 0: gs 'boyfrend','start'
 				minut += 5
 				bmFrend[Tboynum] = 1

+ 1 - 1
locations/Prostitute.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'work2':
 		*clr
 		gs 'npcgeneratec', 0, '"John"', rand(18,45)
 		gs 'boyStat', $npclastgenerated
-		!! gs 'boy', 'details'    & !! does not seem to be needed for "Johns"
+		!! gs 'boygirl', 'details'    & !! does not seem to be needed for "Johns"
 		guy += 1
 		if pcs_throat < dick: pcs_throat += 1
 

+ 1 - 3
locations/auditions_minor1.qsrc

@@ -3,9 +3,7 @@
 
 if $ARGS[0] = 'general_dialogue':
 	if audition['requirement'] = 0 or audition['requirement'] = '':audition['requirement'] = rand(40,70)
-	gs 'npcgeneratec', 0, 'A Male', rand(30,50)
-	gs 'boyStat', $npclastgenerated
-	gs 'boy', 'details'
+	gs 'boygirl', 0, 'A Male', rand(30,50)
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'You enter the room and see a man sitting at a desk with papers in front of him.'

+ 8 - 5
locations/body.qsrc

@@ -332,14 +332,17 @@ if $ARGS[0] = 'Update_Body':
 		if pregChem >= 800 and (pregChem - 800)*(pregChem - 800) >= bodyVars['pchem_next']:
 			pcs_mass['preg'] += 1
 			bodyVars['pchem_next'] += 1166400	& !! 1080 * 1080
-		elseif bodyVars['pchem_next'] > 0 and bodyVars['pchem_next'] - 1166400 >= (pregChem - 800) * (pregChem - 800):
+		elseif pcs_mass['preg'] > 0 and (recovH <= bodyVars['recovH'] and (pregChem < 800 or bodyVars['pchem_next'] - 1166400 >= (pregChem - 800)*(pregChem - 800))):
+			pcs_mass['preg'] -= 1
+			if rand(0, 1) = 0: pcs_mass['body'] += 1
 			if pcs_mass['preg'] > 0:
-				pcs_mass['preg'] -= 1
 				bodyVars['pchem_next'] -= 1166400	& !! 1080 * 1080
-			else
-				pcs_mass['preg'] = 0
-				bodyVars['pchem_next'] = 0
+				bodyVars['recovH_next'] = bodyVars['recovH_next'] * (pcs_mass['preg'] - 1) / pcs_mass['preg']
 			end
+		elseif pcs_mass['preg'] <= 0:
+			pcs_mass['preg'] = 0
+			bodyVars['pchem_next'] = 0
+			bodyVars['recovH_next'] = 0
 		end
 		if pregChem >= 800:
 			if fat > (12 + vitalbuf / 25):

+ 167 - 107
locations/boy.qsrc → locations/boygirl.qsrc

@@ -1,91 +1,133 @@
-# boy
+# boygirl
 
 !!'<<$boydesc>> <<$boybody>> <<$boybod>> <<$boyface>>. <<$boydesc>> <<$boyClo>>'
+
+!! For a boy:	gs 'boygirl', 0, 'A Male',  age, region
+!! For a girl:	gs 'boygirl', 1, 'A Woman', age, region
 if $ARGS[0] = '':
-	!randomly age
-	boyage = rand(18,35)
+	!! Random age
+	if ARGS[2] = 0: ARGS[2] = rand(18, 35)
+
+	!! Random Name
+	if $ARGS[1] = '':
+		if ARGS[2] <= 25:
+			$ARGS[1] = iif(ARGS[0] = 0, 'A Male', 'A Girl')
+		else
+			$ARGS[1] = iif(ARGS[0] = 0, 'A Male', 'A Woman')
+		end
+	end
+
+	!! Determine region
+	if ARGS[3] = 0:
+		if $region = 'pav':
+			ARGS[3] = 1
+		elseif $region = 'city':
+			ARGS[3] = rand(3, 4)
+		end
+	end
 
 	!! {The NPC generator is now the primary system of creating new characters.}
-	gs 'npcgeneratec', 0, 'A Male', boyage
+	gs 'npcgeneratec', ARGS[0], $ARGS[1], ARGS[2], ARGS[3]
 	gs 'boyStat', $npclastgenerated
-	gs 'boy', 'details'
+	gs 'boygirl', 'details'
+end
+
+if $ARGS[0] = 'boy' or $ARGS[0] = 'm':
+	gs 'boygirl', 0, $ARGS[1], ARGS[2], ARGS[3]
+elseif $ARGS[0] = 'girl' or $ARGS[0] = 'f':
+	gs 'boygirl', 1, $ARGS[1], ARGS[2], ARGS[3]
 end
 
 if $ARGS[0] = 'details':
 	!Select Photos
-
 	loverGenderTmp = npc_gender[$npclastgenerated]
 	silaVag = npc_sexskill[$npclastgenerated]
 	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
 	$boydesc = $npc_usedname[$npclastgenerated]
-
 	hairBoy = npc_haircol[$npclastgenerated]
 	titBoy = npc_bust[$npclastgenerated]
 	vneshBoy = npc_apprnc[$npclastgenerated]
-
 	!!appearance
-	gs 'boy', 'set_boybody'
+	gs 'boygirl', 'set_boybody'
 
 	!!Variables responsible for any features like
 	!!security, is responsible for the money and requirements
-	gs 'boy', 'set_finance'
-
-	gs 'boy', 'set_preferences'
-end
+	gs 'boygirl', 'set_finance'
 
-! set_unique_pic is depricated
-if $ARGS[0] = 'set_unique_pic':
-	!! boys 1-30, girlfriends 31-60
-	:boydetailsloop
-		lover_picrand[$npclastgenerated] =  rand(1, 30)
-	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'boydetailsloop'
+	gs 'boygirl', 'set_preferences'
 end
 
 
 if $ARGS[0] = 'set_boybody':
 	boybodyrand = rand(1, 3)
-
-	if boybodyrand = 1: 
-		$boybody = 'tall'
-		$boybody_pref = 'a tall'
-	elseif boybodyrand = 2: 
-		$boybody = 'average'
-		$boybody_pref = 'an average'
-	elseif boybodyrand = 3: 
+	if boybodyrand = 1:
 		$boybody = 'short'
 		$boybody_pref = 'a short'
+	elseif boybodyrand = 2:
+		$boybody = 'average'
+		$boybody_pref = 'an average'
+	else
+		$boybody = 'tall'
+		$boybody_pref = 'a tall'
 	end
 
 	boybodrand = rand(1, 4)
-
-	if boybodrand = 1: 
-		$boybod = 'thin'
-		$boybod_pref = 'a thin'
-	elseif boybodrand = 2: 
-		$boybod = 'athletic'
-		$boybod_pref = 'an athletic'
-	elseif boybodrand = 3: 
-		$boybod = 'chunky'
-		$boybod_pref = 'a chunky'
-	elseif boybodrand = 4: 
-		$boybod = 'fat'
-		$boybod_pref = 'a fat'
-	end
-	
 	boyfacerand = rand(1, 3)
-	if boyfacerand = 1: 
-		$boyface = 'black'
-	elseif boyfacerand = 2:
-		$boyface = 'brown'
-	else 
-		$boyface = 'blond'
+
+	if npc_gender[$npclastgenerated] = 0:
+		if boybodrand = 1:
+			$boybod = 'thin'
+			$boybod_pref = 'a thin'
+		elseif boybodrand = 2:
+			$boybod = 'athletic'
+			$boybod_pref = 'an athletic'
+		elseif boybodrand = 3:
+			$boybod = 'chunky'
+			$boybod_pref = 'a chunky'
+		else
+			$boybod = 'fat'
+			$boybod_pref = 'a fat'
+		end
+
+		if boyfacerand = 1: 
+			$boyface = 'black'
+		elseif boyfacerand = 2:
+			$boyface = 'brown'
+		else 
+			$boyface = 'blond'
+		end
+
+	else
+		if boybodrand = 1 and boybodyrand = 1:
+			$boybod = 'petite'
+			$boybod_pref = 'a petite'
+		elseif boybodrand = 1 and boybodyrand = 2:
+			$boybod = 'slender'
+			$boybod_pref = 'a slender'
+		elseif boybodrand = 2:
+			$boybod = 'toned'
+			$boybod_pref = 'a toned'
+		elseif boybodrand = 3:
+			$boybod = 'average'
+			$boybod_pref = 'an average'
+		else
+			$boybod = 'chubby'
+			$boybod_pref = 'a chubby'
+		end
+
+		if boyfacerand = 1: 
+			$boyface = 'black'
+		elseif boyfacerand = 2:
+			$boyface = 'brunette'
+		else 
+			$boyface = 'blond'
+		end
 	end
 end
 
 if $ARGS[0] = 'set_finance':
 	harakBoy = rand(0, 2)
 	finance = npc_finance[$npclastgenerated]
-
 	if npc_finance[$npclastgenerated] = 0:
 		!!Gopnik beggar or a hard worker
 		!!check in appearance Primary
@@ -109,7 +151,7 @@ if $ARGS[0] = 'set_finance':
 			npc_apprnc[$npclastgenerated] = rand(0, 32)
 		end
 
-		$boyClo = 'wearing jeans and a sweater.'
+		$boyClo = iif(npc_gender[$npclastgenerated] = 0, 'wearing jeans and a sweater.', 'wearing jeans and a blouse.')
 	elseif npc_finance[$npclastgenerated] = 2:
 		!!middle_peasant
 		!!check in appearance
@@ -121,67 +163,71 @@ if $ARGS[0] = 'set_finance':
 			npc_apprnc[$npclastgenerated] = rand(32, 40)
 		end
 
-		$boyClo = 'wearing an expensive suit.'
+		$boyClo = iif(npc_gender[$npclastgenerated] = 0, 'wearing an expensive suit.', 'wearing an expensive dress.')
 	end
 end
 
 
+
 if $ARGS[0] = 'set_preferences':
 	!!requirements of the figure, chest size, hair color.
 	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
 	figurBoy = rand(0, 2)
 
 	!character 0 - soft, 1 - norm,  2 - aggressor
-	if rand(0, 100) < 80:
+	temp_rand = rand(0, 100)
+	if temp_rand < 80:
+		izvrat = 0
+	elseif temp_rand < 90 and npc_gender[$npclastgenerated] = 1:
 		izvrat = 0
 	else
 		izvrat = 1
 	end
 
-	!! trying to make the preference section 
+	!! trying to make the preference section
 	!! Variables here are clotTypePrefTmp, clotQualPrefTmp, clotTopPrefTmp, bottShorPrefTmp, clotThinPrefTmp, bimbPrefTmp, pierPrefTmp, tattPrefTmp, lipsPrefTmp, bodyPrefTmp, makePrefTmp, IQPrefTmp.
 
-
 	!!This is for clothing type preference
 	!! If you notice how rare it is to get a preference that is intentional
 	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 	clotTypePrefTmp = 0
 	if rand(0, 4) = 4:
-		if npc_finance[$npclastgenerated] = 0:
-			clotTypePrefTmp = rand(1,2)
-			if rand(0, 1) = 1 and izvrat = 1: clotTypePrefTmp = 4
+		if izvrat = 1 and rand(0, 1 + npc_finance[$npclastgenerated] mod 2) = 0:
+			clotTypePrefTmp = 4
+		elseif npc_finance[$npclastgenerated] = 0:
+			clotTypePrefTmp = rand(1, 2)
 		elseif npc_finance[$npclastgenerated] = 1:
-			clotTypePrefTmp = rand(1,3)
-			if rand(0, 2) = 2 and izvrat = 1: clotTypePrefTmp = 4
+			clotTypePrefTmp = rand(1, 3)
 		elseif npc_finance[$npclastgenerated] = 2:
-			clotTypePrefTmp = rand(2,3)
-			if rand(0, 1) = 1 and izvrat = 1: clotTypePrefTmp = 4
+			clotTypePrefTmp = rand(2, 3)
 		end
 	end
 
 
+
 	!!This is for the quality of clothing
 	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 	clotQualPrefTmp = 0
-	if rand(0, 5) = 5:
+	if rand(0, 5) = 0:
 		if npc_finance[$npclastgenerated] = 0:
 			clotQualPrefTmp = 1
 		elseif npc_finance[$npclastgenerated] = 1:
 			clotQualPrefTmp = rand(1, 2)
-			randchan = rand(0, 1)
-			if randchan = 0 and clotTypePrefTmp ! 3:
+			temp_rand = rand(0, 1)
+			if temp_rand = 0 and clotTypePrefTmp ! 3:
 				clotQualPrefTmp = 1
-			elseif randchan = 1 and clotTypePrefTmp ! 1:
+			elseif temp_rand = 1 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
 			end
 		elseif npc_finance[$npclastgenerated] = 2:
-			randchan = rand(0, 2)
-			if randchan = 2 and clotTypePrefTmp ! 1:
+			temp_rand = rand(0, 2)
+			if temp_rand = 2 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
 			end
 		end
 	end
 
+
 	!!This is for the clothing top cut for the clothing
 
 
@@ -194,56 +240,59 @@ if $ARGS[0] = 'set_preferences':
 	!! It doesn''t matter if your poor or rich, everyone loves tits.
 
 	slutConstant = 0
-	if rand(0, 1) = 1 and izvrat = 1: slutConstant = 1
-
+	if izvrat = 1 and rand(0, 1 + npc_gender[$npclastgenerated]) = 0: slutConstant = 1
 
 	clotTopPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 2)
-		if randchan = 0 and clotTypePrefTmp ! 4:
+	if rand(0, 2) = 0:
+		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
+		if temp_rand < 2 and clotTypePrefTmp ! 4:
 			clotTopPrefTmp = 1 + slutConstant
-		elseif randchan = 1 and clotTypePrefTmp ! 4:
+		elseif temp_rand < 4 and clotTypePrefTmp ! 4:
 			clotTopPrefTmp = 2 + slutConstant
-		elseif randchan = 2 and clotTypePrefTmp ! 3:
+		elseif temp_rand >= 4 and clotTypePrefTmp ! 3:
 			clotTopPrefTmp = 3
 		end
-		if clotTopPrefTmp ! 0 and titnpc_bust[$npclastgenerated] = 2:
+
+		if clotTopPrefTmp ! 0 and npc_bust[$npclastgenerated] = 2:
 			if clotPref ! 3:
 				clotTopPrefTmp += 1
 			end
 		end
 	end
 
+
 	!! This is for pants and skirt shortness and will be grouped together as such.
 	!! 0 - no preference, 1 - 1 to 2 units or ankle to calf length, 2 - 3 to 4 units or knee to miniskirt, 3 - 5 units to 6 or slut to hoe.
 
 	bottShorPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 2)
-		if randchan = 0 and clotTypePrefTmp ! 4:
-			bottShorPrefTmp = 1 
-		elseif randchan = 1:
-			bottShorPrefTmp = 2 
-		elseif randchan = 2:
+	if rand(0, 2) = 0:
+		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
+		if temp_rand < 2 and clotTypePrefTmp ! 4:
+			bottShorPrefTmp = 1
+		elseif temp_rand < 4:
+			bottShorPrefTmp = 2
+		elseif temp_rand >= 4:
 			bottShorPrefTmp = 3
 		end
-		if slutConstant = 1 and rand(0, 1) = 1 and clotTypePrefTmp = 4:
+
+		if slutConstant = 1 and rand(0, 1) = 0 and clotTypePrefTmp = 4:
 			bottShorPrefTmp = 3
 		end
 	end
 
+
 	!! This is for clothes thinness.
 	!! 0 - no preference, 1 - 0 to 2 (Conservative), 2 - 3 to 4 (Moderate), 3 - 4 to 6 (really thin)
 	!! I see the moderate to really thin overlapping. Its intentional.
 
 	clotThinPrefTmp = 0
 	if rand(0, 2) = 2:
-		randchan = rand(0, 2)
-		if randchan = 0:
+		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
+		if temp_rand < 2:
 			clotThinPrefTmp = 1 + slutConstant
-		elseif randchan = 1:
+		elseif temp_rand < 4:
 			clotThinPrefTmp = 2 + slutConstant
-		elseif randchan = 2 and clotTypePrefTmp ! 3:
+		elseif temp_rand > 4 and clotTypePrefTmp ! 3:
 			clotThinPrefTmp = 3
 		end
 	end
@@ -253,19 +302,20 @@ if $ARGS[0] = 'set_preferences':
 	!! 0 - no preference, 1 - Prefers bimbo clothing.
 
 	bimbPrefTmp = 0
-	if rand(0, 2) = 2 and clotTypePrefTmp ! 3:bimbPrefTmp = 1
+	if rand(0, 2 + 8 * npc_gender[$npclastgenerated]) = 0 and clotTypePrefTmp ! 3: bimbPrefTmp = 1
+
 
 	!!This is to find out if they want you to wear piercings.
 	!! 0 - no preference, 1 - 0 to 2 piercings, 2 - 3 to 5 piercings, 3 - 6 or more piercings.
 
 	pierPrefTmp = 0
 	if rand(0, 3) = 3:
-		randchan = rand(0, 2)
-		if randchan = 0:
+		temp_rand = rand(0, 2)
+		if temp_rand = 0:
 			pierPrefTmp = 1 + slutConstant
-		elseif randchan = 1:
+		elseif temp_rand = 1:
 			pierPrefTmp = 2 + slutConstant
-		elseif randchan = 2:
+		elseif temp_rand = 2:
 			pierPrefTmp = 3
 		end
 	end
@@ -275,41 +325,44 @@ if $ARGS[0] = 'set_preferences':
 	!! 0 - no preference, 1 - 0 to 2 tattoos, 2 - 3 to 5 tattoos, 3 - 6 or more tattoos.
 
 	tattPrefTmp = 0
-	if rand(0, 3) = 3:tattPrefTmp =  rand(1, 3)
+	if rand(0, 3) = 0: tattPrefTmp = rand(1, 3)
+
 
 	!!This is to find out how big they want your lips.
 	!! 0 - no preference, 1 - 2 to 3 units (average) , 2 - 4 units (THIC lips)
 
 	lipsPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 2)
-		if randchan = 0:
+	if rand(0, 2 + npc_gender[$npclastgenerated]) = 0:
+		temp_rand = rand(0, 2)
+		if temp_rand = 0:
 			lipsPrefTmp = 1 + slutConstant
-		elseif randchan = 2:
+		elseif temp_rand = 2:
 			lipsPrefTmp = 2
 		end
 	end
 
+
 	!!This is to find out how big they want YOU.
 	!! 0 - no preference, 1 - 1 to 3 units (Skinny) , 2 - 3 to 6 units (Average), 3 - 6 + units (THIC)
 	!! Notice how this one overlaps. I believe that it should because changing ones weight is very hard.
 
 	bodyPrefTmp = 0
-	if rand(0, 3) = 3:bodyPrefTmp = rand(1, 3) 
+	if rand(0, 3) = 0: bodyPrefTmp = rand(1, 3)
+
 
 	!!This is to find out how much makeup they want you to wear.
 	!! 0 - no preference, 1 - 1 (light makeup) , 2 - 2 (moderate makeup), 3 - 3(heavy makeup)
 	!! Plan to make a way for you to set what you makeup you want to wear at your bedside and giving into his wishes would automatically change the automated setting.
 
 	makePrefTmp = 0
-	if rand(0, 1) = 1:
-		randchan = rand(0, 2)
-		if randchan = 0:
+	if rand(0, 1) = 0:
+		temp_rand = rand(0, 5) - npc_gender[$npclastgenerated]
+		if temp_rand < 2:
 			makePrefTmp = 1 + slutConstant 
-		elseif randchan = 1:
+		elseif temp_rand < 4:
 			makePrefTmp = 2 + slutConstant
-		elseif randchan = 2 and clotTypePrefTmp ! 3:
-			makePrefTmp = 3 
+		elseif temp_rand >= 4 and clotTypePrefTmp ! 3:
+			makePrefTmp = 3
 		end
 	end
 
@@ -318,11 +371,18 @@ if $ARGS[0] = 'set_preferences':
 	!!0 - no preference, 1 - 1 to 30 intelligence, 2 - 30 to 85 intelligence, 3 - 85 + intelligence. 
 
 	IQPrefTmp = 0
-	if rand(0, 4) = 4: IQPrefTmp = rand(1, 3)
+	if rand(0, 4) = 0:
+		if npc_gender[$npclastgenerated] = 0:
+			IQPrefTmp = rand(1, 3)
+		else
+			!! IQPrefTmp is capped at 3. With old code: rand(1, 2) + rand(1, 2) + rand(0,1) => 1/8 chance for 2 else 3 (or more)
+			IQPrefTmp = min(rand(2, 9), 3)
+		end
+	end
 
-	killvar 'randchan'
+	killvar 'temp_rand'
 end
 
 
---- boy ---------------------------------
+--- boygirl ---------------------------------
 

+ 1 - 44
locations/city_clinic.qsrc

@@ -116,50 +116,7 @@ if $ARGS[0] = 'start':
 
 	if preg = 2:
 		act 'Give birth':
-			*clr & cla
-			menu_off = 1
-			if kid > 0:minut += rand(300,660) else minut += rand(120,480)
-			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
-			'You lay on the bed and your feet are put in stirrups. Your contractions get closer and closer, and after some time and a lot of swearing, you finally give birth.'
-			:multikidloop
-				minut += rand(30,90)
-				sterilewb += 1
-				nextbaby = arrpos('$kidname', 'unborn')
-				kid += 1
-				BabyEmbryo -= 1
-				daykid[nextbaby] = day
-				monthkid[nextbaby] = month
-				yearkid[nextbaby] = year
-				if polkid[nextbaby] = 0:$polreb[nextbaby] = 'girl' & '"Congratulations, it''s a girl! What is her name?"'
-				if polkid[nextbaby] = 1:$polreb[nextbaby] = 'boy' & '"Congratulations, it''s a boy! What is his name?"'
-				
-				wait 350
-				$kidname[nextbaby] = input("Enter your <<$polreb[nextbaby]>>''s name")
-				'The doctors clean up <<$kidname[nextbaby]>>.'
-				if $kidname[nextbaby] = '':
-					if polkid[nextbaby] = 0:$kidname[nextbaby] = 'Masha'
-					if polkid[nextbaby] = 1:$kidname[nextbaby] = 'Misha'
-				end
-			if BabyEmbryo > 0: 'You do not have much time to look at your <<$polreb[nextbaby]>>, because you''re having another contraction. Your next baby is coming!' & jump 'multikidloop'
-			preg = 0
-			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
-			RecovH = rand(1175,1875)
-			pregbirthdate = daystart
-			thinkpreg = 0
-			knowpreg = 0
-			knowpregrecover = 1
-			vidage += 1
-			pregtalk = 0
-			pcs_pregtalk = 0
-			pregTalkFamily = 0
-			npc_pregtalk['A16'] = 0
-			npc_pregtalk['A34'] = 0
-			npc_pregtalk['A29'] = 0
-			pregchem = 0
-			cycle = 4
-			gs 'cum_cleanup', 'reset'
-			dynamic $d_cycreport_choice
-			gs 'stat'
+			gs 'medical_din', 'give_birth'
 			act 'Return to the entrance': gt 'city_clinic', 'start'
 		end
 	end

+ 1 - 1
locations/crossfit_north_girlmeet.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	menu_off = 1
 	!! generate a girlfriend
-	gs 'girl'
+	gs 'boygirl', 1
 	$boydesc = $previous_record_holder
 	$boyClo = 'wearing workout clothes'
 	killvar '$previous_record_holder'

+ 2 - 7
locations/dateF.qsrc

@@ -18,13 +18,8 @@ if $ARGS[0] = 'start':
 	$location_type = 'event_outdoors'
 	*clr & cla
 	!! generate a girl
-	if $region = 'pav':
-		gs 'npcgeneratec', 1, '', rand(18,45), 1
-	elseif $region = 'city':
-		gs 'npcgeneratec', 1, '', rand(18,45), rand(3,4)
-	end
-	gs 'boyStat', $npclastgenerated
-	gs 'girl', 'details'
+	gs 'boygirl', 1, '', rand(18, 35)
+
 
 	act 'Ignore her and hurry away':gt $loc, $loc_arg
 	!!1) Sveta in a school uniform

+ 1 - 7
locations/dateM.qsrc

@@ -17,13 +17,7 @@ if $ARGS[0] = 'start':
 	$location_type = 'event_outdoors'
 	*clr & cla
 	!! generate a boy
-	if $region = 'pav':
-		gs 'npcgeneratec', 0, '', rand(18,45), 1
-	elseif $region = 'city':
-		gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
-	end
-	gs 'boyStat', $npclastgenerated
-	gs 'boy', 'details'
+	gs 'boygirl', 0, '', rand(18, 35)
 
 	act 'Ignore him and hurry away':gt $loc, $loc_arg
 !!1) Sveta in a school uniform

+ 0 - 337
locations/girl.qsrc

@@ -1,337 +0,0 @@
-# girl
-
-!!'<<$girldesc>> <<$girlbody>> <<$girlbod>> <<$girlface>>. <<$girldesc>> <<$girlClo>>'
-if $ARGS[0] = '':
-	!randomly age
-	girlage = rand(18,35)
-
-	!! {The NPC generator is now the primary system of creating new characters.}
-	if girlage <= 25:
-		gs 'npcgeneratec', 1, 'A Girl', girlage
-	else
-		gs 'npcgeneratec', 1, 'A Woman', girlage
-	end
-	gs 'boyStat', $npclastgenerated
-	gs 'girl', 'details'
-end
-
-if $ARGS[0] = 'details':
-	!Select Photos
-
-	loverGenderTmp = npc_gender[$npclastgenerated]
-	silaVag = npc_sexskill[$npclastgenerated]
-	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
-	$boydesc = $npc_usedname[$npclastgenerated]
-
-	hairboy = npc_haircol[$npclastgenerated]
-	titboy = npc_bust[$npclastgenerated]
-	vneshboy = npc_apprnc[$npclastgenerated]
-
-	!!appearance
-	gs 'girl', 'set_boybody'
-
-	!!Variables responsible for any features like
-	!!security, is responsible for the money and requirements
-	gs 'girl', 'set_finance'
-
-	gs 'girl', 'set_preferences'
-end
-
-! set_unique_pic is depricated
-if $ARGS[0] = 'set_unique_pic':
-	!! boys 1-30, girlfriends 31-60
-	:girldetailsloop
-		lover_picrand[$npclastgenerated] =  rand(31,60)
-	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'girldetailsloop'
-end
-
-if $ARGS[0] = 'set_boybody':
-	boybodyrand = rand(1, 3)
-
-	if boybodyrand = 1: 
-		$boybody = 'short'
-		$boybody_pref = 'a short'
-	elseif boybodyrand = 2: 
-		$boybody = 'average'
-		$boybody_pref = 'an average'
-	elseif boybodyrand = 3: 
-		$boybody = 'tall'
-		$boybody_pref = 'a tall'
-	end
-
-	boybodrand = rand(1, 4)
-
-	if boybodrand = 1 and boybodyrand = 1: 
-		$boybod = 'petite'
-		$boybod_pref = 'a petite'
-	elseif boybodrand = 1 and boybodyrand = 2: 
-		$boybod = 'slender'
-		$boybod_pref = 'a slender'
-	elseif boybodrand = 2: 
-		$boybod = 'toned'
-		$boybod_pref = 'a toned'
-	elseif boybodrand = 3: 
-		$boybod = 'average'
-		$boybod_pref = 'an average'
-	else
-		$boybod = 'chubby'
-		$boybod_pref = 'a chubby'
-	end
-	
-	boyfacerand = rand(1, 3)
-	if boyfacerand = 1: 
-		$boyface = 'black'
-	elseif boyfacerand = 2:
-		$boyface = 'brunette'
-	else 
-		$boyface = 'blond'
-	end
-end
-
-if $ARGS[0] = 'set_finance':
-	harakBoy = rand(0, 2)
-	finance = npc_finance[$npclastgenerated]
-
-	if npc_finance[$npclastgenerated] = 0:
-		!!Gopnik beggar or a hard worker
-		!!check in appearance Primary
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(0, 8)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(0, 16)
-		else 
-			npc_apprnc[$npclastgenerated] = rand(0, 32)
-		end
-
-		$boyClo = 'wearing a tracksuit.'
-	elseif npc_finance[$npclastgenerated] = 1:
-		!!middle_peasant
-		!!check in appearance
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(0, 16)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(0, 24)
-		else
-			npc_apprnc[$npclastgenerated] = rand(0, 32)
-		end
-
-		$boyClo = 'wearing jeans and a blouse.'
-	elseif npc_finance[$npclastgenerated] = 2:
-		!!middle_peasant
-		!!check in appearance
-		if harakBoy = 0:
-			npc_apprnc[$npclastgenerated] = rand(16, 32)
-		elseif harakBoy = 1:
-			npc_apprnc[$npclastgenerated] = rand(24, 32)
-		else
-			npc_apprnc[$npclastgenerated] = rand(32, 40)
-		end
-
-		$boyClo = 'wearing an expensive dress.'
-	end
-end
-
-if $ARGS[0] = 'set_preferences':
-	!!requirements of the figure, chest size, hair color.
-	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
-	figurboy = rand(0, 2)
-
-
-	!!character 0 - soft, 1 -norm 2 - aggressor
-	if rand(0, 100) < 90:
-		izvrat = 0
-	else
-		izvrat = 1
-	end
-
-	!! trying to make the preference section 
-	!! Variables here are clotTypePrefTmp, clotQualPrefTmp, clotTopPrefTmp, bottShorPrefTmp, clotThinPrefTmp, bimbPrefTmp, pierPrefTmp, tattPrefTmp, lipsPrefTmp, bodyPrefTmp, makePrefTmp, IQPrefTmp.
-
-
-	!!This is for clothing type preference
-	!! If you notice how rare it is to get a preference that is intentional
-	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
-	clotTypePrefTmp = 0
-	if rand(0, 4) = 4:
-		if npc_finance[$npclastgenerated] = 0:
-			clotTypePrefTmp = rand(1,2)
-			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
-		elseif npc_finance[$npclastgenerated] = 1:
-			clotTypePrefTmp = rand(1,3)
-			if rand(0, 2) = 2 and izvrat = 1:clotTypePrefTmp = 4
-		elseif npc_finance[$npclastgenerated] = 2:
-			clotTypePrefTmp = rand(2,3)
-			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
-		end
-	end
-
-
-	!!This is for the quality of clothing
-	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
-	clotQualPrefTmp = 0
-	if rand(0, 5) = 5:
-		if npc_finance[$npclastgenerated] = 0:
-			clotQualPrefTmp = 1
-		elseif npc_finance[$npclastgenerated] = 1:
-			clotQualPrefTmp = rand(1, 2)
-			randchan = rand(0, 1)
-			if randchan = 0 and clotTypePrefTmp ! 3:
-				clotQualPrefTmp = 1
-			elseif randchan = 1 and clotTypePrefTmp ! 1:
-				clotQualPrefTmp = 2
-			end
-		elseif npc_finance[$npclastgenerated] = 2:
-			randchan = rand(0, 2)
-			if randchan = 2 and clotTypePrefTmp ! 1:
-				clotQualPrefTmp = 2
-			end
-		end
-	end
-
-	!!This is for the clothing top cut for the clothing
-
-
-	!!Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
-	!! 0 - no preference, 1 - 1 to 2 or neckline to moderate, 2 - 3 to 4 or heavy to severe, 3 - 5 to 7 or buldging to outpouring 
-	!! The breast size must be adjusted either when the action is being calculeted or we can base it on their ideal breast size :titboy + 0/3 depending on the players breast size
-
-
-	!!0 - no preference, 1 - 1 neckline , 2 - 2 or moderate, 3 - 3 to 4 or heavy to severe
-	!! It doesn''t matter if your poor or rich, everyone loves tits.
-
-	slutConstant = 0
-	if rand(0, 2) = 2 and izvrat = 1:slutConstant = 1
-
-
-	clotTopPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 5)
-		if randchan < 3 and clotTypePrefTmp ! 4:
-			clotTopPrefTmp = 1 + slutConstant
-		elseif randchan < 5 and clotTypePrefTmp ! 4:
-			clotTopPrefTmp = 2 + slutConstant
-		elseif randchan = 5 and clotTypePrefTmp ! 3:
-			clotTopPrefTmp = 3
-		end
-		if clotTopPrefTmp ! 0 and titboy = 2:
-			if clotPref ! 3:
-				clotTopPrefTmp += 1
-			end
-		end
-	end
-
-	!! This is for pants and skirt shortness and will be grouped together as such.
-	!! 0 - no preference, 1 - 1 to 2 units or ankle to calf length, 2 - 3 to 4 units or knee to miniskirt, 3 - 5 units to 6 or slut to hoe.
-
-	bottShorPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 5)
-		if randchan < 3 and clotTypePrefTmp ! 4:
-			bottShorPrefTmp = 1 
-		elseif randchan < 5:
-			bottShorPrefTmp = 2 
-		elseif randchan = 5:
-			bottShorPrefTmp = 3
-		end
-		randchan = rand(0, 1)
-		if slutConstant = 1 and randchan = 1 and clotTypePrefTmp = 4:
-			bottShorPrefTmp = 3
-		end
-	end
-
-	!! This is for clothes thinness.
-	!! 0 - no preference, 1 - 0 to 2 (Conservative), 2 - 3 to 4 (Moderate), 3 - 4 to 6 (really thin)
-	!! I see the moderate to really thin overlapping. Its intentional.
-
-	clotThinPrefTmp = 0
-	if rand(0, 2) = 2:
-		randchan = rand(0, 5)
-		if randchan < 3:
-			clotThinPrefTmp = 1 + slutConstant
-		elseif randchan < 5:
-			clotThinPrefTmp = 2 + slutConstant
-		elseif randchan = 5 and clotTypePrefTmp ! 3:
-			clotThinPrefTmp = 3
-		end
-	end
-
-
-	!!This is to find out if they want you to wear bimbo clothing
-	!! 0 - no preference, 1 - Prefers bimbo clothing.
-
-	bimbPrefTmp = 0
-	if rand(0, 10) = 0 and clotTypePrefTmp ! 3:bimbPrefTmp = 1
-
-	!!This is to find out if they want you to wear piercings.
-	!! 0 - no preference, 1 - 0 to 2 piercings, 2 - 3 to 5 piercings, 3 - 6 or more piercings.
-
-	pierPrefTmp = 0
-	if rand(0, 3) = 3:
-		randchan = rand(0, 2)
-		if randchan = 0:
-			pierPrefTmp = 1 + slutConstant
-		elseif randchan = 1:
-			pierPrefTmp = 2 + slutConstant
-		elseif randchan = 2:
-			pierPrefTmp = 3
-		end
-	end
-
-
-	!!This is to find out if they want you to have tattoos.
-	!! 0 - no preference, 1 - 0 to 2 tattoos, 2 - 3 to 5 tattoos, 3 - 6 or more tattoos.
-
-	tattPrefTmp = 0
-	if rand(0, 3) = 3:tattPrefTmp =  rand(1, 3)
-
-	!!This is to find out how big they want your lips.
-	!! 0 - no preference, 1 - 2 to 3 units (average) , 2 - 4 units (THIC lips)
-
-	lipsPrefTmp = 0
-	if rand(0, 3) = 3:
-		randchan = rand(0, 2)
-		if randchan = 0:
-			lipsPrefTmp = 1 + slutConstant
-		elseif randchan = 2:
-			lipsPrefTmp = 2
-		end
-	end
-
-	!!This is to find out how big they want YOU.
-	!! 0 - no preference, 1 - 1 to 3 units (Skinny) , 2 - 3 to 6 units (Average), 3 - 6 + units (THIC)
-	!! Notice how this one overlaps. I believe that it should because changing ones weight is very hard.
-
-	bodyPrefTmp = 0
-	if rand(0, 3) = 3:bodyPrefTmp = rand(1, 3) 
-
-	!!This is to find out how much makeup they want you to wear.
-	!! 0 - no preference, 1 - 1 (light makeup) , 2 - 2 (moderate makeup), 3 - 3(heavy makeup)
-	!! Plan to make a way for you to set what you makeup you want to wear at your bedside and giving into their wishes would automatically change the automated setting.
-
-	makePrefTmp = 0
-	if rand(0, 1) = 1:
-		randchan = rand(0, 5)
-		if randchan < 3:
-			makePrefTmp = 1 + slutConstant 
-		elseif randchan < 5:
-			makePrefTmp = 2 + slutConstant
-		elseif randchan = 5 and clotTypePrefTmp ! 3:
-			makePrefTmp = 3 
-		end
-	end
-
-
-	!! This is to see if they like a ditz, average, or a smartypants
-	!!0 - no preference, 1 - 1 to 30 intelligence, 2 - 30 to 85 intelligence, 3 - 85 + intelligence. 
-
-	IQPrefTmp = 0
-	!! IQPrefTmp is capped at 3. With old code: rand(1, 2) + rand(1, 2) + rand(0,1) => 1/8 chance for 2 else 3 (or more)
-	if rand(0, 4) = 4:IQPrefTmp = iif(rand(1,8) = 1, 2, 3)
-
-	killvar 'randchan'
-end
-
-
-
---- girl ---------------------------------
-

+ 1 - 1
locations/lug.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	if streetrand >= 60 and pcs_lover < 3:
 		vnerand = RAND(0,300)
 		if vnerand <= pcs_apprnc:
-			gs'boy'
+			gs'boygirl', 0
 			'<<$REPLACE($boybody_pref, "a", "A")>>, <<$boybod>>, <<$boyface>> haired guy comes up to you. He is wearing <<$boyClo>>'
 			'The guy introduces himself as <<$boydesc>> and asks for your telephone number.'
 

+ 69 - 0
locations/medical_din.qsrc

@@ -301,4 +301,73 @@ if $ARGS[0] = 'morning_after_pill':
 	end
 end
 
+if $ARGS[0] = 'give_birth':
+	*clr & cla
+	menu_off = 1
+	if kid > 0:
+		minut += rand(300,660)
+	else
+		minut += rand(120,480)
+	end
+
+	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
+	'You lay on the bed and your feet are put in stirrups. Your contractions get closer and closer, and after some time and a lot of swearing, you finally give birth.'
+
+	:multikidloop
+		minut += rand(30, 90)
+		sterilewb += 1
+		nextbaby = arrpos('$kidname', 'unborn')
+		kid += 1
+		BabyEmbryo -= 1
+		daykid[nextbaby] = day
+		monthkid[nextbaby] = month
+		yearkid[nextbaby] = year
+
+		if polkid[nextbaby] = 0:
+			$polreb[nextbaby] = 'girl'
+			'"Congratulations, it''s a girl! What is her name?"'
+		else
+			$polreb[nextbaby] = 'boy'
+			'"Congratulations, it''s a boy! What is his name?"'
+		end
+		wait 350
+		$kidname[nextbaby] = input("Enter your <<$polreb[nextbaby]>>''s name")
+		if $kidname[nextbaby] = '':
+			if polkid[nextbaby] = 0:
+				$kidname[nextbaby] = 'Masha'
+			else
+				$kidname[nextbaby] = 'Misha'
+			end
+		end
+
+		'The doctors clean up <<$kidname[nextbaby]>>.'
+
+	if BabyEmbryo > 0:
+		'You don''t have much time to look at your <<$polreb[nextbaby]>> because you''re having an another contraction. Your next baby is coming!'
+		jump 'multikidloop'
+	end
+
+	preg = 0
+	!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
+	RecovH = rand(1175, 1875)
+	pregbirthdate = daystart
+	thinkpreg = 0
+	knowpreg = 0
+	knowpregrecover = 1
+	vidage += 1
+	pregtalk = 0
+	pcs_pregtalk = 0
+	pregTalkFamily = 0
+	npc_pregtalk['A16'] = 0
+	npc_pregtalk['A34'] = 0
+	npc_pregtalk['A29'] = 0
+	pregchem = 0
+	pcs_mass['preg'] = pcs_mass['preg'] / 2
+	if pcs_mass['preg'] > 0: bodyVars['RecovH_next'] = (RecovH * (pcs_mass['preg']-1)) / pcs_mass['preg']
+	cycle = 4
+	gs 'cum_cleanup', 'reset'
+	dynamic $d_cycreport_choice
+	gs 'stat'
+end
+
 --- medical_din ---------------------------------

+ 46 - 14
locations/npcstatic6.qsrc

@@ -27,7 +27,6 @@ npc_haircol['A<<npctemp>>'] = 1
 
 
 
-
 npctemp = 251
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -51,7 +50,6 @@ npc_haircol['A<<npctemp>>'] = 1
 
 
 
-
 npctemp = 252
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -75,7 +73,6 @@ npc_haircol['A<<npctemp>>'] = 1
 
 
 
-
 npctemp = 253
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -98,7 +95,6 @@ npc_intel['A<<npctemp>>'] = 82
 
 
 
-
 npctemp = 254
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -127,7 +123,6 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 
 
-
 npctemp = 255
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -156,7 +151,6 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 
 
-
 npctemp = 256
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -186,7 +180,6 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 
 
-
 npctemp = 257
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -210,7 +203,6 @@ hotcat_rating['A<<npctemp>>'] = 7
 
 
 
-
 npctemp = 258
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -234,7 +226,6 @@ hotcat_rating['A<<npctemp>>'] = 6
 
 
 
-
 npctemp = 259
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -257,7 +248,6 @@ npc_intel['A<<npctemp>>'] = 20
 
 
 
-
 npctemp = 260
 !! Missing DNA & Last name
 $npc_dna['A<<npctemp>>'] = '0'
@@ -280,7 +270,6 @@ hotcat_rating['A<<npctemp>>'] = 7
 
 
 
-
 npctemp = 261
 !! Missing DNA & Last name
 $npc_dna['A<<npctemp>>'] = '0'
@@ -301,7 +290,6 @@ hotcat_rating['A<<npctemp>>'] = 8
 
 
 
-
 npctemp = 262
 !! Missing DNA
 $npc_dna['A<<npctemp>>'] = '0'
@@ -320,7 +308,6 @@ hotcat_rating['A<<npctemp>>'] = 7
 
 
 
-
 npctemp = 263
 $npc_dna['A<<npctemp>>'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
 $npc_firstname['A<<npctemp>>'] = 'Ksenya'
@@ -344,7 +331,6 @@ $npc_occupation['A<<npctemp>>'] = 'Exhibitionist Store Owner'
 
 
 
-
 npctemp = 264
 $npc_dna['A<<npctemp>>'] = '1290130369 1043654233 5049908515 3153411713 0721993774 2486220839 0288719745'
 $npc_firstname['A<<npctemp>>'] = 'Yakov'
@@ -532,6 +518,52 @@ gs 'npc_set_preference', 'reset', 'A<<npctemp>>'
 gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 
+
+npctemp = 272
+!! Missing DNA
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Rostislav'
+$npc_nickname['A<<npctemp>>'] = 'Rostislav'
+$npc_lastname['A<<npctemp>>'] = 'Popov'
+$npc_usedname['A<<npctemp>>'] = 'Rostislav'
+$npc_notes['A<<npctemp>>'] = 'Radomir''s father, he is a fit attractive man in his early forties. He has a attitude that women only exist to provide sexual pleasure to men and that no man should ever be tied to a single woman. He believe it is natural for men to cheat on their wives or girlfriends and has passed his view down to his two sons. He works at one of the factories in the city.'
+npc_dob['A<<npctemp>>'] = 19741225
+npc_gender['A<<npctemp>>'] = 0
+
+gs 'npcstaticdefaults', 'defaults'
+
+$npc_thdick['A<<npctemp>>'] = 'thicker than average'
+npc_dick['A<<npctemp>>'] = 18
+npc_sexskill['A<<npctemp>>'] = 2
+npc_intel['A<<npctemp>>'] = 65
+npc_spermpot['A<<npctemp>>'] = 11000
+hotcat_rating['A<<npctemp>>'] = 7
+npc_haircol['A<<npctemp>>'] = 1
+
+
+
+npctemp = 273
+!! Missing DNA
+$npc_dna['A<<npctemp>>'] = '0'
+$npc_firstname['A<<npctemp>>'] = 'Radislav'
+$npc_nickname['A<<npctemp>>'] = 'slava'
+$npc_lastname['A<<npctemp>>'] = 'Popov'
+$npc_usedname['A<<npctemp>>'] = 'Radislav'
+$npc_notes['A<<npctemp>>'] = 'Radomir''s older brother, he is a fit attractive young man in his early to mid twenties. When he attended Pavlovsk school he was the captain of the football team and the top athlete, he won several awards. Afterwards he went to the University where he screwed around and flunked out, after that he moved back home and got a job in the same factor as his father.'
+npc_dob['A<<npctemp>>'] = 19940303
+npc_gender['A<<npctemp>>'] = 0
+
+gs 'npcstaticdefaults', 'defaults'
+
+$npc_thdick['A<<npctemp>>'] = 'thicker than average'
+npc_dick['A<<npctemp>>'] = 22
+npc_sexskill['A<<npctemp>>'] = 2
+npc_intel['A<<npctemp>>'] = 45
+npc_spermpot['A<<npctemp>>'] = 11000
+hotcat_rating['A<<npctemp>>'] = 8
+npc_haircol['A<<npctemp>>'] = 1
+
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp
 

+ 2 - 7
locations/park_walkevents.qsrc

@@ -782,7 +782,7 @@ if $ARGS[0] = '8':
 
 	if pcs_lover < 3 and vnerand <= pcs_apprnc:
 		*clr & cla
-		gs 'boy'
+		gs 'boygirl', 0
 		'A guy with <<$boybody_pref>>, <<$boybod>> body and <<$boyface>> hair approaches you. He''s wearing <<$boyClo>>.'
 		'The guy introduces himself as <<$boydesc>> and asks for your number.'
 
@@ -921,12 +921,7 @@ if $ARGS[0] = 'run':
 						'About halfway through your run, you hear a whistle pierce the air.'
 						act'Turn':
 							cla & *clr
-							if $region = 'city':
-								gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
-							elseif $region = 'pav':
-								gs 'npcgeneratec', 0, '', rand(18,45), 1
-							end
-							gs 'boy', 'details'
+							gs 'boygirl', 0, '', rand(18, 45)
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/<<lover_picrand[$boy]>>.jpg"></center>'
 							temp['catcall'] = rand(1,3)
 							'Turning your head instinctively at the sound, you see a guy lowering his fingers from his mouth, a wide grin on his face.'

+ 2 - 45
locations/pav_clinic.qsrc

@@ -22,51 +22,8 @@ if $ARGS[0] = '':
 
 	if preg = 2:
 		act 'Give birth':
-			*clr & cla
-			menu_off = 1
-			if kid > 0: minut += rand(300,660) else minut += rand(120,480)
-			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/birthing.jpg"></center>'
-			'You lay on the bed and your feet are put in stirrups. Your contractions get closer and closer, and after some time and a lot of swearing, you finally give birth.'
-			:multikidloop
-				minut += rand(30,90)
-				sterilewb += 1
-				nextbaby = arrpos('$kidname', 'unborn')
-				kid += 1
-				BabyEmbryo -= 1
-				daykid[nextbaby] = day
-				monthkid[nextbaby] = month
-				yearkid[nextbaby] = year
-				if polkid[nextbaby] = 0:$polreb[nextbaby] = 'girl' & '"Congratulations, it''s a girl! What is her name?"'
-				if polkid[nextbaby] = 1:$polreb[nextbaby] = 'boy' & '"Congratulations, it''s a boy! What is his name?"'
-
-				wait 350
-				$kidname[nextbaby] = input("Enter your <<$polreb[nextbaby]>>''s name")
-				'The doctors clean up <<$kidname[nextbaby]>>.'
-				if $kidname[nextbaby] = '':
-					if polkid[nextbaby] = 0:$kidname[nextbaby] = 'Masha'
-					if polkid[nextbaby] = 1:$kidname[nextbaby] = 'Misha'
-				end
-			if BabyEmbryo > 0: 'You don''t have much time to look at your <<$polreb[nextbaby]>> because you''re having an another contraction. Your next baby is coming!' & jump 'multikidloop'
-			preg = 0
-			!! RecovH has a decay of 1.1/hour or ~ 27/day, the recovery period is ~6-10 weeks
-			RecovH = rand(1175,1875)
-			pregbirthdate = daystart
-			thinkpreg = 0
-			knowpreg = 0
-			knowpregrecover = 1
-			vidage += 1
-			pregtalk = 0
-			pcs_pregtalk = 0
-			pregTalkFamily = 0
-			npc_pregtalk['A16'] = 0
-			npc_pregtalk['A34'] = 0
-			npc_pregtalk['A29'] = 0
-			pregchem = 0
-			cycle = 4
-			gs 'cum_cleanup', 'reset'
-			dynamic $d_cycreport_choice
-			gs 'stat'
-			act 'Leave':gt $curloc
+			gs 'medical_din', 'give_birth'
+			act 'Leave': gt 'pav_clinic'
 		end
 	end
 

+ 2 - 4
locations/pav_disco_sex.qsrc

@@ -47,9 +47,8 @@ if $ARGS[0] = 'outside':
 							*clr & cla
 							pcs_mood += 10
 							minut += 30
-							gs 'boy', 'details'
+							gs 'boygirl', 0
 							bmFrend[Tboynum] = 1
-							gs 'boy'
 							gs 'boyfrend', 'start'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
@@ -196,10 +195,9 @@ if $ARGS[0] = 'outside':
 						act 'Give him your number':
 							*clr & cla
 							pcs_mood += 10
-							gs 'boy', 'details'
+							gs 'boygirl', 0
 							minut += 30
 							bmFrend[Tboynum] = 1
-							gs 'boy'
 							gs 'boyfrend', 'start'
 							gs 'stat'
 							'You smile and give him your number, which he diligently adds to his phone.'

+ 1 - 3
locations/pav_lake.qsrc

@@ -460,9 +460,7 @@ if $ARGS[0] = 'sunbathe':
 		elseif tipelakeboyrand <= 80:
 			i = age - 5
 			if i < 16: i = 16
-			gs 'npcgeneratec', 0, 'Guy', rand((i),(age + 5))
-			gs 'boyStat', $npclastgenerated
-			$boydesc = $npc_firstname[$npclastgenerated]
+			gs 'boygirl', 0, 'Guy', rand(max(16, age-5), age + 5)
 			gs'LakeBoyZ'
 			'A rather cute looking guy sits down next to you as you sunbathe.'
 			'"Hey there beautiful, I''m <<$boydesc>>. What''s your name?" he asks in an attempt to chat you up.'

+ 38 - 28
locations/praiders_garage_chat.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'chat_radomir':
 				'Your eyes widen.  "No, I don''t believe you. I saw her flirting with a guy the other day."'
 				'"Well listen here then <<$pcs_nickname>>. I have a lot of proof that she''s a lesbian. One, and the biggest one, she turned me down. Two, she hangs with Anushka all the time and I''ve seen her throwing looks at her, not to mention how they act together. Last but not least, I''ve heard that her mother was one of the biggest muff divers back in the days, that old whore."'
 				'"Look, she might be into girls, but I am pretty sure she''s into guys as well..." you reply while crossing your arms.'
-				'"Listen to me <<$pcs_nickname>>, just watch her and you''ll notice it... She''s a dyke." He gets up and walks over to grab a beer.'
+				'"Listen to me <<$pcs_nickname>>, just watch her and you''ll notice it... She''s a dyke." He gets up and walks over to grab a beer before coming back to sit down again.'
 				act 'Ask him some questions': gt 'praiders_garage_chat', 'chat_radomir1'
 			end
 		elseif gopnikbandQW['radob'] = 2 and gopnikbandQW['lena_lara_present'] = 1:
@@ -60,7 +60,8 @@ if $ARGS[0] = 'chat_radomir':
 				if NikoVolkovQW >= 5 and gopnikbandQW['niko_present'] = 1:
 					'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-					'Interested in his advances, you decide to return his flirting, turning to face him, before placing your hand on his thigh. "Pretty huh? So you''re interested in me?" Radomir replies, "I might be. You know, you remind me of a girl we had back at our last concert. She was a pretty girl, that really knew how to follow instructions, and was very obedient. She was very smart, and I believe that you''re smart too. Maybe we can spend a little time together after the show. You are far hotter than the other girls."'
+					'Interested in his advances, you decide to return his flirting, turning to face him, before placing your hand on his thigh. "Pretty huh? So you''re interested in me?"'
+					'Radomir replies, "I might be. You know, you remind me of a girl we had back at our last concert. She was a pretty girl, that really knew how to follow instructions, and was very obedient. She was very smart, and I believe that you''re smart too. Maybe we can spend a little time together after the show. You are far hotter than the other girls."'
 					*nl
 					'He reaches up to run his hand through your hair. "I just love your hair." He says, as his firm touch, leaves your body feeling hot, which is only heightened by his compliments, and the attention he is giving you. He then leans in close, as you can feel the heat of his breath across your neck. "Damn, you''re fine." he says, as you feel his hand sliding up your thigh.'
 					'The sensuous moment is then interrupted by Niko wrapping his arm around your shoulder, before dropping down between you & Radomir, as he says, "Hey <<$pcs_nickname>>, you wouldn''t be drinking without me, would you?" You look back at Niko, before replying, "Oh, I was just chatting about the band. It''s good to see you." Niko leans in closer, before giving you a kiss on your lips, making sure to let Radomir see, as he pulls you up off the chair, guiding you away from Radomir, and out of the garage.'
@@ -185,6 +186,7 @@ if $ARGS[0] = 'chat_radomir1':
 		'He lifts his chin and looks off, you turn your head to follow his gaze and you see Valentin and Anushka standing around the cooler while talking and laughing about something. "He is always taking her side, or telling me I should leave her alone." He says with a snort. "He just doesn''t get it, Nush and I have something special, a unbreakable bond, she will always be my little fuck buddy, because she loves me, she can''t help it." He says as he leans back looking all proud of himself, he seems to really believe what he is saying. "He only takes her side because he wants to impress her, man I get it. Nush is a fine piece of ass."'
 		act 'Valentin has the hots for Anushka?':
 			*clr & cla
+			valentin['love_nush'] = 1
 			minut += 5
 			gs 'stat'
 			'<center><img src="images/characters/shared/headshots_main/big154.jpg"></center>'
@@ -254,7 +256,7 @@ if $ARGS[0] = 'chat_radomir1':
 				gs 'stat'
 				'<center><img src="images/characters/shared/headshots_main/big154.jpg"></center>'
 				'"I heard you guys used to date. When did all of this happen?" you curiously ask.'
-				'"A few years ago. She used to run around when we started the band and before long I had her wrapped around my finger and we hooked up. She fell head over heels for me." He starts grinning. "She''s still in love with me, but she became too clingy, so I had to dump her ass. Besides, it''s better for the band if the two hottest members are single."'
+				'"A few years ago. She used to come around when we started the band and before long I had her wrapped around my finger and we hooked up. She fell head over heels for me." He starts grinning. "She''s still in love with me, but she became too clingy, so I had to dump her ass. Besides, it''s better for the band if the two hottest members are single."'
 				'You gasp. "How could you treat her like that? I feel bad for her..."'
 				'He shakes his head. "Why would you feel bad for her? She still gets a good fucking now and again and it''s great for the band."'
 				act 'Is that so?':
@@ -265,6 +267,7 @@ if $ARGS[0] = 'chat_radomir1':
 					'He looks around to make sure nobody can overhear what''s being said. "She''s well aware of the rules. We''re still fuck buddies and I keep her on a short leash because I can use her whenever I want."'
 					'"You''re terrible, Rad." you say dismissively.'
 					'"Hey, it''s the best for the band. How would it look if the two hottest band members were together?! Listen, to be able to promote our band the best we let her shine. She''s hot, single and quite the slut, so of course we''re going to use that." His eyes remain locked on you.'
+					*nl
 					'"Well... I..." You''re not sure what to say.'
 					'"What?" He gives you a slightly confused stare, wondering why you''re hesitating. "I give her a good fucking more than any other bitch, so what more could she want? Sure she complains that I''m too rough sometimes, but like all bitches she loves it. Why else would she keep coming back for more?" he asks, seeming to actually believe what he''s saying. He then gets up and walks over to grab a beer.'
 					act 'Hang out': gt 'praiders_garage', $hangout_rand
@@ -337,7 +340,7 @@ if $ARGS[0] = 'chat_anushka':
 		'Your conversation with Anushka starts winding down and you seem to be running out of small talk. Now seems like a good time to ask her about something specific.'
 		act 'Ask her some questions': gt 'praiders_garage_chat', 'chat_anushka1'
 	elseif gopnikbandQW['nushob'] = 4:
-		'"Looks like we''re going to be getting new flyers and posters to put up around town!" Anushka gushes excitedly. She''s full of energy as you listen to her describe the new design.'
+		'"Looks like we''re going to be getting new fliers and posters to put up around town!" Anushka gushes excitedly. She''s full of energy as you listen to her describe the new design.'
 		'"So who''s making these things? No offense, but I can''t see you or Radomir making something so cool. Maybe if it was just a picture of some tits with the band name printed on it... " you tease and she playfully smacks you on the thigh.'
 		'"Lucky for us, it''s not me designing them. Radomir got some of the nerds at school to throw something together. Don''t ask me how he does it, but we''ve never been disappointed, so I can''t complain. He''s good at getting this kind of stuff done for the band."'
 		'Your conversation with Anushka starts winding down and you seem to be running out of small talk. Now seems like a good time to ask her about something specific.'
@@ -375,6 +378,7 @@ if $ARGS[0] = 'chat_anushka1':
 		'You decide to ask about Valentin. "So tell me more about Val."'
 		'"You''re looking a little tense, <<$pcs_nickname>>." Anushka says as she eyes you up and down. She has a devious sparkle in her eyes that makes you worried about what her intentions are.'
 		'"I''m fine... What does that have to do with Val?"'
+		*nl
 		'"I''m just looking out for a friend," she says, her hand over her heart to show some sincerity. "You just look like you need some <i>fun</i> in your life... and I have just what you need!" She gestures over to Valentin as if showing off a product. "For the low, low price of totally free, you can spread those legs and take a ride on the Val rocket!"'
 		'You can''t help but laugh at Anushka''s showmanship, or lack of it. "What are you doing? Are you his pimp? Or was he just too scared to come ask me himself?"'
 		'Anushka laughs. "Fuck, I wish I was his pimp. The way girls line up to fuck him, I''d be rich!"'
@@ -478,7 +482,7 @@ if $ARGS[0] = 'chat_valentin':
 		'"Come on, I promise not to tell anyone." you beg.'
 		'He glances around and moves in close to speak quietly to you. "I fucked the two of them. Just don''t tell Vitek. The last thing I need is him kicking my ass."'
 		*nl
-		'"Really?" you ask curiously and he nods. "He and Lena always complains about how Vitek ruins her sex life."'
+		'"Really?" you ask curiously and he nods. "Lena always complains about how Vitek ruins her sex life."'
 		'Valentin chuckles. "All Vitek has managed to do is turn his sister into a major slut. She''s always trying to get guys to fuck her. Yeah sure, a lot of them turn her down because they''re afraid of Vitek, but more than a few say yes and fuck the shit out of her."'
 		act 'Talk about other stuff':
 			*clr & cla
@@ -490,7 +494,7 @@ if $ARGS[0] = 'chat_valentin':
 			*clr & cla
 			gopnikbandQW['val_lena_lera_3some'] = 1
 			'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
-			'"So what was Lera''s problem there? Jealousy? I heard she has it bad for Lena."'
+			'"So why is Lera glaring over here? Jealousy? I heard she has it bad for Lena." You ask.'
 			'He shakes his head with a grin. "No. Well, maybe a little. She''s still pissed that I shot my load in her mouth."'
 			'"What?" you exclaim in shock. "Everyone always whispers she''s lesbian, so you''re saying the rumors are not true?"'
 			'He shrugs. "Yeah maybe, I think she is a lesbian, but she occasionally seems to like taking dick, at least in threesomes."'
@@ -549,10 +553,10 @@ if $ARGS[0] = 'chat_valentin1':
 	act 'Ask about Anushka':
 		*clr & cla
 		'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
-		'"You and Anushka seem to get along pretty well." you say with a teasing hint.'
+		'"You and Nush seem to get along pretty well." you say with a teasing hint.'
 		'He smiles. "Yeah, she''s a pretty cool chick who''s great to party with or even just hang out with. She has her priorities straight... for the most part." He ends his sentence with a frown.'
 		'You look at Valentin as he looks a bit dejected. "What''s wrong?"'
-		'He sighs. "I can''t wrap my head around how a cool chick like Anushka runs after someone that treats her like crap..."'
+		'He sighs. "I can''t wrap my head around how a cool chick like Nush runs after someone that treats her like crap..."'
 		*nl
 		if anushkaQW['rad_date'] = 1:
 			'"A bit jealous are we?" you say teasingly.'
@@ -622,7 +626,7 @@ if $ARGS[0] = 'chat_valentin1':
 				'He nods. "If she finally gets sick of it, I''m afraid Rad won''t let it go and she''ll end up leaving the band and no way we can replace her, at least not easily. I mean it would be good for her, but suck for the rest of us."'
 				'You can understand that. "But you said it would be worse if they got back together. How so?"'
 				'He just gives you a look of disbelief. "Are you kidding?"'
-				'You shake your head. "No. I know they dated, Radomir cheated on her, and then they broke up."'
+				'You shake your head. "No. I know they dated, Rad cheated on her, and then they broke up."'
 				'He shakes his head. "That''s only part of the story."'
 				act 'Drop it':
 					*clr & cla
@@ -633,7 +637,7 @@ if $ARGS[0] = 'chat_valentin1':
 				act 'Tell me more':
 					*clr & cla
 					'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
-					if npc_rel['A158'] < 50:
+					if npc_rel['A158'] < 60:
 						'He shakes his head. "Look, you seem like a nice girl <<$pcs_nickname>> but we''re not exactly friends. I''m not going to tell a friend''s story to someone I barely know. If you want to know ask them."'
 						'"No one wants to talk about it." uou inform him.'
 						'He shrugs and gets up. "Not my problem." He then walks off and you''re soon engaged in a group discussion about something that happened at school.'
@@ -653,12 +657,12 @@ if $ARGS[0] = 'chat_valentin1':
 							'You prod him to keep going. "Then what happened?"'
 							'He shrugs. "Rad became Rad. I mean I always knew he didn''t think much of girls, his older brother and dad were the same way. Anyway, Rad shows up with this new song he wants to play. He called it "Cherry." God it was awful. He had obviously quickly threw it together and we couldn''t figure out why he wanted to play it. Once we finish, I notice Nush blushing as red as I''ve ever seen her. Turns out the song was about Rad popping her cherry." He shakes his head slightly. "After that, he started treating her like shit even before he cheated on her."'
 							*nl
-							'"How bad was it?"'
+							'"How bad was it?" You ask.'
 							'"He made her do his homework, best grades he''s ever had." he adds with a laugh. "He also used to make her come over when we would hang out and cook for us, get our drinks, run to the store to get snacks when we ran out. He treated her like his personal slave and when he wasn''t bossing her around, he wanted to fuck her. He treated her even worse then."'
 							act 'Go on':
 								*clr & cla
 								'<center><img src="images/characters/shared/headshots_main/big158.jpg"></center>'
-								'"What did he do that was so bad when they had sex?"'
+								'"What did he do that was so bad when they had sex?" You ask.'
 								'He shakes his head. "You mean other than making her give him a blowjob any time he felt like it, regardless if she felt like it or not? I know he didn''t force her. He would just say crap like if she loved him she would, how other girls would do it or how she should be glad that he was her boyfriend and how lucky she was to have a boyfriend at all. You know, emotionally and mentally beat her down until she gave in."'
 								*nl
 								'You shake your head. "That''s terrible! Guys can be such assholes."'
@@ -763,7 +767,7 @@ if $ARGS[0] = 'chat_arkadi':
 	end
 end
 
-if $ARGS[0] = 'chat_arkadi':
+if $ARGS[0] = 'chat_arkadi1':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
@@ -794,6 +798,7 @@ if $ARGS[0] = 'chat_arkadi':
 	end
 	act 'Ask about Valentin':
 		*clr & cla
+		valentin['love_nush'] = 1
 		'<center><img src="images/characters/shared/headshots_main/big156.jpg"></center>'
 		'"You and Valentin seem to get along pretty well." you comment.'
 		'"Val is pretty fun in many ways. He reminds me of a friend from the city, so I like hanging out with him." Arkadi suddenly lets his guard down more than usual.'
@@ -911,6 +916,7 @@ if $ARGS[0] = 'chat_alyona1':
 		'For a moment she doesn''t say anything and you are starting to think she didn''t hear you when she finally turns to look at you. "What?"'
 		'"I said what do you think about the band?" You say again.'
 		'"I''m a bit jealous about how talented they are..." she starts off. "They''re really good and I think they can make it big if they keep it up. Knowing these knuckleheads, they''ll probably get into a fight and end up killing each other before that happens." she laughs.'
+		*nl
 		'"You think so?" you ask.'
 		'She shrugs her shoulders. "Who knows? I really hope they continue like this. I would love to see them on a bigger stage, rocking it out, but I think Rad will probably fuck it all up for them."'
 		'"Oh yeah? Why do you think that?"'
@@ -924,19 +930,23 @@ if $ARGS[0] = 'chat_alyona1':
 		'"You and Anushka seem pretty close." you comment.'
 		'She nods. "She''s my best friend and one of the only people that doesn''t judge or look down on me."'
 		'"Why would people look down on you or judge you?" you ask.'
-		'She gives you a sour look and you can tell she doesn''t want to talk about it. "Because of my fucked up family. I don''t want to talk about it." She glances at Anushka and changes the subject back. "I just wish someone else would come along and sweep her off her feet or she would just finally get over that douchebag. She really deserves someone that treats her better. I don''t really understand what she sees in him, but what can you do? I''ve tried to tell her but she only gets mad at me, so I just leave her alone and listen to her complain..." she sighs.'
+		'She gives you a sour look and you can tell she doesn''t want to talk about it. "Because of my fucked up family. I don''t want to talk about it." She glances at Anushka and changes the subject back.'
+		*nl
+		'"I just wish someone else would come along and sweep her off her feet or she would just finally get over that douchebag Rad. She really deserves someone that treats her better. I don''t really understand what she sees in him, but what can you do? I''ve tried to tell her but she only gets mad at me, so I just leave her alone and listen to her complain..." she sighs.'
 		'"So they used to date?" you ask.'
 		'"Yeah..." she mumbles before suddenly standing up. "I need another beer." She walks over and grabs another beer before talking to some guy at the cooler. You end up talking to some of the other people sitting near you.'
 		act 'Hang out': gt 'praiders_garage', $hangout_rand
 	end
 	act 'Ask about Valentin':
 		*clr & cla
+		valentin['love_nush'] = 1
 		'<center><img src="images/characters/shared/headshots_main/big143.jpg"></center>'
 		'"What''s the deal with you and Valentin?" you ask.'
 		'"W-What do you mean?" she stutters, her cheeks flushing.'
 		'"I noticed the way you guys exchange looks at school sometimes. You guys hooking up or what?" you grin.'
 		'She squirms a little. "Yeah, we hook up from time to time. There''s nothing to it really. We just seem to click sometimes and end up having a great time."'
 		'"So... Are you thinking about getting together?" you pry.'
+		*nl
 		'She shakes her head. "No way, I''m not big on sharing and all the boys in the band bang every groupie they can. If we dated and I seen another girl hanging with him, I would beat her ass and then his, so it''s better that we keep it this way. Besides, he''s got it bad for Nush. A pity she doesn''t seem to notice, I think he would be good for her."'
 		'"Really? Valentin''s got the hots for Nush?"'
 		'She nods and goes on to tell you about several times it was really obvious that he does and how the only person that doesn''t seem to notice is Anushka.'
@@ -956,7 +966,7 @@ if $ARGS[0] = 'chat_alyona1':
 		'<center><img src="images/characters/shared/headshots_main/big143.jpg"></center>'
 		'"So what do you think about Radomir?" you pry.'
 		'"How many times he''s hit on me, you wonder?" she laughs.'
-		'"He really does that? Even though you''re Anushka''s best friend?"'
+		'"He really does that? Even though you''re Anushka''s best friend?" You ask.'
 		'She looks at you wide eyed. "Let me tell you, that dude would fuck and tries to fuck every hot girl he meets, and to pretty much everyone''s disgust he often manages to pull it off. This not only annoys me, but also the rest of the people that like to hang around here since we know it bothers Anushka, though she really needs to get over it."'
 		'"So stay away from Radomir, that''s what you''re saying?" you carefully ask.'
 		'"Yes, very much so. Unless you want to be treated like a piece of meat." You both start laughing and share stores about the various lame attempts guys have made to pick you up.'
@@ -973,7 +983,7 @@ if $ARGS[0] = 'chat_alyona1':
 			'"What an asshole!" you reply.'
 			*nl
 			'She nods. "Tell me about it, anyways it''s not my story to tell."'
-			if npc_rel['A143'] >= 50:
+			if npc_rel['A143'] >= 60:
 				'"Is that why they broke up?" you ask.'
 				'She shakes her head. "No, it tore her up. I spent the whole weekend at her place while she cried about it. She eventually forgave him, but it didn''t stop the asshole from cheating on her and then he had the balls to break up with her. Some lame ass excuse about how it was best for the band. Don''t get me wrong, it was the best thing, she can do so much better than that asshole." She continues talking about Radomir being a bastard. She really doesn''t like him and seems to have plenty to say on the topic.'
 				act 'Hang out': gt 'praiders_garage', $hangout_rand
@@ -1007,7 +1017,7 @@ if $ARGS[0] = 'chat_lenalera':
 	if gopnikbandQW['leleob'] = 1 and gopnikbandQW['lavrenti_present'] = 1:
 		gopnikbandQW['lav_lena_know'] = 1
 		'Lena gets up and catches up to Lavrenti. He passes her something and gives her pat on the ass. You glance over and notice the sour look on Lera''s face. If looks could kill, Lavrenti would be a dead man. Before you can say anything Lena comes back over and shows Lera a small bag of pills. "Look what Lav hooked me up with." She seems really happy and even Lera brightens up a bit.'
-		'You decide to ask about the little exchange. "You and Lavrenti seemed pretty friendly." you say in a teasing tone.'
+		'You decide to ask about the little exchange. "You and Lav seemed pretty friendly." you say in a teasing tone.'
 		*nl
 		'Lena turns on you. "What the fuck is that to you?"'
 		'"Uh... well I just see the two of you together sometimes and it seems like you''re close..." you reply, but that only seems to annoy her more.'
@@ -1036,7 +1046,7 @@ if $ARGS[0] = 'chat_lenalera1':
 		'<center><img src="images/characters/shared/headshots_main/big20.jpg"></center>'
 		'"So do you guys actually like listening to the band or are you just here for the free beer?" you say jokingly.'
 		'"The free beer is definitely a perk, but I actually like their music." Lena replies as you watch Lera nod.'
-		'"Watching Anushka get away with the dumb shit she does sometimes gets on my nerves, but the free beer and getting to hang out in the garage is pretty good, so I guess it balances out." Lena quips.'
+		'"Watching Nush get away with the dumb shit she does sometimes gets on my nerves, but the free beer and getting to hang out in the garage is pretty good, so I guess it balances out." Lena quips.'
 		'"I think Lena likes hanging out here because Vitek, Vasily and Dan don''t come around here. Ain''t that right?" Lera adds in'
 		'"It''s nice to get a break from the three stooges." Lena laughs as she grabs another beer. The three of you start chatting about a variety of topics.'
 		act 'Hang out': gt 'praiders_garage', $hangout_rand
@@ -1060,7 +1070,7 @@ if $ARGS[0] = 'chat_lenalera1':
 	act 'Ask about Valentin':
 		*clr & cla
 		'<center><img src="images/characters/shared/headshots_main/big21.jpg"></center>'
-		'"So what do you think about Valentin?" you ask.'
+		'"So what do you think about Val?" you ask.'
 		'"He''s doesn''t treat us like groupies, plus he''s nicer to the groupies he fucks." Lera says as she shrugs her shoulders. "Doesn''t treat them like shit like Rad or Arkadi, but he can still be a bastard like most guys."'
 		'"I think he said he''s saving up money from the band''s gigs to buy an American motorcycle to ride across the country. Sounds like fun." Lena chimes in.'
 		*nl
@@ -1107,7 +1117,7 @@ if $ARGS[0] = 'chat_lenalera1':
 		'<center><img src="images/characters/shared/headshots_main/big20.jpg"></center>'
 		'"He''s cute, but he''s such a tryhard." Lena says as she rolls her eyes and chugs the last of her beer. "If he didn''t act like God''s gift to women, maybe I''d enjoy fucking him more.'
 		'"Gross, you''re fucking him?" Lera gags and pulls away from Lena. You listen to the two of them go back and forth about it until Lera finally speaks up. "What can he do that I can''t? I can guaran-fucking-tee he can''t make you cum like I can!"'
-		'"Well he has a dick and you know I like dicks." Lena states and her eyes twinkle mischievously as she pulls Lera closer to her. "I think we need to have a little competition then between you and Radomir. Let''s see who can make me cum the hardest and fastest!"'
+		'"Well he has a dick and you know I like dicks." Lena states and her eyes twinkle mischievously as she pulls Lera closer to her. "I think we need to have a little competition then between you and Rad. Let''s see who can make me cum the hardest and fastest!"'
 		'Lera gets a lightly disgusted look on her face. "Gross!"'
 		*nl
 		'Lena laughs. "Come on, I know you sometimes fuck guys and you like our threesomes."'
@@ -1122,7 +1132,7 @@ if $ARGS[0] = 'chat_lenalera1':
 			'You wonder what they might know about Anushka and Radomir. It seems most people have similar but slightly different stories to tell. "So what do you guys know about the relationship?"'
 			'"The relationship?" Lena questions as she shares a confused look with Lera. The two sit in silence, trying to figure out what you''re talking about.'
 			'Lera then suddenly gasps. "Oh, you mean the old drummer douchebag?"'
-			'"Oh yeah, him!" Lena chimes in. "Yeah, he was a total dick. He and Radomir went at it a lot. So did Nush if I remember right."'
+			'"Oh yeah, him!" Lena chimes in. "Yeah, he was a total dick. He and Rad went at it a lot. So did Nush if I remember right."'
 			'Lera laughs. "Remember that time he told her to go "fetch him a beer"? Holy shit, I thought Nush was gonna beat him with the mic stand!"'
 			*nl
 			'"She should have beat his ass. He was always calling us groupies, trying to get us to fuck him. It was fun teasing him, though." Lena giggles. She tells you more about how she and Lera used to flirt and tease each other in front of him. They would talk dirty, rub against each other and flirt with each other. You start to wonder if they were really doing it to mess with him or for their own satisfaction. You also wonder if they purposefully missed what you meant or if they actually don''t know.'
@@ -1142,7 +1152,7 @@ if $ARGS[0] = 'chat_lenalera1':
 				*nl
 				'Lera nods. "Yeah something like that, they was each others first."'
 				'Lena shakes her head. "Rad was Nush''s first but she wasn''t his first."'
-				'Lera snots. "I know what Rad says, but no one I know ever seen him dating a girl before Rad and he was only fourteen too, they was each others first, no matter what he says." Then they start to argue over if Nush was Rad''s first or not.'
+				'Lera snots. "I know what Rad says, but no one I know ever seen him dating a girl before Nush and he was only fourteen too, they was each others first, no matter what he says." Then they start to argue over if Nush was Rad''s first or not.'
 				act 'Drop it':
 					*clr & cla
 					'<center><img src="images/characters/shared/headshots_main/big21.jpg"></center>'
@@ -1159,7 +1169,7 @@ if $ARGS[0] = 'chat_lenalera1':
 					'Lena shrugs and says. "I heard she cheated on him too."'
 					'Lera shakes her head. "Oh that is a bullshit rumor and you know it, guys are never to blame and girls are always sluts." She says in a bit of a huff.'
 					'Lena sighs and shrugs. "Ok maybe, anyways he cheated on her but she forgave him and then he did it again. He would cheat, they would fight, she would get upset then go back to him."'
-					'Lera adds in. "Yeah this went on for months, until the prick dumped her, after she forgave him repeatedly for cheated... cheating bastard."'
+					'Lera adds in. "Yeah this went on for months, until the prick dumped her, after she forgave him repeatedly for cheating... cheating bastard."'
 					act 'So he dumped her':
 						*clr & cla
 						'<center><img src="images/characters/shared/headshots_main/big20.jpg"></center>'
@@ -1225,7 +1235,7 @@ if $ARGS[0] = 'chat_lavrenti':
 				'He laughs a little. "Yeah for him, I just saw red. The next thing I know I hit him and when he went down, I jumped on him and just kept hitting him. Some teachers had to pull me off him. I broke his nose and his face was messed up with bruises for a over a week."'
 				'You nod. You remember hearing about it, but not the actual details. "Yeah, I heard a little about it."'
 				*nl
-				'He shakes his head. "I got suspended of course and by the time I got back to school, he had convinced everyone that I was just upset because my girlfriend was all over him and sleeping around and I got pissed about it. No one believed my side of things. She lived in Pushkin and never came over here again. She wouldn''t talk about it anyway." He sighs, looking a little sad. "The only people that seemed to at least partially believe me were the gopniks and they mostly high fived me for beating the shit out of Dimka. So I decided that whatever the faults they had, at least they were honest about who they were and wouldn''t stab you in the back. So I started hanging out with them."'
+				'He shakes his head. "I got suspended of course and by the time I got back to school, he had convinced everyone that I was just upset because my girlfriend was all over him and sleeping around and I got pissed about it. No one believed my side of things. She lived in Pushkin and never came over here again. She wouldn''t talk about it anyway." He sighs, looking a little sad. "The only people that seemed to at least partially believe me were the gopniks and they mostly high fived me for beating the shit out of Dimka. So I decided that whatever their faults they had, at least they were honest about who they were and wouldn''t stab you in the back. So I started hanging out with them."'
 				'You nod and the two of you talk more about how he started hanging out with the gopniks and how he changed his look.'
 				act 'Hang out': gt 'praiders_garage', $hangout_rand
 			end
@@ -1255,7 +1265,7 @@ if $ARGS[0] = 'chat_lavrenti':
 		'"The band''s pretty good, don''t you think?" you ask.'
 		'He nods. "Yeah, when they''re on top of their game, they''re really good. They just sometimes have their off nights, which is a shame. I think they really have a shot at making it big."'
 		'"So you hang out with them a lot?" You ask him.'
-		'He laughs a little. "Someone is nosey. Yeah I do, I get along with them better than most of the rest of the gopniks."'
+		'He laughs a little. "Someone is nosy. Yeah I do, I get along with them better than most of the rest of the gopniks."'
 		'"Yeah, I know you only recently started hanging out with the gopniks. Has it been hard?" you ask.'
 		'He shrugs. "Sometimes, but at they''re honest. Anyway, I like these guys the most, so I hang out with them fairly often." He then changes the topic.'
 		act 'Hang out': gt 'praiders_garage', $hangout_rand
@@ -1267,7 +1277,7 @@ if $ARGS[0] = 'chat_lavrenti':
 		if hotcat >= 10:
 			'"She''s fucking hot, not just good looking but has the fun personality to turn the score up. I mean Bella might be classically better looking but Nush has that something extra, she oozes sexuality and that makes her the second hottest girl in school in my book." he says with a grin and a wink, seeming to indicate he thinks you are the hottest girl in school.'
 		else
-			'"She''s fucking hot, not just good looking but has the fun personality to turn the score up. I mean Bella might be classically better looking but Nush has that something extra, she oozes sexuality and that makes her the hottest girl in school in my book." he says with a grin. "Then follows up, no offense."'
+			'"She''s fucking hot, not just good looking but has the fun personality to turn the score up. I mean Bella might be classically better looking but Nush has that something extra, she oozes sexuality and that makes her the hottest girl in school in my book." he says with a grin. Then follows up, "No offense."'
 		end
 		'You roll your eyes. "Okay, so she''s hot. Anything else?"'
 		'He laughs, obviously having responded the way he did on purpose to mess with you. "Yeah, she''s cool. Like I said, she''s hot, talented, smart and great to party with. If she ever gets over Rad, the world better watch out."'
@@ -1288,7 +1298,7 @@ if $ARGS[0] = 'chat_lavrenti':
 				anushkaQW['rad_date'] = 1
 				'<center><img src="images/characters/shared/headshots_main/big155.jpg"></center>'
 				'He gives you a <i>Are you stupid</i> look. "Surely you know they use to date a couple of years ago."'
-				'You nod a bit, you had heard rumors, who hadn''t hear about that? "I mean yeah I hear some people say they use to date, but some people say she cheated on him and others he cheated on her, I never knew what really happened or if it really happened, you know how rumors are."'
+				'You nod a bit, you had heard rumors, who hadn''t heard about that? "I mean yeah I hear some people say they use to date, but some people say she cheated on him and others he cheated on her, I never knew what really happened or if it really happened, you know how rumors are."'
 				'He snorts a laugh. "Boy do I and yeah fair point." You imagine his laugh is because he use to be a cool kid and they are heart and center of the rumor mill, so he knew first hand how rumors spread. "But yeah they use to date, pretty serious from what I little I know."'
 				*nl
 				'Juice gossip, you know you should let it go but you got to ask. "Like what?"'
@@ -1337,7 +1347,7 @@ if $ARGS[0] = 'chat_lavrenti':
 	act 'Ask about Radomir':
 		*clr & cla
 		'<center><img src="images/characters/shared/headshots_main/big155.jpg"></center>'
-		'"Rad is pretty talented, don''t you think?"'
+		'"Rad is pretty talented, don''t you think?" You ask him.'
 		'He nods. "He''s almost as good as he thinks he is." You notice a bit of a tightness to his voice, which makes you curious. "What, don''t you like him?"'
 		'He starts to respond, then stops. "He can be a decent guy and he''s fun to hang out with, but other times he''s just a complete asshole." He sounds a little bitter.'
 		'"What happened?" you ask.'

+ 19 - 12
locations/praiders_garage_events.qsrc

@@ -106,7 +106,11 @@ if $ARGS[0] = 'roman_fight':
 			*nl
 			if gopnikbandQW['niko_present'] = 1:
 				*nl
-				'As you are holding the guy down, you hear Niko holler, "Good job ladies! Great show!" Anushka turns to Niko and sarcastically says, "Yeah, thanks for the help... Asshole!" Niko chuckles before replying, "If I joined in then it would have been too easy. That guy was a chump." You then hear Arkadi shout at the few people that stayed to watch. "Alright, out, lets go, it''s over. He ushers everyone else out, while Roman kicks the guy; that he was beating on, in the ribs, before he walking out.' 
+				'As you are holding the guy down, you hear Niko holler, "Good job ladies! Great show!"' 
+				'Anushka turns to Niko and sarcastically says, "Yeah, thanks for the help... Asshole!"'
+				'Niko chuckles before replying, "If I joined in then it would have been too easy. That guy was a chump."'
+				'You then hear Arkadi shout at the few people that stayed to watch. "Alright, out, lets go, it''s over. He ushers everyone else out, while Roman kicks the guy; that he was beating on, in the ribs, before he walking out.'
+				*nl
 				'Valentin and Anushka go to check on their gear, which she carefully moved it out of the way. Arkadi tells the guys to get out while they can, the one Arkadi was fighting, helps up his friend; the one that Roman was beating on, while the one you helped kick in the ribs, manages to limp out of the garage. With the way he is moving, he likely has some broken ribs. Once everyone else is gone, Anushka begins checking on the boys to see if they are hurt while avoiding Niko, clearly upset at him for not helping, and his mocking tone after the fight was done.'
 			else
 				'With that Arkadi turns to look at the few people that stayed to watch. "Alright, out, lets go, it''s over. He ushers everyone else out, while Roman kicks the guy in the ribs he was beating on as he walks out. Valentin and Anushka go to check on their gear after she moved it out of the way. Arkadi tells the guys to get out while they can, the one Arkadi was fighting helps his friend Roman was on, while the one you helped kick in the ribs manages to barely leave on his own, likely has some broken ribs. Once everyone else is gone, Anushka starts to check on the boys to see if they are hurt.'
@@ -115,7 +119,8 @@ if $ARGS[0] = 'roman_fight':
 			act 'Stay':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/rfightafter.jpg"></center>'
-				'After checking Valentin and not finding anything but some bruises Anushka checks on Arkadi, who tries to pull away. But Anushka grabs him by the chin to hold him still. "Hold still." Arkadi grumbles but holds still while Valentin starts cleaning up the place, you help him clean up, which gets a nod and a smile from him. Anushka grabs a towel and starts to clean the small cut next to Arkadi''s eye which elicits a "Owe." out of him. "Oh shush, stop being a pussy." Anushka says to him which cause you and Valentin to smile.'
+				'After checking Valentin and not finding anything but some bruises Anushka checks on Arkadi, who tries to pull away. But Anushka grabs him by the chin to hold him still. "Hold still." Arkadi grumbles but holds still while Valentin starts cleaning up the place, you help him clean up, which gets a nod and a smile from him. Anushka grabs a towel and starts to clean the small cut next to Arkadi''s eye which elicits a "Owe." out of him.'
+				'"Oh shush, stop being a pussy." Anushka says to him which cause you and Valentin to smile.'
 				if gopnikbandQW['alyona_present'] = 1:
 					'Alyona grabs and beer and starts drinking again as she sits down on the couch to just watch what''s going on.'
 				end
@@ -160,7 +165,7 @@ if $ARGS[0] = 'radnush_love':
 				'You are enjoying yourself talking to others and then you hear Valentin muttering. "For fucks sake." When you look at him he is looking towards the stage you can guess what he is looking at, as you turn and look, Radomir and Anushka are kissing and starting to get really frisky with each other, acting like a couple of love sick teenagers. Then Valentin gets up. "Alright had enough of this, I''m out, see you guys later." He says to everyone collectively.'
 				*nl
 				if gopnikbandQW['lena_lara_present'] = 1 and gopnikbandQW['niko_present'] = 1 and NikoVolkovQW['lena_lara_flirt'] = 0:
-					'Lena grins while leaning over to say to Lera, "Looks like Someone is getting some, tonight, wish it was me..."'
+					'Lena grins while leaning over to say to Lera, "Looks like someone is getting some, tonight, wish it was me..."'
 					'Niko smugly leans over and says, "Well I could make your wish come true."'
 					'Lena replies. "You really think you could handle me?"'
 					'Leaning in closer, with a seductive grin on his face, Niko says, "Oh yeah, I can bring you to the height of ecstasy, and safely back in soft bed."'
@@ -171,7 +176,7 @@ if $ARGS[0] = 'radnush_love':
 					'Lena sighs, obviously not wanting to seem eager, as she replies, "Get us some drinks, and we will see what happens."'
 					'Niko nods, before responding. "Right away milady."'
 					'Lera grunts in disgust. "Don''t call me that, I''m not your fucking damsel in distress! Now get us those drinks, before I get it myself."'
-					'Niko eagerly gets up then heads out to get beers for Lena & Lera, as they slouch back in their seat chatting.'
+					'Niko eagerly gets up then heads out to get beers for Lena and Lera, as they slouch back in their seat chatting.'
 					if NikoVolkovQW >= 5: 					
 						act 'Confront Niko': gt 'praiders_garage_events', 'Niko Confront'
 					end
@@ -203,7 +208,7 @@ if $ARGS[0] = 'radnush_love':
 					act 'Keep being a perv':
 						*clr & cla
 						'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/radnush5.jpg"></center>'
-						'As you keep watching eventually she turns to sit in his lap with her legs to each of his sides, they makeout more and more and it seems like any moment the clothes are going to start flying and they are going to start fucking, with out a care in the world on who might be watching. "Ok lets go pervert." Arkadi''s voice draws your attention, when you turn back to look you notice he and you are the only ones left. His tone is slightly joking but you can''t help but blush a little when you realize you was watching the couple so much you didn''t notice everyone else leave. "Lets go."'
+						'As you keep watching eventually she turns to sit in his lap with her legs to each of his sides, they makeout more and more and it seems like any moment the clothes are going to start flying and they are going to start fucking, with out a care in the world on who might be watching. "Ok lets go pervert." Arkadi''s voice draws your attention, when you turn back to look you notice he and you are the only ones left. His tone is slightly joking but you can''t help but blush a little when you realize you was watching the couple so much you didn''t notice everyone else left. "Lets go."'
 						*nl
 						'You get up and get ushered to the door by Arkadi, with a finally glance back you now see Anushka topless as they are making out hot and heavy now. Arkadi walks you out and then closes and locks the door behind him. "Just what we fucking need." He mutters.'
 						'You look at him. "What the two of them?"'
@@ -243,12 +248,13 @@ if $ARGS[0] = 'alyona_dad':
 	*clr & cla
 	minut + 15
 	'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/hangout4.jpg"></center>'
-	'Everyone is scattered around the garage, enjoying themselves as they drink and hangout. The atmosphere is relaxed and easy going, slowly people start to head out as it gets late. Before long everyone has left but Anushka, Valentin, Alyona, and yourself. This is when Valentin announces. "Ok girls lets pack it up for the night, unless..." He remarks with a lewd smile on his face, his unless is obviously a foursome with him. Anushka snorts and says. "In your dreams." While Alyona rolls her eyes slightly. With that everyone heads outside and Valentin locks the garage up. The three of them start walking back to the apartments talking, you could go with them of course or call it a night and head home.'
+	'Everyone is scattered around the garage, enjoying themselves as they drink and hangout. The atmosphere is relaxed and easy going, slowly people start to head out as it gets late. Before long everyone has left but Anushka, Valentin, Alyona, and yourself. This is when Valentin announces. "Ok girls lets pack it up for the night, unless..."'
+	'He remarks with a lewd smile on his face, his unless is obviously a foursome with him. Anushka snorts and says. "In your dreams." While Alyona rolls her eyes slightly. With that everyone heads outside and Valentin locks the garage up. The three of them start walking back to the apartments talking, you could go with them of course or call it a night and head home.'
 	act 'Leave': gt 'pav_complex', 'garages'
 	act 'Leave with them.':
 		*clr & cla
 		'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/zoykov.jpg"></center>'
-		'You decided to go with them, the four of you are still talking and laughing as you walk. Before you make it far though a man comes out of the darkness of the courtyard, he is older, at a guess a bit older than your step dad. He is fairly tall with thick meaty arms, and a bit of a beer gut on him. Everyone stops talking at once, you can feel the tense ratchet up as well. "Where the fuck have you been you little slut?" The man says as he closes in on the group heading right for Alyona.'
+		'You decided to go with them, the four of you are still talking and laughing as you walk. Before you make it far though a man comes out of the darkness of the courtyard, he is older, at a guess a bit older than your step dad. He is fairly tall with thick meaty arms, and a bit of a beer gut on him. Everyone stops talking at once, you can feel the tension ratchet up as well. "Where the fuck have you been you little slut?" The man says as he closes in on the group heading right for Alyona.'
 		*nl
 		'Alyona takes a step back as the man walks right up to her face. "I was just hanging out with my friends, chill out." The words barely leave her mouth before the man backhands her hard and sends he sprawling to the ground. Anushka yells out. "What the fuck?" Then goes to Alyona, while Valentin steps up to put himself between Alyona and the man. The man starts to step around Valentin, who just steps in his way. "You better get the fuck out of my face, you little piece of shit." Followed by him shoving Valentin hard enough to force him back, causing him to stumble a bit.'
 		act 'Go to Alyona':
@@ -260,7 +266,7 @@ if $ARGS[0] = 'alyona_dad':
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/alyona_slapped.jpg"></center>'
 			'You rush over to Alyona, with Anushka on her other side, you both check to be sure she is ok. Even in the dim light you can see a bruise forming on her face and her mouth is bleeding from a split lip. This is the first time you have ever seen Alyona afraid, but there is no mistake how wide her eyes are and how she is staring straight at the man. She doesn''t seem to even register you or Anushka checking on her.'
 			*nl
-			'While this is going on, Valentin steps back blocking the man again and shoves him, though he barely makes the man move a step back as he stays. "Bad move punk!" Then punches Valentin in the face who partially blocked it but the man is obviously strong as he blow still went through Valentin''s. Valentin takes a swing at the man catching him in the chin. Soon the two are trading blows, but it is obvious quickly the man is much stronger and tougher than Valentin. What he lacks in youth and speed he more than seems to make up for with experience, as he quickly gets the upper hand. As you watch this all unfold, you notice the light on still from Edwards garage, Anushka''s dad, he might still be in his garage, you could go get help maybe.'
+			'While this is going on, Valentin steps back blocking the man again and shoves him, though he barely makes the man move a step back as he stays. "Bad move punk!" Then punches Valentin in the face who partially blocked it but the man is obviously strong as he blow still went through Valentin''s block. Valentin takes a swing at the man catching him in the chin. Soon the two are trading blows, but it is obvious quickly the man is much stronger and tougher than Valentin. What he lacks in youth and speed he more than seems to make up for with experience, as he quickly gets the upper hand. As you watch this all unfold, you notice the light on still from Edwards garage, Anushka''s dad, he might still be in his garage, you could go get help maybe.'
 			act 'Go get Ed': gt 'praiders_garage_events', 'edward_garage'
 			act 'Try to stop him':
 				*clr & cla
@@ -316,11 +322,12 @@ if $ARGS[0] = 'edward_garage':
 		'Once he leaves you decide you don''t want to wait, so you run after him. You try to keep up with Edward but he just runs faster than you, but still you are close enough to see when he arrives he grabs Alyona''s dad off Valentin and flings him to the ground. The man starts to get up as he says. "What the fuck Ed, this isn''t any of your business." Edward responds by punching him in the face. "What the fuck is wrong with you Zoykov, beating on kids." Followed up by another punch. Alyona goes over to check on Anushka who is getting up, you guess she tried to stop Zoykov and got tossed for it, she doesn''t look like she is hurt. Valentin sits up with his back to the garage, his face is all bloodied and bruised.'
 		act 'Watch them fight':
 			*clr & cla
+			alyonaQW['meet_father'] = 1
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov2.jpg"></center>'
 			'Now you know the man''s name is Zoykov, he lunges at Edward tackling him and they both go down. You just stand there and watch them fight. They trade a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at all of you before glaring again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
 			*nl
 			'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "and if you ever so much as look at my daughter again, I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
-			'Zoykov sits up. "Yeah... yeah..."'
+			'Zoykov looks up from where he lays. "Yeah... yeah..."'
 			act 'Aftermath':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
@@ -344,7 +351,7 @@ if $ARGS[0] = 'edward_garage':
 			*nl
 			'You glance over as the two men are trading a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at the as he put it you kids and glares again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
 			'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "You fucking touch my daughter again and I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
-			'Zoykov sits up. "Yeah... yeah..."'
+			'Zoykov looks up from where he is laying. "Yeah... yeah..."'
 			act 'Aftermath':
 				*clr & cla
 				'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
@@ -372,7 +379,7 @@ if $ARGS[0] = 'edward_arrives':
 		'Now you know the mans name is Zoykov, he lunges at Edward tackling him and they both go down. You just stand there and watch them fight. They trade a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at the as he put it you kids and glares again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
 		*nl
 		'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "You ever so much as look at my daughter again and I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
-		'Zoykov sits up. "Yeah... yeah..."'
+		'Zoykov looks up from where he is laying. "Yeah... yeah..."'
 		act 'Aftermath':
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'
@@ -396,7 +403,7 @@ if $ARGS[0] = 'edward_arrives':
 		*nl
 		'You glance over as the two men are trading a few blows but it doesn''t take long for Zoykov to end up pinned to the ground with Edward hitting him over and over, until Zoykov gives up fighting back and just start trying to defend himself. Once Edward is sure the fight is over he gets off Zoykov and looks around at the as he put it you kids and glares again at Zoykov. "You touch one of these kids again and I will beat you within a inch of your life."'
 		'He glances over at Anushka who is next to Valentin checking his injuries before looking back at Zoykov again who is still on the ground. "You fucking touch my daughter again and I swear to you, they will never find your body, we clear?" When Zoykov doesn''t respond at once Edward repeats. "I said are we clear?"'
-		'Zoykov sits up. "Yeah... yeah..."'
+		'Zoykov looks up from where he is laying. "Yeah... yeah..."'
 		act 'Aftermath':
 			*clr & cla
 			'<center><img src="images/locations/pavlovsk/resident/apartment/garage/band/event/ed_zoykov3.jpg"></center>'

+ 1 - 1
locations/pushkin_sq.qsrc

@@ -92,7 +92,7 @@ if rand(0,50) = 50 and fame['event_day'] ! daystart and hour > 8 and hour < 21:
 end
 
 if rand(0,100) >= 60 and pcs_lover < 3 and rand(0,1200) <= pcs_apprnc:
-	gs 'boy'
+	gs 'boygirl', 0
 	'You are approached by <<$boybody_pref>>, <<$boybod>> guy with <<$boyface>> hair. He is <<$boyClo>>'
 	'The guy introduced himself as <<$boydesc>> and asks you for your telephone number.'
 

+ 1 - 1
locations/qwBarEncounters.qsrc

@@ -419,7 +419,7 @@ end
 	! 'While you are sitting at the bar, minding your own business, a young man sits next to you.'
 
 	!pcs_lover < 3 (has less than three lovers) or bfa < 1 (has a boyfriend with a dominant personality):      !!! DOESN''T MAKE ANY SENSE HERE - SHOULD BE PLACED AT THE END OF EVENT, WHEN THE GUY ASKS FOR SVETA''S NUMBER !!!
-	! gs 'boy'
+	! gs 'boygirl', 0
 	! 'A <<$boybody>>, <<$boybod>> guy with <<$boyface>> hair walks up to you, he is <<$boyClo>>'
 	!		'The guy introduces himself as <<$boydesc>> and asks for your phone number.'
 	!

+ 1 - 1
locations/train_events.qsrc

@@ -793,7 +793,7 @@ if $ARGS[0] = 'Gopnik':
 
 			act 'Blow him':
 				*clr & cla
-				gs 'boy'
+				gs 'boygirl', 0
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnikbj.jpg" ></center>'
 				'The back and forth between him being nice and an ass is weird, the place is wide open, you barely know him - literally everything about this should discourage you from going near his crotch, and yet... yet, you find yourself squatting down in front of him and taking his <<dick>>cm <<$dick_girth>> cock into your mouth. Your hand strokes his hard shaft while you roll your tongue around the head of his cock; you jerk his cock in tune with the bobs of your head, back and forth along his length, your <<$pc_desc[''lips'']>> lips lips wrapped tightly around him.' 
 				*nl