Merge remote-tracking branch 'CroWke/master'

locations/npcstatic5.qsrc

@@ -1279,6 +1279,182 @@ npc_vag['A<<npctemp>>'] = -1
 npc_hymen['A<<npctemp>>'] = -1
 npc_nips['A<<npctemp>>'] = 1
 
+npctemp = 234
+gs 'npcstaticdefaults', 'defaults'
+$npc_dna['A<<npctemp>>'] = '9695699672 2188071337 5246878581 9504515633 1030174716 8079090096 1524386291'
+$npc_firstname['A<<npctemp>>'] = 'Elena'
+$npc_nickname['A<<npctemp>>'] = 'Elli'
+$npc_lastname['A<<npctemp>>'] = 'Yaroslava'
+$npc_usedname['A<<npctemp>>'] = 'Elli'
+$npc_notes['A<<npctemp>>'] = 'A College student who pays the bills by occasionally acting in porn.'
+npc_dob['A<<npctemp>>'] = 19961209
+npc_cyc['A<<npctemp>>'] = rand(0,29)
+npc_fert['A<<npctemp>>'] = -1
+$npc_firstpart['A<<npctemp>>'] = 'U'
+$npc_lastpart['A<<npctemp>>'] = 'U'
+$npc_kidpater['A<<npctemp>>'] = 'N'
+npc_gender['A<<npctemp>>'] = 1
+$npc_thdick['A<<npctemp>>'] = 'clitoris'
+npc_dick['A<<npctemp>>'] = -1
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = -1
+npc_vag['A<<npctemp>>'] = 30
+npc_ass['A<<npctemp>>'] = 10
+npc_apprnc['A<<npctemp>>'] = 100
+npc_lipbalm['A<<npctemp>>'] = 1
+npc_makeup['A<<npctemp>>'] = 1
+npc_skin['A<<npctemp>>'] = 100
+npc_hgt['A<<npctemp>>'] = 165
+npc_bust['A<<npctemp>>'] = 85
+npc_nips['A<<npctemp>>'] = 4
+npc_hairlng['A<<npctemp>>'] = 100
+npc_haircol['A<<npctemp>>'] = 2
+npc_lip['A<<npctemp>>'] = 2
+npc_lashes['A<<npctemp>>'] = 2
+npc_eyesize['A<<npctemp>>'] = 2
+npc_eyecol['A<<npctemp>>'] = 3
+npc_run['A<<npctemp>>'] = 30
+npc_vball['A<<npctemp>>'] = 30
+npc_chess['A<<npctemp>>'] = 30
+npc_dance['A<<npctemp>>'] = 30
+npc_danceero['A<<npctemp>>'] = 10
+npc_jab['A<<npctemp>>'] = 20
+npc_punch['A<<npctemp>>'] = 20
+npc_kick['A<<npctemp>>'] = 20
+npc_def['A<<npctemp>>'] = 30
+
+npctemp = 235
+gs 'npcstaticdefaults', 'defaults'
+$npc_dna['A<<npctemp>>'] = '1659877224 0446724555 3103627999 3833951928 1497696794 6407426024 1077931925'
+$npc_firstname['A<<npctemp>>'] = 'Juliana'
+$npc_nickname['A<<npctemp>>'] = 'Juli'
+$npc_lastname['A<<npctemp>>'] = 'Slavenka'
+$npc_usedname['A<<npctemp>>'] = 'Juli'
+$npc_notes['A<<npctemp>>'] = 'A pornstar in her late twenties. She knows she can''t keep doing this for much longer and is trying to make as much money as she can before retirement.'
+npc_dob['A<<npctemp>>'] = 19880703
+npc_cyc['A<<npctemp>>'] = rand(0,29)
+npc_fert['A<<npctemp>>'] = -1
+$npc_firstpart['A<<npctemp>>'] = 'U'
+$npc_lastpart['A<<npctemp>>'] = 'U'
+$npc_kidpater['A<<npctemp>>'] = 'N'
+npc_gender['A<<npctemp>>'] = 1
+$npc_thdick['A<<npctemp>>'] = 'clitoris'
+npc_dick['A<<npctemp>>'] = -1
+npc_sexskill['A<<npctemp>>'] = 3
+npc_spermpot['A<<npctemp>>'] = -1
+npc_vag['A<<npctemp>>'] = 30
+npc_ass['A<<npctemp>>'] = 10
+npc_apprnc['A<<npctemp>>'] = 100
+npc_lipbalm['A<<npctemp>>'] = 1
+npc_makeup['A<<npctemp>>'] = 1
+npc_skin['A<<npctemp>>'] = 100
+npc_hgt['A<<npctemp>>'] = 170
+npc_bust['A<<npctemp>>'] = 90
+npc_nips['A<<npctemp>>'] = 4
+npc_hairlng['A<<npctemp>>'] = 100
+npc_haircol['A<<npctemp>>'] = 2
+npc_lip['A<<npctemp>>'] = 2
+npc_lashes['A<<npctemp>>'] = 2
+npc_eyesize['A<<npctemp>>'] = 2
+npc_eyecol['A<<npctemp>>'] = 3
+npc_run['A<<npctemp>>'] = 30
+npc_vball['A<<npctemp>>'] = 30
+npc_chess['A<<npctemp>>'] = 30
+npc_dance['A<<npctemp>>'] = 30
+npc_danceero['A<<npctemp>>'] = 10
+npc_jab['A<<npctemp>>'] = 20
+npc_punch['A<<npctemp>>'] = 20
+npc_kick['A<<npctemp>>'] = 20
+npc_def['A<<npctemp>>'] = 30
+
+npctemp = 236
+gs 'npcstaticdefaults', 'defaults'
+$npc_dna['A<<npctemp>>'] = '4420463501 4700373866 1041563160 2521275829 6839571651 6935648190 6904190017'
+$npc_firstname['A<<npctemp>>'] = 'Valentina'
+$npc_nickname['A<<npctemp>>'] = 'Tina'
+$npc_lastname['A<<npctemp>>'] = 'Kuznetsova'
+$npc_usedname['A<<npctemp>>'] = 'Tina'
+$npc_notes['A<<npctemp>>'] = 'A self absorbed pornstar. She thinks way too much of herself and is often hostile to other female stars.'
+npc_dob['A<<npctemp>>'] = 19930404
+npc_cyc['A<<npctemp>>'] = rand(0,29)
+npc_fert['A<<npctemp>>'] = -1
+$npc_firstpart['A<<npctemp>>'] = 'U'
+$npc_lastpart['A<<npctemp>>'] = 'U'
+$npc_kidpater['A<<npctemp>>'] = 'N'
+npc_gender['A<<npctemp>>'] = 1
+$npc_thdick['A<<npctemp>>'] = 'clitoris'
+npc_dick['A<<npctemp>>'] = -1
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = -1
+npc_vag['A<<npctemp>>'] = 30
+npc_ass['A<<npctemp>>'] = 10
+npc_apprnc['A<<npctemp>>'] = 100
+npc_lipbalm['A<<npctemp>>'] = 1
+npc_makeup['A<<npctemp>>'] = 1
+npc_skin['A<<npctemp>>'] = 100
+npc_hgt['A<<npctemp>>'] = 165
+npc_bust['A<<npctemp>>'] = 90
+npc_nips['A<<npctemp>>'] = 4
+npc_hairlng['A<<npctemp>>'] = 100
+npc_haircol['A<<npctemp>>'] = 2
+npc_lip['A<<npctemp>>'] = 2
+npc_lashes['A<<npctemp>>'] = 2
+npc_eyesize['A<<npctemp>>'] = 2
+npc_eyecol['A<<npctemp>>'] = 3
+npc_run['A<<npctemp>>'] = 30
+npc_vball['A<<npctemp>>'] = 30
+npc_chess['A<<npctemp>>'] = 30
+npc_dance['A<<npctemp>>'] = 30
+npc_danceero['A<<npctemp>>'] = 10
+npc_jab['A<<npctemp>>'] = 20
+npc_punch['A<<npctemp>>'] = 20
+npc_kick['A<<npctemp>>'] = 20
+npc_def['A<<npctemp>>'] = 30
+
+npctemp = 237
+gs 'npcstaticdefaults', 'defaults'
+$npc_dna['A<<npctemp>>'] = '0395612421 7689521188 7574391125 3952549504 1777153600 5788079489 6391170185'
+$npc_firstname['A<<npctemp>>'] = 'Aliana'
+$npc_nickname['A<<npctemp>>'] = 'Alli'
+$npc_lastname['A<<npctemp>>'] = 'Smirnova'
+$npc_usedname['A<<npctemp>>'] = 'Alli'
+$npc_notes['A<<npctemp>>'] = 'She signed up with the porn studio the moment she turned 18. She gets a lot of ageplay roles because she looks very young.'
+npc_dob['A<<npctemp>>'] = 19980523
+npc_cyc['A<<npctemp>>'] = rand(0,29)
+npc_fert['A<<npctemp>>'] = -1
+$npc_firstpart['A<<npctemp>>'] = 'U'
+$npc_lastpart['A<<npctemp>>'] = 'U'
+$npc_kidpater['A<<npctemp>>'] = 'N'
+npc_gender['A<<npctemp>>'] = 1
+$npc_thdick['A<<npctemp>>'] = 'clitoris'
+npc_dick['A<<npctemp>>'] = -1
+npc_sexskill['A<<npctemp>>'] = 2
+npc_spermpot['A<<npctemp>>'] = -1
+npc_vag['A<<npctemp>>'] = 30
+npc_ass['A<<npctemp>>'] = 10
+npc_apprnc['A<<npctemp>>'] = 100
+npc_lipbalm['A<<npctemp>>'] = 1
+npc_makeup['A<<npctemp>>'] = 1
+npc_skin['A<<npctemp>>'] = 100
+npc_hgt['A<<npctemp>>'] = 155
+npc_bust['A<<npctemp>>'] = 70
+npc_nips['A<<npctemp>>'] = 4
+npc_hairlng['A<<npctemp>>'] = 100
+npc_haircol['A<<npctemp>>'] = 2
+npc_lip['A<<npctemp>>'] = 2
+npc_lashes['A<<npctemp>>'] = 2
+npc_eyesize['A<<npctemp>>'] = 2
+npc_eyecol['A<<npctemp>>'] = 3
+npc_run['A<<npctemp>>'] = 30
+npc_vball['A<<npctemp>>'] = 30
+npc_chess['A<<npctemp>>'] = 30
+npc_dance['A<<npctemp>>'] = 30
+npc_danceero['A<<npctemp>>'] = 10
+npc_jab['A<<npctemp>>'] = 20
+npc_punch['A<<npctemp>>'] = 20
+npc_kick['A<<npctemp>>'] = 20
+npc_def['A<<npctemp>>'] = 30
+
 !! {Keep this at the end of file of the npcstatics.}
 aarraynumber = npctemp
 

