Bladeren bron

Added father lotto list which revealed one more bug in main game. Changed format a bit.

maankamara 1 jaar geleden
bovenliggende
commit
cca4de0ecb
1 gewijzigde bestanden met toevoegingen van 21 en 11 verwijderingen
  1. 21 11
      locations/mod_pregtest_options.qsrc

+ 21 - 11
locations/mod_pregtest_options.qsrc

@@ -24,20 +24,19 @@ $mod_pregtestPrint = ''
 mod_pregtestN = 0
 :loop_ChildThFath
 if mod_pregtestN < arrsize('$ChildThFath'):
-	$mod_pregtestPrint += '<b><<mod_pregtestN + 1>>. child dad:</b> <<$ChildThFath[mod_pregtestN]>> <b>AKA:</b> <<$npc_usedname[$ChildThFath[mod_pregtestN]]>> '
+	'<b><<mod_pregtestN + 1>>. child dad:</b><<$ChildThFath[mod_pregtestN]>> <b>AKA:</b><<$npc_usedname[$ChildThFath[mod_pregtestN]]>> <b>Real dad:</b><<$ChildFath[mod_pregtestN]>> <b>AKA:</b><<$npc_usedname[$ChildFath[mod_pregtestN]]>> '
 	mod_pregtestN += 1
 	jump 'loop_ChildThFath'
 end
-$mod_pregtestPrint
 *nl
 
 '<b>Current pregnancy</b>'
-'Unfertilized eggs: <<UnfertEgg>> Fertilized eggs: <<FertEgg>> Implanted embryos: <<babyembryo>>'
+'Unfertilized eggs:<<UnfertEgg>> Fertilized eggs:<<FertEgg>> Implanted embryos:<<babyembryo>>'
 $mod_pregtestPrint = ''
 mod_pregtestN = 0
 :loop_wombpotfath
 if mod_pregtestN < arrsize('$wombpotfath'):
-	$mod_pregtestPrint += '<b><<mod_pregtestN + 1>>. potential dad:</b> <<$wombpotfath[mod_pregtestN]>> <b>AKA:</b> <<$npc_usedname[$wombpotfath[mod_pregtestN]]>> '
+	$mod_pregtestPrint += '<b><<mod_pregtestN + 1>>. potential dad:</b><<$wombpotfath[mod_pregtestN]>> <b>AKA:</b><<$npc_usedname[$wombpotfath[mod_pregtestN]]>> '
 	mod_pregtestN += 1
 	jump 'loop_wombpotfath'
 end
@@ -45,17 +44,28 @@ $mod_pregtestPrint
 *nl
 
 '<b>Cycle data</b>'
-'0 Menstruation, 1 Follicular, 2 Ovulation, 3 Luteal, 4 Pregnancy recovery, 5 Pregnant, 6 Menopause'
+'(0 Menstruation, 1 Follicular, 2 Ovulation, 3 Luteal, 4 Pregnancy recovery, 5 Pregnant, 6 Menopause)'
 'Current cycle phase: <<cycle>>'
-iif(cycle = 0, '<b>', '') + 'Phase 0 variables: Hours of menstruation: <<mesec>>' + iif(cycle = 0, '</b>', '')
-iif(cycle = 1, '<b>', '') + 'Phase 1 variables: Hours until ovulation: <<FocH_Max - FocH>> - <<FocH>>/<<FocH_Max>>' + iif(cycle = 1, '</b>', '')
-iif(cycle = 2, '<b>', '') + 'Phase 2 variables: Egg release hormone: <<EggRH>> Hours of ovulation left: <<ovulate>>' + iif(cycle = 2, '</b>', '')
-iif(cycle = 3, '<b>', '') + 'Phase 3 variables: Hours until menstruation: <<LutH_Max - LutH>> - <<LutH>>/<<LutH_Max>> Implant lottery: <<imp_rand>>' + iif(cycle = 3, '</b>', '')
+iif(cycle = 0, '<b>', '') + 'Phase 0 variables: Hours of menstruation:<<mesec>>' + iif(cycle = 0, '</b>', '')
+iif(cycle = 1, '<b>', '') + 'Phase 1 variables: Egg release hormone:<<EggRH>> Hours until ovulation:<<FocH_Max - FocH>> - <<FocH>>/<<FocH_Max>>' + iif(cycle = 1, '</b>', '')
+iif(cycle = 2, '<b>', '') + 'Phase 2 variables: Released egg total:<<UnfertEgg + FertEgg>> Hours of ovulation left: <<ovulate>>' + iif(cycle = 2, '</b>', '')
+iif(cycle = 3, '<b>', '') + 'Phase 3 variables: Fertilized eggs:<<FertEgg>> Hours until menstruation:<<LutH_Max - LutH>> - <<LutH>>/<<LutH_Max>> Implant lottery(zero or below):<<imp_rand>>' + iif(cycle = 3, '</b>', '')
 iif(cycle = 4, '<b>', '') + 'Phase 4 variables: Hours of recovery left: <<RecovH>>' + iif(cycle = 4, '</b>', '')
-iif(cycle = 5, '<b>', '') + 'Phase 5 variables:' + iif(preg = 1, ' Pregnant!', '') + iif(preg = 2, ' In labor!', '') + ' Fetuses: <<babyembryo>> Pregnancy hours: <<PregChem>> Labor window: <<6573 - (babyembryo-1)*588 - 400>>-<<6573 - (babyembryo-1)*588 + 800>>' + iif(cycle = 5, '</b>', '')
-
+iif(cycle = 5, '<b>', '') + 'Phase 5 variables:' + iif(preg = 1, ' <font color="green">Pregnant!</font>', '') + iif(preg = 2, ' <font color="red">In labor!</font>', '') + ' Fetuses:<<babyembryo>> Pregnancy hours:<<PregChem>> Labor window:<<6573 - (babyembryo-1)*588 - 400>>-<<6573 - (babyembryo-1)*588 + 800>>' + iif(cycle = 5, '</b>', '')
 *nl
 
+'<b>The daddy lotto: <<arrsize(''$cumfathlotto'')>></b>'
+$mod_pregtestPrint = ''
+mod_pregtestN = 0
+:loop_cumfathlotto
+if mod_pregtestN < arrsize('$cumfathlotto'):
+	$mod_pregtestPrint += '<b><<mod_pregtestN + 1>>:</b><<$cumfathlotto[mod_pregtestN]>> '
+	mod_pregtestN += 1
+	jump 'loop_cumfathlotto'
+end
+$mod_pregtestPrint
+
+
 act 'return': gt 'mod_setting'
 act 'Cycle!': gs 'mod_pregtest_options', 'testcycle'
 act 'Cycle! x24(a day)': gs 'mod_pregtest_options', 'testcycle', 'day'