Forráskód Böngészése

[added] enema realism option check

Lusticon 4 hónapja
szülő
commit
c58b406831
3 módosított fájl, 35 hozzáadás és 25 törlés
  1. 14 10
      locations/Cum_Manage.qsrc
  2. 14 9
      locations/cum_cleanup.qsrc
  3. 7 6
      locations/din_van.qsrc

+ 14 - 10
locations/Cum_Manage.qsrc

@@ -122,12 +122,16 @@ if $ARGS[0] = '':
 
 	if sexcontra = 0 and pillcon2 > 1000: sexcontra = 2
 
+!!{ no STDs from know persons }
+    if npc_rel[$boy] <> 0: cumnostd = 1
+	cumnostd = min(1, max(cumnostd, sexpartkno))
+
 !!{Check for previous deposit, and if it was by the same guy and precum, it sets cumarrtemp back by one}
 !!	if $cumarrnam[cumarrtemp-1] = $boy and cumarrkno[cumarrtemp-1] = -1:cumarrtemp -= 1 & sexspecpot = cumarrppt[cumarrtemp]
 
 	if cumprecheck = 1 and cumnostd = 0:
 		cumarrkno[cumarrtemp] = -1
-		gs 'dinSex', 'std_trigger'
+		gs 'dinSex', 'std_trigger' & msg 'Cum_manage: if cumprecheck = 1 and cumnostd = 0'
 	elseif sexunaware > 0:
 		cumarrkno[cumarrtemp] = -2
 	elseif sexpartkno = 1:
@@ -332,7 +336,7 @@ if $ARGS[0] = '':
 			if spafinloc = 0:
 				stat['last_creampie'] = daystart
 				!!STD checks
-				if cumnostd = 0: gs 'dinSex', 'std_trigger'
+				if cumnostd = 0: gs 'dinSex', 'std_trigger' & msg 'Cum_manage: if spafinloc = 0'
 				!! safe creampie (if cycle > 3 or on pill or succubus):
 				if cycle > 3 or birth_control['safe'] = 1 or succubusflag = 1:
 					if sexunaware = 1 or sexcontra = 6:
@@ -446,9 +450,9 @@ if $ARGS[0] = '':
 	end
 
 	!!STD from anal check
-	if spafinloc = 3 and cumnostd = 0: gs 'dinSex', 'std_trigger'
+	if spafinloc = 3 and cumnostd = 0: gs 'dinSex', 'std_trigger' & msg 'Cum_manage: if spafinloc = 3 and cumnostd = 0'
 	!!STD from oral check
-	if spafinloc = 12 and cumnostd = 0: gs 'dinSex', 'std_trigger_oral'
+	if spafinloc = 12 and cumnostd = 0: gs 'dinSex', 'std_trigger_oral' & msg 'Cum_manage: if spafinloc = 12 and cumnostd = 0'
 
 	cumprecheck = 0
 	spafinloc = 0
@@ -525,7 +529,7 @@ if $ARGS[0] = 'cumeater_icon':
 	*nl
 	j = 0
 	:cumeater_icon_jump
-	if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1): gs 'cum_manage', 'cumeater', j
+	if cumloc[j] > 0 and j <> 12 and ((j <> 0 and j <> 3) or FUNC('Cum_Manage', 'check_innards', j) = 1 or cheatKlisma = 0): gs 'cum_manage', 'cumeater', j
 	if j < 17: j += 1 & jump 'cumeater_icon_jump'
 end
 
@@ -583,9 +587,9 @@ if $ARGS[0] = 'cumeater':
 				'You collect the sperm from your <<$part>> with your fingers and lick them, enjoying the tart taste.'
 			end
 
-			if FUNC('Cum_Manage', 'check_innards', cloc) = 1:
+			if FUNC('Cum_Manage', 'check_innards', cloc) = 1 and cheatKlisma = 1:
 				cumspclnt = 15 & gs 'cum_cleanup'
-			elseif cloc <> 0 and cloc <> 3:
+			elseif (cloc <> 0 and cloc <> 3) or cheatKlisma = 0:
 				gs 'cum_cleanup', 'cleanloc', cloc
 			end
 		end
