diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js index c95f7f01edeab70bbed7ef0bbe12a5f5554da92d..10491c293896ceb4bd0007112b6a796704b358ba 100644 --- a/src/js/rulesAssistantOptions.js +++ b/src/js/rulesAssistantOptions.js @@ -1966,7 +1966,7 @@ window.rulesAssistantOptions = (function() { this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk)); this.onchange = (value) => { current_rule.set.dietCum = value.cum; - current_rule.set.dietMilk = value.counter.milk; + current_rule.set.dietMilk = value.milk; this.setValue(this.value2string(current_rule.set.dietCum, current_rule.set.dietMilk)); }; } diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw index 1ef3050db4e5927a59d5020cfc57837da629dc10..e46b75cca9f245de2ccb2aa45edb0b21c90d66fb 100644 --- a/src/pregmod/widgets/economyWidgets.tw +++ b/src/pregmod/widgets/economyWidgets.tw @@ -261,7 +261,7 @@ <<set _revenue = _slaveInfo.value.income, _netIncome = _revenue - _slaveInfo.value.cost>> <tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none"> <td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td> - <td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.counter.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td> + <td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td> <td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td> <td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td> <td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td> @@ -345,7 +345,7 @@ <<set _revenue = _slaveInfo.value.income, _netIncome = _revenue - _slaveInfo.value.cost>> <tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none"> <td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td> - <td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.counter.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td> + <td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td> <td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td> <td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td> <td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td> diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw index bcd51e5ad08378296552a65a745c4bba9d6f957a..17ae4ed153662fba6a7e377d795870e6205f826d 100644 --- a/src/uncategorized/saGetMilked.tw +++ b/src/uncategorized/saGetMilked.tw @@ -153,7 +153,7 @@ gets milked this week. <<set $milkTotal += $milk>> As a result, $he produces $milk liters of milk over the week. - <<set _incomeStats.counter.milk = $milk>> + <<set _incomeStats.milk = $milk>> <<if ($arcologies[0].FSPastoralistLaw == 1)>> <<set $milkSale = $milk*(8+Math.trunc($arcologies[0].FSPastoralist/30))>> @@ -384,7 +384,7 @@ gets milked this week. <</if>> <<set $slaves[$i].counter.cum += $cum>> <<set $cumTotal += $cum>> - <<set _incomeStats.counter.cum = $cum>> + <<set _incomeStats.cum = $cum>> <<if ($arcologies[0].FSPastoralist == "unset")>> <<set _cumSale = ($cum*random(15,25))>>