From 17884313f31e21577c1d18815bc4b38678031149 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 15 Dec 2017 01:45:13 +1300 Subject: [PATCH] commented out skill punishment and converted pointed out story vars to temp. --- src/pregmod/widgets/pregmodWidgets.tw | 14 +++++++------- src/uncategorized/costs.tw | 4 ++-- src/uncategorized/costsReport.tw | 12 ++++++------ src/uncategorized/personalAttentionSelect.tw | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index b56d7c346fe..9dcfd545ef6 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1793,18 +1793,18 @@ Of her $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if>>; $sla <<widget "AgePCEffects">> <<switch $PC.actualAge>> -<<case 3>> +/* <<case 3>> */ <<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>> -<<case 4>> +/* <<case 4>> */ <<set $AgeTrainingLowerBounds = 17, $AgeTrainingUpperBounds = 19, $AgePricing = .15, $AgeTrainingEffect = .15>> -<<case 5>> +/* <<case 5>> */ <<set $AgeTrainingLowerBounds = 16, $AgeTrainingUpperBounds = 18, $AgePricing = .35, $AgeTrainingEffect = .35>> -<<case 6>> +/* <<case 6>> */ <<set $AgeTrainingLowerBounds = 15, $AgeTrainingUpperBounds = 17, $AgePricing = .55, $AgeTrainingEffect = .55>> -<<case 7>> +/* <<case 7>> */ <<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>> -<<case 8>> - <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>> +/* <case 8>> */ + <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>> <<case 9>> <<set $AgeTrainingLowerBounds = 12, $AgeTrainingUpperBounds = 14, $AgePricing = 1.00, $AgeTrainingEffect = 1.00>> <<case 10>> diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw index 0012068a191..50c99732263 100644 --- a/src/uncategorized/costs.tw +++ b/src/uncategorized/costs.tw @@ -432,11 +432,11 @@ <<set $costs += 1000>> <</if>> -<<set $cost = 10000*$AgePricing>> +<<set _cost = 10000*$AgePricing>> <<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>> <<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine")>> - <<set $costs += $cost>> + <<set $costs += _cost>> <</if>> <</if>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 7ff2f7457f3..f5e7d9e8171 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -206,19 +206,19 @@ <br>Coursing Association membership: ¤1000 <</if>> -<<set $cost = 10000*$AgePricing>> +<<set _cost = 10000*$AgePricing>> <<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>> <<if ($personalAttention == "trading")>> - <br>Trading trainer fees: ¤$cost + <br>Trading trainer fees: ¤_cost <<elseif ($personalAttention == "warfare")>> - <br>Warfare trainer fees: ¤$cost + <br>Warfare trainer fees: ¤_cost <<elseif ($personalAttention == "slaving")>> - <br>Slaving trainer fees: ¤$cost + <br>Slaving trainer fees: ¤_cost <<elseif ($personalAttention == "engineering")>> - <br>Engineering trainer fees: ¤$cost + <br>Engineering trainer fees: ¤_cost <<elseif ($personalAttention == "medicine")>> - <br>Medicine trainer fees: ¤$cost + <br>Medicine trainer fees: ¤_cost <</if>> <</if>> diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 7661caade1c..5130cc08104 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -30,7 +30,7 @@ <br> <</if>> -<<set $cost = 10000*$AgePricing>> +<<set _cost = 10000*$AgePricing>> <<if $PC.actualAge >= $MinEffectedAge>> <<if $PC.trading >= 100>> @@ -114,7 +114,7 @@ <</if>> <</if>> <</if>> -<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100)>><br>//Training will cost ¤$cost per week.//<br><br><<else>><br><br><</if>> +<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100)>><br>//Training will cost ¤_cost per week.//<br><br><<else>><br><br><</if>> <<if ($personalAttentionChanged == 1)>> <<if ($activeSlave.health < -20)>> -- GitLab