@@ -925,7 +929,7 @@ if $ARGS[0] = 'cum_stat_display':
 				end
 				$icon_txtiscum = $txtiscum
 				if j <= 4 and pcs_traits['cumeater'] = 1 and $txtiscum = 'cum' _ 
-				and FUNC('Cum_Manage', 'check_private', i) = 1 and ((i <> 0 and i <> 3) or FUNC('Cum_Manage', 'check_innards', i) = 1):
+				and FUNC('Cum_Manage', 'check_private', i) = 1 and ((i <> 0 and i <> 3) or FUNC('Cum_Manage', 'check_innards', i) = 1 or cheatKlisma = 0):
 					$txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 				end
 				if $txtperson ! '':
@@ -951,10 +955,10 @@ if $ARGS[0] = 'cum_stat_display':
 			end
 		if j < 7: j+=1 & jump 'ageloop'
 
-		if stat_cumloc_check = 1 and FUNC('Cum_Manage', 'check_private', i) = 0 _ 
+		if stat_cumloc_check = 1 and cheatKlisma = 1 and (FUNC('Cum_Manage', 'check_private', i) = 0 _ 
 		or (i <> 0 and cumsumass = 0 and cumsumvag > 0 and FUNC('Cum_Manage', 'check_innards', 0) = 0) _ 
 		or (i <> 3 and cumsumvag = 0 and cumsumass > 0 and FUNC('Cum_Manage', 'check_innards', 3) = 0) _ 
-		or (i > 3 and cumsumvag > 0 and FUNC('Cum_Manage', 'check_innards', 0) = 0 and cumsumass > 0 and FUNC('Cum_Manage', 'check_innards', 3) = 0):
+		or (i > 3 and cumsumvag > 0 and FUNC('Cum_Manage', 'check_innards', 0) = 0 and cumsumass > 0 and FUNC('Cum_Manage', 'check_innards', 3) = 0)):
 			stat_cumloc_check = 0
 		end
 

+ 14 - 9
locations/cum_cleanup.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'cleanloc' and arrsize('ARGS') > 1:
 	if i < arrsize('$sparrnam'):
 		if sparrloc[i] = ARGS[1]:
 			if sparrloc[i] = 0 or sparrloc[i] = 3:
-				if mc_inventory['enema_kit'] = 1:
+				if mc_inventory['enema_kit'] = 1 or cheatKlisma = 0:
 					cumsumvag -= iif(sparrloc[i]=0,sparrvol[i],0)
 					cumsumass -= iif(sparrloc[i]=3,sparrvol[i],0)
 					sparrvol[i] = 0
@@ -271,18 +271,21 @@ elseif $ARGS[0] = '':
 	if i < arrsize('$sparrnam'):
 		tmp = arrpos('deresidue', sparrloc[i])
 		if tmp ! -1 and tmp < arrsize('deresidue'):
+			!! vagina
 			if sparrloc[i] = 0:
-				!! vagina cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
+				!! cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
 				if FUNC('Cum_Manage', 'check_innards', sparrloc[i]) = 1 _ 
-				or (hypnoAddict = 0 and mc_inventory['enema_kit'] = 1 and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)):
+				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
+				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
 					cumsumbod -= sparrvol[i] & cumsumvag -= sparrvol[i]
 					sparrslc[i] = 0 & sparrvol[i] = 0
 					isprok = 0 & vibratorIN = 0
 				end
+			!! ass
 			elseif sparrloc[i] = 3:
-				!! ass cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
 				if FUNC('Cum_Manage', 'check_innards', sparrloc[i]) = 1 or cumspclnt = 7 _ 
-				or (hypnoAddict = 0 and mc_inventory['enema_kit'] = 1 and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)):
+				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
+				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
 					cumsumbod -= sparrvol[i] & cumsumass -= sparrvol[i]
 					sparrslc[i] = 0 & sparrvol[i] = 0
 					analplugin = 0
