From a82ffd26ed172dd81245eb99482fcc35f6b98f7f Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 24 Dec 2017 09:23:44 +1300
Subject: [PATCH] Renaming vars for readability and minor rework plus fixes.
---
src/init/storyInit.tw | 28 ++++++--------
src/pregmod/widgets/pregmodWidgets.tw | 40 ++++++++++----------
src/uncategorized/BackwardsCompatibility.tw | 14 +++----
src/uncategorized/costs.tw | 5 +--
src/uncategorized/costsReport.tw | 34 ++++++++++-------
src/uncategorized/persBusiness.tw | 9 ++---
src/uncategorized/personalAttentionSelect.tw | 18 ++++-----
7 files changed, 71 insertions(+), 77 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 3eb0591b832..126942d03b6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1240,27 +1240,23 @@ ocularImplant: 0,
erectileImplant: 0
} >>
-<<if ndef $AgePricing>>
- <<set $AgePricing = 1>>
+<<if ndef $AgeEffectOnTrainerPricingPC>>
+ <<set $AgeEffectOnTrainerPricingPC = 1>>
<</if>>
-<<if ndef $AgeTrainingEffect>>
- <<set $AgeTrainingEffect = 1>>
+<<if ndef $AgeEffectOnTrainerEffectivenessPC>>
+ <<set $AgeEffectOnTrainerEffectivenessPC = 1>>
<</if>>
-<<if ndef $AgeTrainingUpperBounds>>
- <<set $AgeTrainingUpperBounds = 14>>
+<<if ndef $AgeTrainingUpperBoundPC>>
+ <<set $AgeTrainingUpperBoundPC = 14>>
<</if>>
-<<if ndef $AgeTrainingLowerBounds>>
- <<set $AgeTrainingLowerBounds = 12>>
+<<if ndef $AgeTrainingLowerBoundPC>>
+ <<set $AgeTrainingLowerBoundPC = 12>>
<</if>>
-<<if ndef $MinEffectedAge>>
- <<set $MinEffectedAge = 3>>
+<<if ndef $IsInPrimePC>>
+ <<set $IsInPrimePC = 3>>
<</if>>
-<<if ndef $PastPrimeAge>>
- <<set $PastPrimeAge = 5000>>
-<</if>>
-
-<<if ndef $FormattedWithCommas>>
- <<set $FormattedWithCommas = 0>>
+<<if ndef $IsPastPrimePC>>
+ <<set $IsPastPrimePC = 5000>>
<</if>>
<<set $researchLab = {
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index a225c70eef3..c4b7cc5c2c1 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1794,45 +1794,43 @@ Of her $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if>>; $sla
<<widget "AgePCEffects">>
<<switch $PC.actualAge>>
/* <<case 3>> */
- <<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>>
+ <<set $AgeTrainingLowerBoundPC = 18, $AgeTrainingUpperBoundPC = 20, $AgeEffectOnTrainerPricingPC = .1, $AgeEffectOnTrainerEffectivenessPC = .1>>
/* <<case 4>> */
- <<set $AgeTrainingLowerBounds = 17, $AgeTrainingUpperBounds = 19, $AgePricing = .15, $AgeTrainingEffect = .15>>
+ <<set $AgeTrainingLowerBoundPC = 17, $AgeTrainingUpperBoundPC = 19, $AgeEffectOnTrainerPricingPC = .15, $AgeEffectOnTrainerEffectivenessPC = .15>>
/* <<case 5>> */
- <<set $AgeTrainingLowerBounds = 16, $AgeTrainingUpperBounds = 18, $AgePricing = .35, $AgeTrainingEffect = .35>>
+ <<set $AgeTrainingLowerBoundPC = 16, $AgeTrainingUpperBoundPC = 18, $AgeEffectOnTrainerPricingPC = .35, $AgeEffectOnTrainerEffectivenessPC = .35>>
/* <<case 6>> */
- <<set $AgeTrainingLowerBounds = 15, $AgeTrainingUpperBounds = 17, $AgePricing = .55, $AgeTrainingEffect = .55>>
+ <<set $AgeTrainingLowerBoundPC = 15, $AgeTrainingUpperBoundPC = 17, $AgeEffectOnTrainerPricingPC = .55, $AgeEffectOnTrainerEffectivenessPC = .55>>
/* <<case 7>> */
- <<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>>
+ <<set $AgeTrainingLowerBoundPC = 14, $AgeTrainingUpperBoundPC = 16, $AgeEffectOnTrainerPricingPC = .75, $AgeEffectOnTrainerEffectivenessPC = .75>>
/* <<case 8>> */
- <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
+ <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>>
<<case 9>>
- <<set $AgeTrainingLowerBounds = 12, $AgeTrainingUpperBounds = 14, $AgePricing = 1.00, $AgeTrainingEffect = 1.00>>
+ <<set $AgeTrainingLowerBoundPC = 12, $AgeTrainingUpperBoundPC = 14, $AgeEffectOnTrainerPricingPC = 1.00, $AgeEffectOnTrainerEffectivenessPC = 1.00>>
<<case 10>>
- <<set $AgeTrainingLowerBounds = 11, $AgeTrainingUpperBounds = 13, $AgePricing = 1.0005, $AgeTrainingEffect = 1.0005>>
+ <<set $AgeTrainingLowerBoundPC = 11, $AgeTrainingUpperBoundPC = 13, $AgeEffectOnTrainerPricingPC = 1.0005, $AgeEffectOnTrainerEffectivenessPC = 1.0005>>
<<case 11>>
- <<set $AgeTrainingLowerBounds = 10, $AgeTrainingUpperBounds = 12, $AgePricing = 1.01, $AgeTrainingEffect = 1.01>>
+ <<set $AgeTrainingLowerBoundPC = 10, $AgeTrainingUpperBoundPC = 12, $AgeEffectOnTrainerPricingPC = 1.01, $AgeEffectOnTrainerEffectivenessPC = 1.01>>
<<case 12>>
- <<set $AgeTrainingLowerBounds = 9, $AgeTrainingUpperBounds = 11, $AgePricing = 1.02, $AgeTrainingEffect = 1.02>>
+ <<set $AgeTrainingLowerBoundPC = 9, $AgeTrainingUpperBoundPC = 11, $AgeEffectOnTrainerPricingPC = 1.02, $AgeEffectOnTrainerEffectivenessPC = 1.02>>
<<case 13>>
- <<set $AgeTrainingLowerBounds = 8, $AgeTrainingUpperBounds = 10, $AgePricing = 1.03, $AgeTrainingEffect = 1.03>>
+ <<set $AgeTrainingLowerBoundPC = 8, $AgeTrainingUpperBoundPC = 10, $AgeEffectOnTrainerPricingPC = 1.03, $AgeEffectOnTrainerEffectivenessPC = 1.03>>
<<case 14>>
- <<set $AgeTrainingLowerBounds = 7, $AgeTrainingUpperBounds = 9, $AgePricing = 1.04, $AgeTrainingEffect = 1.04>>
+ <<set $AgeTrainingLowerBoundPC = 7, $AgeTrainingUpperBoundPC = 9, $AgeEffectOnTrainerPricingPC = 1.04, $AgeEffectOnTrainerEffectivenessPC = 1.04>>
<<case 15>>
- <<set $AgeTrainingLowerBounds = 6, $AgeTrainingUpperBounds = 8, $AgePricing = 1.05, $AgeTrainingEffect = 1.05>>
+ <<set $AgeTrainingLowerBoundPC = 6, $AgeTrainingUpperBoundPC = 8, $AgeEffectOnTrainerPricingPC = 1.05, $AgeEffectOnTrainerEffectivenessPC = 1.05>>
<<case 16>>
- <<set $AgeTrainingLowerBounds = 5, $AgeTrainingUpperBounds = 7, $AgePricing = 1.06, $AgeTrainingEffect = 1.06>>
+ <<set $AgeTrainingLowerBoundPC = 5, $AgeTrainingUpperBoundPC = 7, $AgeEffectOnTrainerPricingPC = 1.06, $AgeEffectOnTrainerEffectivenessPC = 1.06>>
<<case 17>>
- <<set $AgeTrainingLowerBounds = 4, $AgeTrainingUpperBounds = 6, $AgePricing = 1.07, $AgeTrainingEffect = 1.07>>
+ <<set $AgeTrainingLowerBoundPC = 4, $AgeTrainingUpperBoundPC = 6, $AgeEffectOnTrainerPricingPC = 1.07, $AgeEffectOnTrainerEffectivenessPC = 1.07>>
<<case 18>>
- <<set $AgeTrainingLowerBounds = 3, $AgeTrainingUpperBounds = 5, $AgePricing = 1.08, $AgeTrainingEffect = 1.08>>
-
+ <<set $AgeTrainingLowerBoundPC = 3, $AgeTrainingUpperBoundPC = 5, $AgeEffectOnTrainerPricingPC = 1.08, $AgeEffectOnTrainerEffectivenessPC = 1.08>>
/* <<case 19>> */
-/* <<set $AgeTrainingLowerBounds = 2, $AgeTrainingUpperBounds = 4, $AgePricing = 1.09, $AgeTrainingEffect = 1.09>> */
+/* <<set $AgeTrainingLowerBoundPC = 2, $AgeTrainingUpperBoundPC = 4, $AgeEffectOnTrainerPricingPC = 1.09, $AgeEffectOnTrainerEffectivenessPC = 1.09>> */
/* <<case 20>> */
-/* <<set $AgeTrainingLowerBounds = 1, $AgeTrainingUpperBounds = 3, $AgePricing = 1.10, $AgeTrainingEffect = 1.10 >> */
+/* <<set $AgeTrainingLowerBoundPC = 1, $AgeTrainingUpperBoundPC = 3, $AgeEffectOnTrainerPricingPC = 1.10, $AgeEffectOnTrainerEffectivenessPC = 1.10>> */
/* <<default>> */
-/* <<set $AgeTrainingLowerBounds = 0, $AgeTrainingUpperBounds = 0, $AgePricing = 0, $AgeTrainingEffect = .95>> */
-
+/* <<set $AgeTrainingLowerBoundPC = 0, $AgeTrainingUpperBoundPC = 0, $AgeEffectOnTrainerPricingPC = 0, $AgeEffectOnTrainerEffectivenessPC = .95>> */
<</switch>>
<</widget>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 851e2f62b06..c5db118539e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2870,14 +2870,12 @@ Setting missing slave variables:
<<if ndef _Slave.origSkin>><<set _Slave.origSkin = _Slave.skin>><</if>>
<</for>>
-<<set $AgePricing = 1>>
-<<set $AgeTrainingEffect = 1>>
-<<set $AgeTrainingUpperBounds = 14>>
-<<set $AgeTrainingLowerBounds = 12>>
-<<set $MinEffectedAge = 3>>
-<<set $PastPrimeAge = 5000>>
-
-<<set $FormattedWithCommas = 0>>
+<<set $AgeEffectOnTrainerPricingPC = 1>>
+<<set $AgeEffectOnTrainerEffectivenessPC = 1>>
+<<set $AgeTrainingUpperBoundPC = 14>>
+<<set $AgeTrainingLowerBoundPC = 12>>
+<<set $IsInPrimePC = 3>>
+<<set $IsPastPrimePC = 5000>>
<<HeroSlavesCleanup>>
Done!
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 7665153f4ab..6d1f5a4ec87 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -466,9 +466,8 @@
<<set $costs += 1000>>
<</if>>
-<<set _cost = 10000*$AgePricing>>
-
-<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>>
+<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
+<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine")>>
<<set $costs += _cost>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 66d0307b8d2..bdf58106af3 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -117,7 +117,7 @@
<<if $soldierWages == 0>>
<<set _soldierMod = 1>>
- <<elseif $soldierWages == 0>>
+ <<elseif $soldierWages == 1>>
<<set _soldierMod = 1.5>>
<<else>>
<<set _soldierMod = 2>>
@@ -206,19 +206,25 @@
<br>Coursing Association membership: <<print cashFormat(1000)>>
<</if>>
-<<set _cost = 10000*$AgePricing>>
-<<if $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>>
-
-<<if ($personalAttention == "trading")>>
- <br>Trading trainer fees: <<print cashFormat(_cost)>>
-<<elseif ($personalAttention == "warfare")>>
- <br>Warfare trainer fees: <<print cashFormat(_cost)>>
-<<elseif ($personalAttention == "slaving")>>
- <br>Slaving trainer fees: <<print cashFormat(_cost)>>
-<<elseif ($personalAttention == "engineering")>>
- <br>Engineering trainer fees: <<print cashFormat(_cost)>>
-<<elseif ($personalAttention == "medicine")>>
- <br>Medicine trainer fees: <<print cashFormat(_cost)>>
+<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
+<br>
+<br>
+<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
+<<switch $personalAttention>>
+<br>
+<<case trading>>
+ __Trading__
+<<case warfare>>
+ __Warfare__
+<<case slaving>>
+ __Slaving__
+<<case engineering>>
+ __Engineering__
+<<case medicine>>
+ __Medicine__
+<</switch>>
+trainer fees: <<print cashFormat(_cost)>>
+<br>
<</if>>
<br>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 7781781d362..ff0ada77aef 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -1,5 +1,4 @@
:: Personal Business [nobr]
-<<AgePCEffects>>
<<if $useTabs == 0>>__Personal Business__<</if>>
<br>
@@ -406,10 +405,10 @@
<<if $PCWounded == 1 && $secExp == 1>>
/* does nothing this week */
- <<elseif $PC.actualAge >= $MinEffectedAge && $PC.actualAge < $PastPrimeAge>>
- <<set _Cal += Math.ceil(random($AgeTrainingLowerBounds,$AgeTrainingUpperBounds)*$AgeTrainingEffect)>>
-/* <<elseif $PC.actualAge >= $PastPrimeAge>> */
-/* <<set _Cal += Math.ceil(random($AgeTrainingLowerBounds,$AgeTrainingUpperBounds)*$AgeTrainingEffect)>> */
+ <<elseif $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
+ <<set _Cal += Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>>
+/* <<elseif $PC.actualAge >= $IsPastPrimePC>> */
+/* <<set _Cal -= Math.ceil(random($AgeTrainingLowerBoundPC,$AgeTrainingUpperBoundPC)*$AgeEffectOnTrainerEffectivenessPC)>> */
<<elseif ($personalAttention == "trading")>>
<<set _oldSkill = $PC.trading>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 37b48ad1367..6edfdb303fb 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -1,6 +1,4 @@
:: Personal Attention Select [nobr]
-<<AgePCEffects>>
-
<<set $nextButton = "Back to Main", $nextLink = "Main">>
<<if $PC.career == "escort">>
@@ -30,9 +28,9 @@
<br>
<</if>>
-<<set _cost = 10000*$AgePricing>>
-<<if $PC.actualAge >= $MinEffectedAge>>
+<<if $PC.actualAge >= $IsInPrimePC>>
+<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
<<if $PC.trading >= 100>>
<br>//You are a master trader.//
<<else>>
@@ -45,7 +43,7 @@
<</if>>
<<if $personalAttention == "trading">>
You are training in venture capitalism.
- <<elseif $PC.trading < 100 && $PC.actualAge < $PastPrimeAge>>
+ <<elseif $PC.trading < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire a merchant to train you in commerce|Main][$personalAttention = "trading", $personalAttentionChanged = 1]]
<</if>>
<</if>>
@@ -61,7 +59,7 @@
<</if>>
<<if $personalAttention == "warfare">>
You are training in tactics.
- <<elseif $PC.warfare < 100 && $PC.actualAge < $PastPrimeAge>>
+ <<elseif $PC.warfare < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare", $personalAttentionChanged = 1]]
<</if>>
<</if>>
@@ -77,7 +75,7 @@
<</if>>
<<if $personalAttention == "slaving">>
You are training in slaving.
- <<elseif $PC.slaving < 100 && $PC.actualAge < $PastPrimeAge>>
+ <<elseif $PC.slaving < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire a slaver to train you in slaving|Main][$personalAttention = "slaving", $personalAttentionChanged = 1]]
<</if>>
<</if>>
@@ -93,7 +91,7 @@
<</if>>
<<if $personalAttention == "engineering">>
You are training in arcology engineering.
- <<elseif $PC.engineering < 100 && $PC.actualAge < $PastPrimeAge>>
+ <<elseif $PC.engineering < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire an engineer to train you in engineering|Main][$personalAttention = "engineering", $personalAttentionChanged = 1]]
<</if>>
<</if>>
@@ -109,12 +107,12 @@
<</if>>
<<if $personalAttention == "medicine">>
You are training in slave surgery.
- <<elseif $PC.medicine < 100 && $PC.actualAge < $PastPrimeAge>>>>
+ <<elseif $PC.medicine < 100 && $PC.actualAge < $IsPastPrimePC>>
<br>[[Hire a doctor to train you in medicine|Main][$personalAttention = "medicine", $personalAttentionChanged = 1]]
<</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>//T<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
+<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100)>><br>//<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
<<if ($personalAttentionChanged == 1)>>
<<if ($activeSlave.health < -20)>>
--
GitLab