From f18f7f4fcc3392c733efab59efa9ca05adbf4e18 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sun, 24 Dec 2017 12:36:31 +1300 Subject: [PATCH] Second wave. --- src/uncategorized/persBusiness.tw | 17 +++----- src/uncategorized/personalAttentionSelect.tw | 45 +++++++++----------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index 7781781d362..590e9eecc3e 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> @@ -405,15 +404,9 @@ <<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 ($personalAttention == "trading")>> <<set _oldSkill = $PC.trading>> - <<set $PC.trading _Cal>> + <<set $PC.trading += random(1,3)>> <<if _oldSkill <= 10>> <<if $PC.trading > 10>> You now have @@.green;basic knowledge@@ about how to be a venture capitalist. @@ -443,7 +436,7 @@ <<elseif ($personalAttention == "warfare")>> <<set _oldSkill = $PC.warfare>> - <<set $PC.warfare _Cal>> + <<set $PC.warfare += random(1,3)>> <<if _oldSkill <= 10>> <<if $PC.warfare > 10>> You now have @@.green;basic knowledge@@ about how to be a mercenary. @@ -473,7 +466,7 @@ <<elseif ($personalAttention == "slaving")>> <<set _oldSkill = $PC.slaving>> - <<set $PC.slaving _Cal>> + <<set $PC.slaving += random(1,3)>> <<if _oldSkill <= 10>> <<if $PC.slaving > 10>> You now have @@.green;basic knowledge@@ about how to be a slaver. @@ -503,7 +496,7 @@ <<elseif ($personalAttention == "engineering")>> <<set _oldSkill = $PC.engineering>> - <<set $PC.engineering _Cal>> + <<set $PC.engineering += random(1,3)>> <<if _oldSkill <= 10>> <<if $PC.engineering > 10>> You now have @@.green;basic knowledge@@ about how to be an arcology engineer. @@ -533,7 +526,7 @@ <<elseif ($personalAttention == "medicine")>> <<set _oldSkill = $PC.medicine>> - <<set $PC.medicine _Cal>> + <<set $PC.medicine += random(1,3)>> <<if _oldSkill <= 10>> <<if $PC.medicine > 10>> You now have @@.green;basic knowledge@@ about how to be a slave surgeon. diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw index 37b48ad1367..3c600d9b77b 100644 --- a/src/uncategorized/personalAttentionSelect.tw +++ b/src/uncategorized/personalAttentionSelect.tw @@ -1,5 +1,4 @@ :: Personal Attention Select [nobr] -<<AgePCEffects>> <<set $nextButton = "Back to Main", $nextLink = "Main">> @@ -30,11 +29,10 @@ <br> <</if>> -<<set _cost = 10000*$AgePricing>> -<<if $PC.actualAge >= $MinEffectedAge>> + <<if $PC.trading >= 100>> - <br>//You are a master trader.// + //You are a master trader.// <<else>> <<if $PC.trading > 60>> //You are an expert trader.// @@ -45,12 +43,12 @@ <</if>> <<if $personalAttention == "trading">> You are training in venture capitalism. - <<elseif $PC.trading < 100 && $PC.actualAge < $PastPrimeAge>> - <br>[[Hire a merchant to train you in commerce|Main][$personalAttention = "trading", $personalAttentionChanged = 1]] + <<else>> + [[Hire a merchant to train you in commerce|Main][$personalAttention = "trading", $personalAttentionChanged = 1]] <</if>> -<</if>> +<</if>><br> <<if $PC.warfare >= 100>> - <br>//You are a master tactician.// + //You are a master tactician.// <<else>> <<if $PC.warfare > 60>> //You are an expert tactician.// @@ -61,12 +59,12 @@ <</if>> <<if $personalAttention == "warfare">> You are training in tactics. - <<elseif $PC.warfare < 100 && $PC.actualAge < $PastPrimeAge>> - <br>[[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare", $personalAttentionChanged = 1]] + <<else>> + [[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare", $personalAttentionChanged = 1]] <</if>> -<</if>> +<</if>><br> <<if $PC.slaving >= 100>> - <br>//You are a master slaver.// + //You are a master slaver.// <<else>> <<if $PC.slaving > 60>> //You are an expert slaver.// @@ -77,12 +75,12 @@ <</if>> <<if $personalAttention == "slaving">> You are training in slaving. - <<elseif $PC.slaving < 100 && $PC.actualAge < $PastPrimeAge>> - <br>[[Hire a slaver to train you in slaving|Main][$personalAttention = "slaving", $personalAttentionChanged = 1]] + <<else>> + [[Hire a slaver to train you in slaving|Main][$personalAttention = "slaving", $personalAttentionChanged = 1]] <</if>> -<</if>> +<</if>><br> <<if $PC.engineering >= 100>> - <br>//You are a master arcology engineer.// + //You are a master arcology engineer.// <<else>> <<if $PC.engineering > 60>> //You are an expert arcology engineer.// @@ -93,12 +91,12 @@ <</if>> <<if $personalAttention == "engineering">> You are training in arcology engineering. - <<elseif $PC.engineering < 100 && $PC.actualAge < $PastPrimeAge>> - <br>[[Hire an engineer to train you in engineering|Main][$personalAttention = "engineering", $personalAttentionChanged = 1]] + <<else>> + [[Hire an engineer to train you in engineering|Main][$personalAttention = "engineering", $personalAttentionChanged = 1]] <</if>> -<</if>> +<</if>><br> <<if $PC.medicine >= 100>> - <br>//You are a master surgeon.// + //You are a master surgeon.// <<else>> <<if $PC.medicine > 60>> //You are an expert surgeon.// @@ -109,12 +107,11 @@ <</if>> <<if $personalAttention == "medicine">> You are training in slave surgery. - <<elseif $PC.medicine < 100 && $PC.actualAge < $PastPrimeAge>>>> - <br>[[Hire a doctor to train you in medicine|Main][$personalAttention = "medicine", $personalAttentionChanged = 1]] + <<else>> + [[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>> +<br>//Training will cost <<print cashFormat(10000)>> per week.//<br><br> <<if ($personalAttentionChanged == 1)>> <<if ($activeSlave.health < -20)>> -- GitLab