Browse Source

Checks for panties and bras when showering and blocked pregnancy tests when recovering from abortion

KevinSmarts 6 years ago
parent
commit
4d99c4d75c
2 changed files with 22 additions and 8 deletions
  1. 21 7
      locations/din_van
  2. 1 1
      locations/shulgabath

+ 21 - 7
locations/din_van

@@ -62,10 +62,17 @@ $shower = {
 		minut += 15
 
 		if clrbelo > 0 and $pantyworntype ! 'none':
-			gs 'underwear', 'linen'
-			gs 'underwear', 'fresh'
+			gs 'panties', 'linen'
+			gs 'panties', 'fresh'
 		elseif clrbelo = 0 and $pantyworntype ! 'none':
-			gs 'underwear', 'linen'
+			gs 'panties', 'linen'
+		end
+
+		if clrbra > 0 and $braworntype ! 'none':
+			gs 'bras', 'linen'
+			gs 'bras', 'fresh'
+		elseif clrbra = 0 and $braworntype ! 'none':
+			gs 'bras', 'linen'
 		end
 
 		if shampoo < 0:
@@ -159,10 +166,17 @@ $bath = {
 		pcs_mood += 20
 
 		if clrbelo > 0 and $pantyworntype ! 'none':
-			gs 'underwear', 'linen'
-			gs 'underwear', 'fresh'
+			gs 'panties', 'linen'
+			gs 'panties', 'fresh'
 		elseif clrbelo = 0 and $pantyworntype ! 'none':
-			gs 'underwear', 'linen'
+			gs 'panties', 'linen'
+		end
+
+		if clrbra > 0 and $braworntype ! 'none':
+			gs 'bras', 'linen'
+			gs 'bras', 'fresh'
+		elseif clrbra = 0 and $braworntype ! 'none':
+			gs 'bras', 'linen'
 		end
 
 		if shampoo < 0:
@@ -941,7 +955,7 @@ 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 pregtest > 0:
+	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
         act 'Do a pregnancy test (0:05)':
             cla
             minut += 5

+ 1 - 1
locations/shulgabath

@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pregtest > 0:
+	if pregtest > 0 and (abortionbirthdate = 0 or daystart - abortionbirthdate > 100):
 		act 'Do a pregnancy test':
 			cla
 			pregtest -= 1