rachels 2 years ago
parent
commit
a6d549b01c
3 changed files with 39 additions and 44 deletions
  1. 36 42
      locations/city_saunawhore.qsrc
  2. 1 1
      locations/din_bad.qsrc
  3. 2 1
      locations/intro_uni_m.qsrc

+ 36 - 42
locations/city_saunawhore.qsrc

@@ -146,58 +146,52 @@ if $ARGS[0] = 'saunawork':
 				if Kandidoz < 30:'Your yeast infection is currently in remission, take vitamins, and it will stay that way.'
 			end
 			act 'Return':gt 'city_saunawhore', 'saunawork'
-		else
-			'The nurse has you strip and put your legs in stirrups then roughly examines you. I can''t see anything wrong with you down there so whatever it is you got it''s in remission so you''re good to work.'
-			act 'Return':gt 'city_saunawhore', 'saunawork'
 		end
+	else
+		'The nurse has you strip and put your legs in stirrups then roughly examines you. I can''t see anything wrong with you down there so whatever it is you got it''s in remission so you''re good to work.'
+		act 'Return':gt 'city_saunawhore', 'saunawork'
+	end
 		
-		if GerpesNapr > 0 and GerpesUkolDay ! daystart:
-			act 'See nurse for herpes shot':
-				*clr & cla
-				minut += 15
-				workDolg += 750
-				GerpesUkolDay = daystart
-				GerpesNapr -= 1
-				gs 'stat'
-				'You see the nurse and she gives you a painful injection in your ass.'
-
+	if GerpesNapr > 0 and GerpesUkolDay ! daystart:
+		act 'See nurse for herpes shot':
+			*clr & cla
+			minut += 15
+			workDolg += 750
+			GerpesUkolDay = daystart
+			GerpesNapr -= 1
+			gs 'stat'
+			'You see the nurse and she gives you a painful injection in your ass.'
 				if GerpesNapr = 0:Gerpes = -10 & 'You have completed the treatment.'
-				act 'Return':gt 'city_saunawhore', 'saunawork'
-			end
+			act 'Return':gt 'city_saunawhore', 'saunawork'
 		end
-			
-		if TriperNapr > 0 and TriperUkolDay ! daystart:
-			act 'See nurse for gonorrhoea shot':
-				*clr & cla
-				minut += 15
-				workDolg += 750
-				TriperUkolDay = daystart
-				TriperNapr -= 1
-				gs 'stat'
-				'You see the nurse and she gives you a painful injection in your ass.'
+	end
 
+	if TriperNapr > 0 and TriperUkolDay ! daystart:
+		act 'See nurse for gonorrhoea shot':
+			*clr & cla
+			minut += 15
+			workDolg += 750
+			TriperUkolDay = daystart
+			TriperNapr -= 1
+			gs 'stat'
+			'You see the nurse and she gives you a painful injection in your ass.'
 				if TriperNapr = 0:TriperOral = 0 & TriperOralSigns = 0 & Triper = 0 & Venera -= 1 & TriperOnce = 0 & 'You have completed the treatment.'
-
 				act 'Return':gt 'city_saunawhore', 'saunawork'
-			end
 		end
-
+	end
 		if Sifilis > 0:
-			act 'See nurse for syphilis shot':
-				*clr & cla
-				minut += 15
-				workDolg += 1000
-				SifNapr = 0
-				SifacOnce = 0
-				Sifilis = 0
-				Venera -= 1
-				gs 'stat'
-				'You see the nurse and she gives you a painful injection in your ass.'
-
-				'"That''s it, you might still feel a bit off but the infection is now cured".'
-
+		act 'See nurse for syphilis shot':
+			*clr & cla
+			minut += 15
+			workDolg += 1000
+			SifNapr = 0
+			SifacOnce = 0
+			Sifilis = 0
+			Venera -= 1
+			gs 'stat'
+			'You see the nurse and she gives you a painful injection in your ass.'
+			'"That''s it, you might still feel a bit off but the infection is now cured".'
 				act 'Return':gt 'city_saunawhore', 'saunawork'
-			end
 		end
 	end
 

+ 1 - 1
locations/din_bad.qsrc

@@ -652,7 +652,7 @@ $d_cycreport_actor = {
 			potfather_counter = 0
 			'List of potential fathers:'
 			:potfather_loop
-			if $wombpotfath[potfather_temp] ! 'unknown':
+			if $wombpotfath[potfather_counter] ! 'unknown':
 				$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 			else
 				$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'

+ 2 - 1
locations/intro_uni_m.qsrc

@@ -1,6 +1,7 @@
 # intro_uni_m
 
-gs 'themes', 'indoors'
+if $ARGS[0] = 'start':
+	gs 'themes', 'indoors'
 	killvar '$start_type'
 	$start_type = 'uni_m'
 	*clr & cla