Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/cikl.qsrc

@@ -604,7 +604,13 @@ end
 lipkoef -= rand(0,1)
 if lipkoef <= 0: lipkoef = 0
 
-if Enable_autotampon = 0 and isprok = 1:isprok = 0 & 'You threw away your used tampon.'
+if isprok = 1 or isprokp = 1:
+	isprok_lastday = 1
+else
+	isprok_lastday = 0
+end
+
+if Enable_autotampon = 0 and isprok = 1: isprok = 0 & 'You threw away your used tampon.'
 if Enable_autotampon = 0 and isprokp = 1:isprokp = 0 & 'You threw away your used sanitary pad.'
 
 if preg = 1:

locations/experiment.qsrc

@@ -90,6 +90,8 @@ end
 
 if $ARGS[0] = 'deskTalk:shout':
 	shouted = 1
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\shout.jpg"></center>'
 	*nl
 	'"Calm damn miss <<$pcs_lastname>>, or I will be forced to call a security!" the woman yells as she tries to calm you down.'
@@ -99,6 +101,8 @@ if $ARGS[0] = 'deskTalk:shout':
 end
 
 if $ARGS[0] = 'deskTalk:refuse':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"I understand miss <<$pcs_lastname>>. I guess being used by those extra large sized cocks is not an experience that a woman would like to go through repeatedly." she understandingly replies.'
@@ -115,14 +119,16 @@ if $ARGS[0] = 'deskTalk:refuse':
 end
 
 if $ARGS[0] = 'deskTalk:admitWhore':
+	menu_off = 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
 	'"You see miss <<$pcs_lastname>>, acceptance is the first step. Now do you want to rejoin the experiment, or not?" she grins as she asks.'
 	'"I am not sure, nurse..." you hesitantly answer.'
 	'"Just think about all those big black cocks, ready to fill you up... And all the orgasms you would be experiencing!" she is trying her best to tempt you.'
 
-	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 	act 'No, I have to fight this..':gt 'poli', 'start'
+	act 'Yes, I need it...':gt 'experiment', 'deskTalk:volunteer'
 end
 
 if $ARGS[0] = 'deskTalk:volunteer':
@@ -130,6 +136,7 @@ if $ARGS[0] = 'deskTalk:volunteer':
 	impreg = 0
 	expVolunteer = 1
 	expVolunteerExam = 0
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -139,6 +146,7 @@ end
 
 if $ARGS[0] = 'deskTalk:volunteer:start':
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -154,6 +162,7 @@ end
 
 if $ARGS[0] = 'form':
 	minut += 2
+	menu_off = 1
 	gs 'stat'
 	'<h2>Research project #667 - "Fruit of Eden"</h2>'
 
@@ -183,6 +192,7 @@ end
 if $ARGS[0] = 'form:filled':
 	exp_form = 1
 	minut += 3
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\desk.jpg"></center>'
 	*nl
@@ -195,6 +205,7 @@ end
 
 if $ARGS[0] = 'testarea:start':
 	minut += 1
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse2.jpg"></center>'
 	*nl
@@ -761,9 +772,26 @@ if $ARGS[0] = 'testarea:start:treatmentStart:dream3':
 		if interr = 3:'<<$doc1>>: "Indeed. And she has had sex with both an asian AND an african male."'
 	end
 	*nl
-	'Unable to stay awake anymore you fade out back to the world of unknowing...'
+	
+	if venera = 0 and GerpesOnce = 0 and Gerpes = 0 and SifacOnce = 0 and Sifilis = 0 and TriperOnce = 0 and Triper = 0 and TriperOral = 0 and KandidozOnce = 0 and Kandidoz = 0:
+		'Unable to stay awake anymore you fade out back to the world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+	else
+		'"But she has a STD," is the last thing you here before you fade out back to world of unknowing...'
+		act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup:std'
+	end
+end
 
-	act '(Fade out)':minut += 300 & gt 'experiment', 'testarea:start:treatmentStart:wakeup1'
+if $ARGS[0] = 'testarea:start:treatmentStart:wakeup:std':
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\lights.jpg"></center>'
+	'You''re finally awake, feeling as if you''ve slept for days.'
+	'Your eyes slowly adjust to the light coming from the ceiling lamps. It looks as if there are no windows at all and only artificial light illuminates the room.'
+	*nl
+	'A nurse stands next to your bed. "Sorry, we can''t let you be part of the experiment. You have a STD," she says. "You can get dressed here before you leave."'
+	
+	act 'Get dressed and leave': gt 'poli', 'start'	
 end
 
 if $ARGS[0] = 'testarea:start:treatmentStart:wakeup1':