locations/pornfilm.qsrc

@@ -61,6 +61,45 @@ if $ARGS[0] = 'pornactor':
 	end
 end
 
+if $ARGS[0] = 'pornactress':
+	if pfactor ! 50:
+		num = pfactor
+		:actressloop
+			akrand = rand(1,10)
+			if akrand = 1:
+				$paktress[num] = 'Name Pending'
+				$pactressnick[num] = 'K'
+				$pactressID[num] = 'A207'
+			elseif akrand = 2:
+				$pactress[num] = 'Name Pending'
+				$pactressnick[num] = 'Elli'
+				$pactressID[num] = 'A234'
+			elseif akrand = 3:
+				$pactress[num] = 'Name Pending'
+				$pactressnick[num] = 'Juli'
+				$pactressID[num] = 'A235'
+			elseif akrand = 4:
+				$pactress[num] = 'Name Pending'
+				$pactressnick[num] = 'Tina'
+				$pactressID[num] = 'A236'
+			elseif akrand = 5:
+				$pactress[num] = 'Name Pending'
+				$pactress[num] = 'Alli'
+				$pactressID[num] = 'A237'
+			end
+			if num < pfactor:
+				num2 = pfactor
+				:actressloop2
+					if $pactress[num] = $pactress[num2]:jump 'actressloop'
+					num2 -= 1
+				if num2 > num:jump 'actressloop2'
+			end
+			if aksex[akrand] = 0:aksex[akrand] = 1 & girl += 1
+			num -= 1
+		if num > 0:jump 'actressloop'
+	end
+end
+
 if $ARGS[0] = '1':
 	if rand(0,1) = 0: pornhj += 1
 	pornbukk += 1

