From 36078003ccbaeb9a7b8e1c33c80e4f5eaa51b5cb Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 2 Mar 2018 23:01:54 +1300 Subject: [PATCH] Decimal removal, adding num and moving around so that the menu shows up. --- src/pregmod/widgets/slaveSummaryWidgets.tw | 2 +- src/uncategorized/costsReport.tw | 12 ++++++------ src/uncategorized/masterSuite.tw | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw index 551e8e1868d..9f623fd53c3 100644 --- a/src/pregmod/widgets/slaveSummaryWidgets.tw +++ b/src/pregmod/widgets/slaveSummaryWidgets.tw @@ -560,7 +560,7 @@ Release rules: _Slave.releaseRules. Permenantly pregnant. <<elseif _Slave.pregKnown == 1>> <<if _Slave.pregType < 2 || _Slave.broodmother > 0>> - _Slave.pregWeek weeks pregnant. + <<print Math.trunc(_Slave.pregWeek)>> weeks pregnant. <<else>> _Slave.pregWeek weeks pregnant with <<if _Slave.pregType >= 40>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 2799b628580..e9e1e4bcbf8 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -30,14 +30,14 @@ <<if $citizenOrphanageTotal+$privateOrphanageTotal > 0>> You are paying <<if $citizenOrphanageTotal > 0>> - <<print cashFormat($citizenOrphanageTotal*100)>> for education of $citizenOrphanageTotal of your slaves' children in citizen schools<<if $privateOrphanageTotal > 0>>, and<<else>>.<</if>> + <<print cashFormat($citizenOrphanageTotal*100)>> for education of <<print commaNum($citizenOrphanageTotal)>> of your slaves' children in citizen schools<<if $privateOrphanageTotal > 0>>, and<<else>>.<</if>> <</if>> <<if $privateOrphanageTotal > 0>> - <<print cashFormat($privateOrphanageTotal*500)>> for private tutelage of $privateOrphanageTotal of your slaves' children. + <<print cashFormat($privateOrphanageTotal*500)>> for private tutelage of <<print commaNum($privateOrphanageTotal)>> of your slaves' children. <</if>> <</if>> <<if $breederOrphanageTotal > 0>> - Since $breederOrphanageTotal of your slaves' children are being raised into productive members of society in a soceity funded school, you pay a <<print cashFormat(50)>> usage fee. + Since <<print commaNum($breederOrphanageTotal)>> of your slaves' children are being raised into productive members of society in a soceity funded school, you pay a <<print cashFormat(50)>> usage fee. <</if>> <<if $peacekeepers != 0>> @@ -502,7 +502,7 @@ trainer fees: <<print cashFormat(_cost)>> <br> Intensive drugs: <<print cashFormat($drugsCost*5)>> <<set $individualCosts += $drugsCost*5>> <<case "sag-B-gone">> - <br> Questionable infomercial creams: <<print cashFormat(($drugsCost/10))>> + <br> Questionable infomercial creams: <<print cashFormat(Math.trunc($drugsCost/10))>> <<set $individualCosts += ($drugsCost/10)>> <<case "no drugs" "none">> <<default>> @@ -515,7 +515,7 @@ trainer fees: <<print cashFormat(_cost)>> <<set $individualCosts += $drugsCost+($slaves[$i].curatives*$drugsCost)>> <</if>> <<if ($slaves[$i].aphrodisiacs !== 0)>> - <br> Aphrodisiacs/Anaphrodisiacs: <<print cashFormat(($drugsCost*Math.abs($slaves[$i].aphrodisiacs)))>> + <br> Aphrodisiacs/Anaphrodisiacs: <<print cashFormat(Math.trunc($drugsCost*Math.abs($slaves[$i].aphrodisiacs)))>> <<set $individualCosts += $drugsCost*Math.abs($slaves[$i].aphrodisiacs)>> <</if>> <<if ($slaves[$i].hormones != 0)>> @@ -532,7 +532,7 @@ trainer fees: <<print cashFormat(_cost)>> <<set $individualCosts += $slaves[$i].pornFameSpending>> <</if>> <</if>> - <br> __Total__: <<print cashFormat(($individualCosts))>> + <br> __Total__: <<print cashFormat(Math.trunc($individualCosts))>> <br> <</for>> diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw index 20b41766489..bc565c00cac 100644 --- a/src/uncategorized/masterSuite.tw +++ b/src/uncategorized/masterSuite.tw @@ -288,9 +288,6 @@ $masterSuiteNameCaps is furnished It's sparsely populated, so that the few slaves here have to work hard and quickly to ensure that an assortment of sex slaves is perfect and ready for your pleasure at any given moment. <<else>> None of your slaves are serving here. - <<if $Concubine == 0>> - [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]] - <</if>> <</if>> <br> [[Refit the suite to the height of traditional opulence|Master Suite][$cash -= _Tmult2, $masterSuiteUpgradeLuxury = 1]] //Costs <<print cashFormat(_Tmult2)>> and will focus the suite on you// <br> [[Remodel the suite around a luxurious pit for group sex|Master Suite][$cash -= _Tmult2, $masterSuiteUpgradeLuxury = 2]] //Costs <<print cashFormat(_Tmult2)>>; will encourage fucktoys to fuck each other// @@ -300,6 +297,9 @@ $masterSuiteNameCaps is furnished <br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There are currently $masterSuiteSlaves in $masterSuiteNameCaps. <<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>> [[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>// +<<if $Concubine == 0 && $masterSuiteSlaves == 0>> + |[[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]] +<</if>> <<if $seePreg != 0>> <br> -- GitLab