@@ -1202,6 +1230,8 @@ if $ARGS[0] = 'testarea:treatment:sex3':
 	gs 'arousal', 'vaginal', 4, 'bound', 'sub', 'rough', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 	*nl
 	'At last his ejaculation ends. He does not pull immediately out, instead he signals for the nurse. As she arrives, he finally pulls his sticky, cum covered cock out. And you don''t feel empty for too long...'
@@ -1278,6 +1308,8 @@ if $ARGS[0] = 'testarea:treatment:deflower':
 		gs 'arousal', 'vaginal', 5, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 100000, 75
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 		*nl
 		act '(endure)':experi_stage = 5 & gt 'experiment', 'testarea:treatment:deflower'
@@ -1914,6 +1946,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal cowgirl, 1v1
@@ -1930,6 +1964,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'vaginal', 45, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal missionary, 1v1
@@ -1945,6 +1981,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'bj', 15, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: vaginal + mouth, 2v1
@@ -1962,6 +2000,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', '', 'Some african male', 0, '', 250000, 100
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal doggy, 1v1
@@ -1978,6 +2018,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 20, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: anal missionary, 1v1
@@ -1994,6 +2036,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bj, 1v1
@@ -2013,6 +2057,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'end'
 		gs 'cum_call', 'mouth', 'Some african male', 0, '', 250000, 70
 		gs 'cum_call', 'face', 'Some african male', 0, '', 250000, 20
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, anal, 1v1
@@ -2031,6 +2077,8 @@ if $ARGS[0] = 'testarea:treatment:room:event:sex':
 		gs 'arousal', 'anal', 30, 'bound', 'sub', 'rough', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'cum_call', 'anus', 'Some african male', 0, '', 250000, 100
+		gs 'experiment', 'std_block'
+		
 		gs 'stat'
 
 	! COITUS: bdsm, whip, 1v1
@@ -2223,6 +2271,7 @@ end
 if $ARGS[0] = 'testarea:treatment:room:event:nurse:check':
 	minut += 5
 	! STATUS CHECK: nurse
+	gs 'experiment', 'std_block'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'She takes a sample of your blood, measures your temperature, blood pressure and proceeds to examine insides of your vagina.'
 
@@ -2481,6 +2530,7 @@ if $ARGS[0] = 'testarea:treatment:impreg:leave':
 	minut += 5
 	money += 50000
 	experimentAbsolved += 1
+	gs 'experiment', 'std_block'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\nurse1.jpg"></center>'
 	'The nurse speaks up, "And the last matter to be settled is your payment."'
@@ -2557,7 +2607,8 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish':
 	gs 'cum_call', 'breasts', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'butt', 'Some african male', 0, '', 250000, 50
 	gs 'cum_call', 'labia', 'Some african male', 0, '', 250000, 50
-
+	gs 'experiment', 'std_block'
+	
 	gs 'stat'
 
 	act 'Continue':gt 'experiment', 'testarea:treatment:impreg:shout:punish:kickout'
@@ -2585,5 +2636,18 @@ if $ARGS[0] = 'testarea:treatment:impreg:shout:punish:kickout':
 	act 'Get up':gt 'poli', 'start'
 end
 
+if $ARGS[0] = 'std_block':
+	venera = 0
+	GerpesOnce = 0
+	Gerpes = 0
+	SifacOnce = 0
+	Sifilis = 0
+	TriperOnce = 0
+	Triper = 0
+	TriperOral = 0
+	KandidozOnce = 0
+	Kandidoz = 0
+end
+
 --- experiment ---------------------------------
 

locations/outdoors.qsrc

@@ -358,8 +358,8 @@ if $ARGS[0] = 'main':
 !!15 minute check to stop refreshes causing early gameover and cheating at exhibitionism
 		if outdoors_checks + 15 < totminut:
 			outdoors_checks = totminut
-			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0:
-				'<b><font color="red">You have the blood flowing down your legs and staining your clothes.</font></b>'
+			if isprok = 0 and isprokp = 0 and mesec > 0 and preg = 0 and $loc ! 'Gaddvor' and (isprok_lastday = 0 or (hour > 4 and isprok_lastday = 1)):
+				'<b><font color="red">You have blood flowing down your legs and staining your clothes.</font></b>'
 
 				if $pantyworntype ! 'none':gs 'panties', 'dispose' & '<b><font color="red">Your panties have been ruined and you discreetly remove and dispose of them.</font></b>'