locations/pornstudio.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'pa':
 				menu_off = 1
 				gs 'stat'
 				'"I would like to change my professional name. Is it possible?"'
-				'"Of course, just give me a minute to register it in the database. So, what would you ike to be called?"'
+				'"Of course, just give me a minute to register it in the database. So, what would you like to be called?"'
 				act '"I want to be called..."':
 					$pfname = input("Enter the name you want to be known as.")
 					if $pfname = '':$pfname = 'Lotta Cox'
@@ -156,7 +156,7 @@ if $ARGS[0] = 'pa':
 				if porn_fame >= 20:
 					ftypecount[0] = pornvag & $ftypecount[0] = 'vaginal'
 					ftypecount[1] = pornanal & $ftypecount[1] = 'anal'
-					ftypecount[2] = pornbeast & $ftypecount[2] = 'beastiality'
+					ftypecount[2] = porngasm & $ftypecount[15] = 'orgasm'
 					ftypecount[3] = porngang & $ftypecount[3] = 'group sex'
 					ftypecount[4] = porncream & $ftypecount[4] = 'creampie'
 					ftypecount[5] = pornhole & $ftypecount[5] = 'gloryhole'
@@ -169,10 +169,9 @@ if $ARGS[0] = 'pa':
 					ftypecount[12] = pornbj & $ftypecount[12] = 'blowjob'
 					ftypecount[13] = pornhj & $ftypecount[13] = 'handjob'
 					ftypecount[14] = pornswall & $ftypecount[14] = 'cum swallowing'
