Explorar el Código

Merge remote-tracking branch 'CroWke/master'

KevinSmarts hace 5 años
padre
commit
801fec96c3
Se han modificado 4 ficheros con 33 adiciones y 33 borrados
  1. 3 0
      locations/anushapt.qsrc
  2. 25 32
      locations/din_van.qsrc
  3. 3 0
      locations/natbelapt.qsrc
  4. 2 1
      locations/telefon.qsrc

+ 3 - 0
locations/anushapt.qsrc

@@ -248,6 +248,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'anushapt','bathroom'
 		end
 	end

+ 25 - 32
locations/din_van.qsrc

@@ -33,8 +33,7 @@ $bteeth = {
 	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:05)':
 		menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			cumspclnt = 2
 			gs 'cum_cleanup'
@@ -130,8 +129,7 @@ $shower = {
 		if pcs_horny >= 40:
 			act 'Use the shower head on your pussy':
 				menu_off = 1
-				cla
-				*clr
+				*clr & cla
 				if rand(0, 5) = 0 and obdysh = 1:gt 'vann', 'v4'
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></center>'
 				*nl
@@ -154,6 +152,10 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -163,8 +165,7 @@ $shower = {
 $bath = {
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
-		cla
-		*clr
+		*clr & cla
 		shampoo -= 1
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
@@ -210,8 +211,7 @@ $bath = {
 
 		act '"Wash" your pussy':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
 			minut += 10
 
@@ -228,6 +228,10 @@ $bath = {
 
 			dynamic $dryOff
 		end
+		
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
+		end
 
 		dynamic $dryOff
 		dynamic $brit
@@ -393,8 +397,7 @@ $tampon = {
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
 		act 'Use a sanitary pad (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			sanpad -= 1
 			isprokp = 1
 			minut += 5
@@ -408,8 +411,7 @@ $tampon = {
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
 		act 'Use a tampon (0:05)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 			tampon -= 1
 			isprok = 1
 			minut += 5
@@ -426,8 +428,7 @@ $quickwash = {
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			menu_off = 1
-			cla
-			*clr
+			*clr & cla
 
 			cumspclnt = 4
 			gs 'cum_cleanup'
@@ -654,8 +655,7 @@ $basin = {
 }
 
 $pir_title = {
-	cla
-	*clr
+	*clr & cla
 	'<center><b>Available piercings - select one by clicking the image</b></center>'
 	*nl
 }
@@ -1136,8 +1136,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
 		act 'Wash your husbands clothes (2 units of washing powder) (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			poroshok -= 2
 			minut += 60
@@ -1153,8 +1152,7 @@ if $ARGS[0] = 'misery':
 
 	if husband > 0 and husbanday > 0 and huspolday ! daystart:
 		act 'Clean the apartment (1:00)':
-			cla
-			*clr
+			*clr & cla
 			husband += 5
 			minut += 60
 			huspolday = daystart
@@ -1250,15 +1248,13 @@ if $ARGS[0] = 'ArousedReact1':
 	'You rub your thighs together as you stare at the pregnancy test in your hand. The two strips displayed confirm that you’ve been knocked up. You excitedly recount every load of cum blast into your fertile womb, wondering which one found purchase. You gently rub your clit in a circular motion as you think about the fact that, in a few months, everyone who sees your large, pregnant belly will know what a slut you are.'
 		if rape > 0 and stat['vaginal'] > 1 and incest['exp'] = 0:
 			'You pick up speed as you recall your rapist forcefully pumping you full of his wonderful semen without any concern for your desires. You loved having your agency stripped away as a complete stranger decided to make you a mother.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		elseif incest['exp'] > 0:
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 		else
-			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
-			'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
+			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'	
 		end
+		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $metka
 end
 
@@ -1319,8 +1315,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
 			act 'Change tampon':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1331,8 +1326,7 @@ if $ARGS[0] = 'prvt_pee':
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
 			act 'Change pad':
-				*clr
-				cla
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1346,8 +1340,7 @@ end
 
 if $ARGS[0] = 'prvt_pee_end':
 	act 'Finish and wipe':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/pc/pee/wiping/' + rand(1,9) + '.jpg"></center>'
 		rand_pee = rand(0,2)
 		if rand_pee = 0:
@@ -1393,7 +1386,7 @@ if $ARGS[0] = 'pblc_pee':
 			if rand_pee = 0:
 				'Albina and her Starlettes are a bunch of dirty whores.'
 			elseif rand_pee = 1:
-				'<<$rand_girl>>''s vagina smells like throw-up!'
+				'<<$rand_girl>>''s vagina smells like puke!'
 			elseif rand_pee = 2:
 				'Beware of Dimka! He''s not as nice as he seems!'
 			elseif rand_pee = 3:
@@ -1409,7 +1402,7 @@ if $ARGS[0] = 'pblc_pee':
 			elseif rand_pee = 8:
 				'Tampons vs. Pads, cast your vote! Below this text are hash marks indicating various girl''s preference. One person also wrote “Freebleeder for life!” Ewww.'
 			elseif rand_pee = 9:
-				'Petras cock is smaller than my lipstick tube, LOL!'
+				'Petra''s cock is smaller than my lipstick tube, LOL!'
 			elseif rand_pee = 10:
 				'You''re beautiful! Believe that!'
 			elseif rand_pee = 11:

+ 3 - 0
locations/natbelapt.qsrc

@@ -335,6 +335,9 @@ if $ARGS[0] = 'bathroom':
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 			'You take a quick shower.'
+			act 'Take a selfie':
+				gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+			end
 			act 'Get out of the shower': gt 'natbelapt','bathroom'
 		end
 	end

+ 2 - 1
locations/telefon.qsrc

@@ -809,7 +809,7 @@ end
 !!picking the selfie image when taking photos, this sets the location variable
 if $ARGS[0] = 'Phone_camera_selfie':
 	gs 'telefon', 'Phone_selfie_totals'
-	minut += RAND(5,7)
+	minut += rand(5,7)
 	if $location_type = 'bathroom':
 		$phone_loc = 'bathroom'
 		gs 'telefon', 'Phone_selfie_image'
@@ -870,6 +870,7 @@ end
 !!taking selfies in the shower or bath
 if $ARGS[0] = 'Phone_selfie_image_bathing':
 	gs 'telefon', 'Phone_selfie_totals'
+	minut += rand(5,7)
 	if $ARGS[1] = 'shower':
 		!!changing to and unmixed variable so the rng will work
 		dynamic 'temp_showertot = bathroom_showertot'