Merge remote-tracking branch 'CroWke/master'

locations/pornhist.qsrc

@@ -115,7 +115,7 @@ $pornfilmdesc = {
 	$porndesc[1] = 'Handjob'
 	$porndesc[2] = 'Blowjob'
 	$porndesc[3] = 'Straight sex with facial'
-	$porndesc[4] = 'Straight and anal sex with facial'
+	$porndesc[4] = 'Straight anal sex with facial'
 	$porndesc[5] = 'Threesome with anal creampie and facial'
 	$porndesc[6] = 'Threesome with double penetration, facial and swallowing'
 	$porndesc[7] = 'Straight sex with creampie'
@@ -126,19 +126,25 @@ $pornfilmdesc = {
 	$porndesc[12] = 'Four guy gangbang with anal sex and anal creampies'
 	$porndesc[13] = 'Two double penetration with four guys, vaginal and anal creampies'
 	$porndesc[14] = 'Gangbang with 50 guys'
+	$porndesc[15] = 'Straight sex, bj and anal sex with creampie'
+	$porndesc[16] = 'Straight sex, bj and anal sex with cum on ass'
+	$porndesc[17] = 'Lesbian sex with cuni, tribbing and double dildo'
+	$porndesc[18] = 'Lesbian sex with cuni, vaginal strapon and giving anal strapon'
+	$porndesc[19] = 'Threesome with guy and girl, bj, vaginal, anal, cumshare after anal creampie'
+	$porndesc[20] = 'Threesome with guy and girl, bj, cuni, cumshare after anal creampie'
 	if film_type = 1:
 		pfType = 0
 		pcash = 20
 		pfactor = 1
 		actbonus = 1
-		$tags = 'handjob'
+		$tags = 'handjob, cumshot'
 		$pfilmtext = 'You jerked off a guy and he came on your tits.'
 	elseif film_type = 2:
 		pfType = 0
 		pcash = 30
 		pfactor = 1
 		actbonus = 1
-		$tags = 'blowjob'
+		$tags = 'blowjob, facial'
 		$pfilmtext = 'You blew a guy and got a facial.'
 	elseif film_type = 3:
 		pfType = 0
@@ -153,13 +159,13 @@ $pornfilmdesc = {
 		pfactor = 1
 		actbonus = rand(1,2)
 		$tags = 'blowjob, facial, vaginal, anal'
-		$pfilmtext = 'You blew and fucked a guy in pussy and ass, then got a facial.'
+		$pfilmtext = 'You blew and fucked a guy letting him use all your holes, then got a facial.'
 	elseif film_type = 5:
 		pfType = 0
 		pcash = 70
 		pfactor = 2
 		actbonus = rand(1,3)
-		$tags = 'facial, vaginal, anal, blowjob'
+		$tags = 'facial, vaginal, anal, blowjob, creampie'
 		$pfilmtext = 'A guy fucked your ass and pussy, getting an anal creampie while you sucked off an another guy, getting facial.'
 	elseif film_type = 6:
 		pfType = 0
@@ -173,21 +179,21 @@ $pornfilmdesc = {
 		pcash = 80
 		pfactor = 1
 		actbonus = rand(1,2)
-		$tags = 'vaginal'
+		$tags = 'vaginal, creampie'
 		$pfilmtext = 'You blew and fucked a guy, getting a creampie.'
 	elseif film_type = 8:
 		pfType = 1
 		pcash = 100
 		pfactor = 2
 		actbonus = rand(1,2)
-		$tags = 'DP, vaginal, anal'
+		$tags = 'DP, vaginal, anal, creampie'
 		$pfilmtext = 'Two guys fucked you in double penetration, getting a double creampie.'
 	elseif film_type = 9:
 		pfType = 1
 		pcash = 90
 		pfactor = 2
 		actbonus = rand(1,3)
-		$tags = 'blowjob, vaginal, swallowing'
+		$tags = 'blowjob, vaginal, swallowing, creampie'
 		$pfilmtext = 'Two guys fucked your pussy and mouth, getting a creampie and swallowing cum.'
 	elseif film_type = 10:
 		pfType = 1
@@ -195,27 +201,27 @@ $pornfilmdesc = {
 		pfactor = 4
 		actbonus = rand(2,3)
 		$tags = 'vaginal, cumshot'
-		$pfilmtext = 'Four guys fucked your pussy and they all cum on your mons.'
+		$pfilmtext = 'Four guys fucked your pussy and they all cum on your body and face.'
 	elseif film_type = 11:
 		pfType = 1
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
-		$tags = 'vaginal'
-		$pfilmtext = 'Four guys fucked your pussy, getting four creampie.'
+		$tags = 'vaginal, creampie'
+		$pfilmtext = 'Four guys fucked your pussy, getting four creampies.'
 	elseif film_type = 12:
 		pfType = 0
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
 		$tags = 'anal'
-		$pfilmtext = 'Four guys fucked your ass, getting four ass creampie.'
+		$pfilmtext = 'Four guys fucked your ass, getting four ass creampies.'
 	elseif film_type = 13:
 		pfType = 1
 		pcash = 150
 		pfactor = 4
 		actbonus = rand(2,3)
-		$tags = 'DP, vaginal, anal'
+		$tags = 'DP, vaginal, anal, creampie'
 		$pfilmtext = 'Four guys fucked you in double penetration in pairs. You got two double creampie.'
 	elseif film_type = 14:
 		pfType = 1
@@ -225,6 +231,50 @@ $pornfilmdesc = {
 		$tags = 'vaginal, anal, blowjob, cumshot, facial, swallowing'
 		$pfilmtext = 'Fifty of your fans fucked you however they could. Most everyone came in your pussy.'
 		$pstory = 'You called out to your fans on the internet that they have an opportunity to fuck you and cum in or on you free of charge. Of course they flocked to you.'
+	elseif film_type = 15:
+		pfType = 0
+		pcash = 50
+		pfactor = 1
+		actbonus = rand(1,2)
+		$tags = 'blowjob, anal, creampie'
+		$pfilmtext = 'You gave a blowjob and then let a guy fuck your ass until he came inside.'
+	elseif film_type = 16:
+		pfType = 0
+		pcash = 50
+		pfactor = 1
+		actbonus = rand(1,2)
+		$tags = 'blowjob, anal, cumshot'
+		$pfilmtext = 'You gave a blowjob and then let a guy fuck your ass until he came all over your ass.'
+	elseif film_type = 17:
+		pfType = 0
+		pcash = 50
+		pfactress = 1
+		actbonus = rand(1,2)
+		$tags = 'lesbian, tribbing, double dildo'
+		$pfilmtext = 'You had lesbian sex, licking eachother''s pussies, tribbing and using a double dildo.'
+	elseif film_type = 18:
+		pfType = 0
+		pcash = 50
+		pfactress = 1
+		actbonus = rand(1,2)
+		$tags = 'lesbian, strapon, vaginal, anal'
+		$pfilmtext = 'You had lesbian sex, licking eachother''s pussies, had your pussy fucked with a strapon and fucked the other girl''s ass.'
+	elseif film_type = 19:
+		pfType = 0
+		pcash = 100
+		pfactor = 1
+		pfactress = 1
+		actbonus = rand(2,3)
+		$tags = 'threesome, mff, blowjob, anal, creampie, cumshare'
+		$pfilmtext = 'You had a threesome with a guy and a girl, sucking him off before he fucked your ass until he creampied you while the girl licked your pussy, ending with cumsharing.'
+	elseif film_type = 20:
+		pfType = 0
+		pcash = 100
+		pfactor = 1
+		pfactress = 1
+		actbonus = rand(2,3)
+		$tags = 'threesome, mff, blowjob, anal, creampie, cumshare'
+		$pfilmtext = 'You had a threesome with a guy and a girl, sucking him off before he fucked her ass until he creampied her while you licked her pussy, ending with cumsharing.'
 	end
 	dynamic $porntag
 }
@@ -246,13 +296,39 @@ $porntag = {
 		end
 	end
 	
-	if pfactor > 2:
+	if pfactor = 0 and pfactress > 0:
+		if $pfilmtags <> '':
+			$pfilmtags += ', lesbian'
+		else
+			$pfilmtags = 'lesbian'
+		end
+	end
+	
+	if pfactor > 2 and pfactress = 0:
 		if $pfilmtags <> '':
 			$pfilmtags += ', gangbang'
 		else
 			$pfilmtags = 'gangbang'
 		end
-	elseif pfactor = 2:
+	elseif pfactor > 2 and pfactress > 1:
+		if $pfilmtags <> '':
+			$pfilmtags += ', orgy'
+		else
+			$pfilmtags = 'orgy'
+		end
+	elseif pfactor = 2 and pfactress = 0:
+		if $pfilmtags <> '':
+			$pfilmtags += ', threesome'
+		else
+			$pfilmtags = 'threesome'
+		end
+	elseif pfactor = 1 and pfactress = 1:
+		if $pfilmtags <> '':
+			$pfilmtags += ', threesome'
+		else
+			$pfilmtags = 'threesome'
+		end
+	elseif pfactor = 0 and pfactress = 2:
 		if $pfilmtags <> '':
 			$pfilmtags += ', threesome'
 		else

locations/pornschedule.qsrc

@@ -26,18 +26,22 @@ if $ARGS[0] = 'schedule':
 				if pornvariable <= 1:
 					!50 person
 					pornplan['<<days+1>>,<<porns>>'] = 14
-				elseif pornvariable <= 11:
+				elseif pornvariable <= 10:
 					!4 person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(10,13)
-				elseif pornvariable <= 33:
+				elseif pornvariable <= 30:
 					!2 person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(8,9)
-				elseif pornvariable <= 90:
+				elseif pornvariable <= 60:
 					!single person
 					!some way to randomize the scene
 					pornplan['<<days+1>>,<<porns>>'] = rand(1,7)
+				elseif pornvariable <= 80:
+					!single person
+					!some way to randomize the scene
+					pornplan['<<days+1>>,<<porns>>'] = rand(15,20)
 				else
 					!masturbation scene
 					!some way to randomize the scene - if there will be more than one(???)

locations/pornstudio.qsrc

@@ -904,6 +904,7 @@ if $ARGS[0] = 'medical':
 				pf = ARGS[1]
 				dynamic $pornfilmdesc, pf
 				gs 'pornfilm', 'pornactor'
+				gs 'pornfilm', 'pornactress'
 				*clr & cla
 				'<center><img width=700 src="images/locations/city/citycenter/studio/makeup.jpg"></center>'
 				minut += 30
@@ -951,7 +952,7 @@ if $ARGS[0] = 'postvideo':
 	film += 1
 	if film = 1:
 		$porntitle[film] = 'Girls Jerk Guys #36 - '
-		$pornfilmstory[film] = '<<$pfname>>''s introduction to the world of porn, where she jerk off <<$pakter[1]>> on her tits.'
+		$pornfilmstory[film] = '<<$pfname>>''s introduction to the world of porn, where she jerks off <<$pakter[1]>> on her tits.'
 	else
 		if $pstory = '' and editpornname = 1:
 			$pornfilmstory[film] = input('You can enter the story of the porn movie. This action can be done only once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
@@ -1127,7 +1128,7 @@ if $ARGS[0] = '1':
 									'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/pierre_2.jpg"></center>'
 									'Good for, girl, walk and not take away from me more time'
 
-									gt'pornstudio','start'
+									gt 'pornstudio', 'start'
 								end
 							end
 						end