-					ftypecount[15] = porngasm & $ftypecount[15] = 'orgasm'
 					k = 1
 					:repeating
-						c = 15
+						c = 14
 						:ftypecount
 							current = ftypecount[c]
 							$current = $ftypecount[c]
@@ -185,7 +184,7 @@ if $ARGS[0] = 'pa':
 							end
 						if c >= k:jump 'ftypecount'
 						k += 1
-					if k < 15:jump 'repeating'
+					if k < 14:jump 'repeating'
 					if ftypecount[1] = ftypecount[0]:
 						if ftypecount[0] = ftypecount[2]:
 							'You are known from your <<$ftypecount[0]>>, <<$ftypecount[1]>> and <<$ftypecount[2]>> scenes.'
@@ -276,7 +275,7 @@ if $ARGS[0] = 'delivery':
 				'This sauna is located near your home, it is strange that you did not notice it before.'
 			end
 
-			'You go to the sauna, and you''re introduced to the local managers. it is explained to you who you need to deliver to, and reminded that it is necessary to return the envelope the same day you receive it.'
+			'You go to the sauna, and are introduced to the local managers. It is explained to you who you need to deliver to, and reminded that it is necessary to return the envelope the same day you receive it.'
 			'"Don''t forget to use secure transport. We''ll see you on Fridays and don''t fuck up."'
 
 			act 'Leave':bomzQW = 2 & gt 'street'
@@ -296,7 +295,11 @@ if $ARGS[0] = 'shower':
 	dynamic $showerdin
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-	'You enter the shower cubicle. Turned on the shower and gently wash all traces of semen from your body.'
+!! needs to check for cum
+		'You enter the cubicle, turn on the shower and gently wash all traces of semen from your body.'
+!!	else
+!!		'You enter the cubicle, turn on the shower and wash yourself clean.'
+!!	end	
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
@@ -967,7 +970,7 @@ if $ARGS[0] = 'postvideo':
 	else
 		pfilmNOPAY = 0
 		pfcash = 0
-		'You have fulfilled your obligation and the made the film for free.'
+		'You have fulfilled your obligation and made the film for free.'
 	end
 	pornfilmYear[film] = year
 	pornfilmMonth[film] = month
@@ -1147,7 +1150,7 @@ if $ARGS[0] = '2':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting_<<rand(1,6)>>.jpg"></center>'
 
-	'You spent eight hours posing in a variety of sexy underwear, for the casting director.'
+	'You spend eight hours posing in a variety of sexy underwear for the casting director.'
 
 	minut += 120
 	gs 'stat'