@@ -295,17 +298,19 @@ elseif $ARGS[0] = '':
 
 		tmp = arrpos('toclean', sparrloc[i])
 		if tmp ! -1 and tmp < arrsize('toclean'):
+			!! vagina
 			if sparrloc[i] = 0:
-				!! vagina cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
 				if cumsumvag*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[i], 1) and isprok = 0 and vibratorIN = 0 _ 
-				or (hypnoAddict = 0 and mc_inventory['enema_kit'] = 1 and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)):
+				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
+				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
 					gs 'cum_cleanup', 'cleandeposit', i
 					if cumspclnt = 3: isprok = 0 & vibratorIN = 0
 				end
+			!! ass
 			elseif sparrloc[i] = 3:
-				!! ass cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
 				if (cumsumass*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[i], 1) and analplugin = 0) or cumspclnt = 7 _ 
-				or (hypnoAddict = 0 and mc_inventory['enema_kit'] = 1 and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)):
+				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
+				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
 					gs 'cum_cleanup', 'cleandeposit', i
 					if cumspclnt = 3 or cumspclnt = 7: analplugin = 0
 				end

+ 7 - 6
locations/din_van.qsrc

@@ -809,7 +809,7 @@ $basin = {
 		end
 	end
 
-	if (cumloc[0] = 1 or cumloc[3]) and hypnoAddict = 0:
+	if cumloc[0]+cumloc[3] > 0 and hypnoAddict = 0:
 		if mc_inventory['enema_kit'] = 1:
 			act 'Wash up cum from your insides (0:05)':
 				menu_off = 1
@@ -1202,16 +1202,18 @@ if $ARGS[0] = 'private':
 	end
 
 	!For now, the pregnancy reactions use bimbolevel as a chack. Once the pregnancy fetish is added to the game, the check will likely change to that.
-	if knowpreg ! 1 and mc_inventory['pregnancy_test'] > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
+	if knowpreg ! 1 and mc_inventory['pregnancy_test'] > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100) and last_pee + 59 < totminut:
 		act 'Do a pregnancy test (0:05)':
 			cla & *clr
+			last_pee = totminut
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/preg_test.jpg"></center>'
 			'You sit down on the toilet and slip the test between your legs, carefully letting loose a stream of urine from your pussy onto the tip. Following the instructions, you then re-cap it and lay it flat on the sink, spending the next five minutes nervously fidgeting, waiting out the suggested time...'
 			'When the time is up, you eagerly snatch it up and yank off the cap to see the results.'
 			minut += 5
 			mc_inventory['pregnancy_test'] -= 1
 			gs 'stat'
-			if pregchem > 120 and bimbolevel < 3 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
+			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
+			if pregchem > 120 and bimbolevel < 3 and hypnoAddict = 0 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
@@ -1220,14 +1222,14 @@ if $ARGS[0] = 'private':
 				act 'Horrified':gt 'din_van', 'HorrifiedReact1'
 				act 'Concerned':gt 'din_van', 'ConcernedReact1'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
-			elseif pregchem > 120 and bimbolevel = 3 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
+			elseif pregchem > 120 and (bimbolevel = 3 or hypnoAddict = 1) and khypnoAddict = 0 and knowpreg = 0 and husband = 0 and pcs_pregtalk = 0:
 				cla
 				knowpreg = 1
 				thinkpreg = 1
 				*nl
 				'The test shows two strips. You are pregnant. As you look at the test in your hand, you are...'
 				act 'Excited':gt 'din_van', 'ExcitedReact1'
-				act 'Aroused':gt 'din_van', 'ArousedReact1'
+				if pcs_horny >= 50 or bimbolevel = 3: act 'Aroused':gt 'din_van', 'ArousedReact1'
 			elseif pregchem > 120 and knowpreg = 0 and husband = 1 and kid = 0 and pcs_pregtalk = 0:
 				knowpreg = 1
 				thinkpreg = 1
@@ -1255,7 +1257,6 @@ if $ARGS[0] = 'private':
 				act'Sigh in disappointment':gt'din_van','DisappointedReact'
 			end
 
-			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end