diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 120408ce82b0e6f74f311010d4d50ac8d597b730..81292c168e6b19be8554bdf24652c9ccfa52540b 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -191,7 +191,7 @@
<<set _mercMod -= 0.2>>
<<set _SFMod -= 0.2>>
<<set _enemyMod += 0.2>>
- <<set $SecExp.pcWounded = 3>>
+ <<set $PCWounded = 3>>
<</if>>
<<elseif $leadingTroops == "assistant">>
<<if $rep < 10000 && $SecExp.core.authority < 10000>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index bf7ebae515d9b812a70badc38bbf324e74e5c57f..0eee28a4b50208f1eea71cf7cf754f129f53aad9 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -907,7 +907,7 @@
<<if $gainedWarfare == 1>>
Battlefield experience increased your understanding of warfare, making you a better commander.
<</if>>
- <<if $SecExp.pcWounded > 0>>
+ <<if $PCWounded > 0>>
During the fighting @@.red;you were wounded.@@ Your medics assure you it's nothing life threatening, but you'll be weakened for a few weeks.
<</if>>
<<elseif $leadingTroops == "assistant">>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 724050d19ae7f4c4694cb38b668dc20f66edd2e9..3b4a1b751bf6558f13c4e0ceb46ef9391106797c 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -609,7 +609,7 @@
<</if>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully not lethal, wound.
- <<set $SecExp.pcWounded = 3>>
+ <<set $PCWounded = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
@@ -782,7 +782,7 @@
<<set _woundChance *= random(1,2)>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound.
- <<set $SecExp.pcWounded = 3>>
+ <<set $PCWounded = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
@@ -893,7 +893,7 @@
<<set _woundChance *= random(1,2)>>
<<if random(1,100) <= _woundChance>>
A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound.
- <<set $SecExp.pcWounded = 3>>
+ <<set $PCWounded = 3>>
<<else>>
Fortunately you managed to avoid injury.
<</if>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index e36df7f942280584f0e4bcea83cff7bac6c1ec9f..568d6738f74d7c52e175d97c4af4052f5afff93d 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1516,6 +1516,7 @@ You should have received a copy of the GNU General Public License along with thi
/* Security Expansion */
<<set $wasToggledBefore = 0>>
+<<set $PCWounded = 0>>
/* moved first build to post toggle */
/* Career-skill gain */
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 29a2f4951cc777f8219a56051e246e197134133b..edbfebc73cc2d88c9edc7288c63c0c5f87d84f71 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -5,7 +5,7 @@ App.UI.View.MainLinks = function() {
const PA = Array.isArray(V.personalAttention) ? V.personalAttention.map(x => getSlave(x.ID)) : [];
let r = '';
- if (V.SecExp.pcWounded === 1) {
+ if (V.PCWounded === 1) {
r += `The injuries received in the recent battle prevent you from undertaking tiring efforts.`;
} else {
switch (V.personalAttention) {
@@ -76,7 +76,7 @@ App.UI.View.MainLinks = function() {
}
}
- if (V.SecExp.pcWounded !== 1) {
+ if (V.PCWounded !== 1) {
r += ` <span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> <span class="cyan">[A]</span>`;
}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index d9baf702ba37e6dbf4e2fe4133240f6bbc61762c..accd4ab76c803659f0d2afffa7990183505fb2fd 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -466,7 +466,7 @@ window.overpowerCheck = function(slave, PC) {
strength += (185-slave.height);
strength -= (PC.belly/1000);
strength += (PC.warfare/3);
- strength -= (State.variables.SecExp.pcWounded * 15);
+ strength -= (State.variables.PCWounded * 15);
return strength;
};
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 8ea912622245ab46965b185e1c7dd430ebb7c52f..8920faa4787651bf2a1fec04b5266c1c835abcbc 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -22,6 +22,7 @@ PC.pregSource documentation
<<else>>
<<set _badBirth = 10>>
<</if>>
+<<set _wounded = 0>>
<<set $PC.curBabies = WombBirth($PC, 35)>>
<<set _curBabies = $PC.curBabies.length>>
<<set _stilBirth = $PC.womb.length>>
@@ -166,6 +167,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
a big bassinet containing @@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>@@
<</if>>
in $his arms.
+ <<set _wounded = 1>>
<<elseif $HeadGirl != 0>>
<<setLocalPronouns $HeadGirl>>
You keep pushing and pushing, but your child is not coming out.
@@ -182,6 +184,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
are @@.lime;your newborn <<print pregNumberName(_curBabies, 2)>>,@@ <<if $HeadGirl.lactation > 0>>happily nursing from $his breasts,<</if>>
<</if>>
alive and well.
+ <<set _wounded = 1>>
<<elseif _concubinePresent == 1>>
You keep pushing and pushing, but your child is not coming out. <<if canWalk($Concubine)>>In a panic, $Concubine.slaveName carries you to the remote surgery<<else>>The last thing you remember as you fade is $Concubine.slaveName's look of panic<</if>>.
<br><br>
@@ -208,6 +211,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
You don't know how _he2 managed to get you here, since _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you're thankful either way.
<</if>>
<</if>>
+ <<set _wounded = 1>>
<<else>>
You keep pushing and pushing, but your child is not coming out. @@.red;Something is wrong,@@ but you keep persisting.
<<set _gaveBirth = 1>>
@@ -544,6 +548,11 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
You are getting too old to have children; you feel like this may be your last.
<<set $PC.preg = -2>>
<</if>>
+
+ <<if _wounded == 1>>
+ Things didn't quite go as planned, leaving you @@.red;weak and wounded.@@ You'll need a couple weeks to recover from the ordeal before you're back on your feet.
+ <<set $PCWounded = 2>>
+ <</if>>
<</if>> /*closes gaveBirth*/
<</if>> /*closes SE*/
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 327dd97cdc72e182db2d4ac0b7d739b3effbfbc8..1ca3e616211a1920fc0bec8de9d89becb3f2ca16 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -461,6 +461,9 @@
<<set $PC.genes = "XX">>
<</if>>
<</if>>
+<<if ndef $PCWounded>>
+ <<set $PCWounded = 0>>
+<</if>>
<<if ndef $NPCSexSupply>>
<<set $NPCSexSupply = {lowerClass: 3000}>>
<</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 3e1fd36790884dad2a46b334adaa85c3433921c5..e73de6cd4609f083d944251a6253fb160f63f0a1 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -196,7 +196,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<set $activeSlave = $slaves.random()>>
<<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
- <br>//<span id="walk"><<include "Walk Past">></span>//
+ <br>//<span id="walk"><<= walkPast($activeSlave)>></span>//
<</if>>
<<if ($debugMode == 1)>>
//| [[Show all walk past scenes|Walk Past List]]//
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 3ca92a65b6b8729bed62fbd97ae34d38861830b1..d08217cb045c46527939186e1a27b678de0961d3 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -2,19 +2,6 @@
<<if $useTabs == 0>>__Personal Business__<</if>>
<br>
-<<if $secExpEnabled == 1>>
- <<if $SecExp.pcWounded > 0>>
- <<set $SecExp.pcWounded-->>
- The injuries received in the recent battle prevents you from engaging in tiring endeavors.
- <<if $SecExp.pcWounded > 1>>
- Your trusted physician believes it will still take a few weeks to fully recover.
- <<elseif $SecExp.pcWounded == 1>>
- You are starting to feel better. It's very likely you will be back to full working order within the next week.
- <<else>>
- You have finally recovered from your injuries.
- <</if>>
- <</if>>
-<</if>>
<<if $cash < 0>>
<<set _cashX = cashX(forceNeg(1+Math.trunc(Math.abs($cash)/100)), "personalBusiness")>>
@@ -40,8 +27,18 @@
<<set $gameover = "debt">><<goto "Gameover">>
<</if>>
<</if>>
-<<elseif $secExpEnabled > 0 && def $SecExp.pcWounded>>
- /* does nothing for this week */
+<<elseif $PCWounded>>
+ <<if $PCWoundedWounded > 0>>
+ <<set $PCWoundedWounded-->>
+ The injuries received in the recent battle prevents you from engaging in tiring endeavors.
+ <<if $PCWounded > 1>>
+ Your trusted physician believes it will still take a few weeks to fully recover.
+ <<elseif $PCWounded == 1>>
+ You are starting to feel better. It's very likely you will be back to full working order within the next week.
+ <<else>>
+ You have finally recovered from your injuries.
+ <</if>>
+ <</if>>
<<elseif ($personalAttention == "whoring")>>
<<set _income = random(2000,4500)>>
<<if $PC.belly >= 1500>>
@@ -403,253 +400,253 @@
/* <<set _X = 0>> */
/* <</if>> */
-<<if $SecExp.pcWounded == 0>>
-<<switch $personalAttention>>
-<<case "trading">>
- <<set _oldSkill = $PC.trading>>
- <<if _X == 1>>
- <<set $PC.trading += _Cal>>
- <<else>>
- <<set $PC.trading -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.trading > 10>>
- You now have @@.green;basic knowledge@@ about how to be a venture capitalist.
- <<else>>
- You have made progress towards a basic knowledge of venture capitalism.
- <</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.trading > 30>>
- You now have @@.green;some skill@@ as a venture capitalist.
- <<else>>
- You have made progress towards being skilled in venture capitalism.
- <</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.trading > 60>>
- You are now an @@.green;expert venture capitalist.@@
+<<if $PCWounded == 0>>
+ <<switch $personalAttention>>
+ <<case "trading">>
+ <<set _oldSkill = $PC.trading>>
+ <<if _X == 1>>
+ <<set $PC.trading += _Cal>>
<<else>>
- You have made progress towards being an expert in venture capitalism.
+ <<set $PC.trading -= _Cal>>
<</if>>
- <<else>>
- <<if $PC.trading >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master venture capitalist.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.trading > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a venture capitalist.
+ <<else>>
+ You have made progress towards a basic knowledge of venture capitalism.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.trading > 30>>
+ You now have @@.green;some skill@@ as a venture capitalist.
+ <<else>>
+ You have made progress towards being skilled in venture capitalism.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.trading > 60>>
+ You are now an @@.green;expert venture capitalist.@@
+ <<else>>
+ You have made progress towards being an expert in venture capitalism.
+ <</if>>
<<else>>
- You have made progress towards mastering venture capitalism.
+ <<if $PC.trading >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master venture capitalist.@@
+ <<else>>
+ You have made progress towards mastering venture capitalism.
+ <</if>>
<</if>>
- <</if>>
-<<case "warfare">>
- <<set _oldSkill = $PC.warfare>>
- <<if _X == 1>>
- <<set $PC.warfare += _Cal>>
- <<else>>
- <<set $PC.warfare -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.warfare > 10>>
- You now have @@.green;basic knowledge@@ about how to be a mercenary.
- <<else>>
- You have made progress towards a basic knowledge of mercenary work.
- <</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.warfare > 30>>
- You now have @@.green;some skill@@ as a mercenary.
- <<else>>
- You have made progress towards being skilled in mercenary work.
- <</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.warfare > 60>>
- You are now an @@.green;expert mercenary.@@
+ <<case "warfare">>
+ <<set _oldSkill = $PC.warfare>>
+ <<if _X == 1>>
+ <<set $PC.warfare += _Cal>>
<<else>>
- You have made progress towards being an expert in mercenary work.
+ <<set $PC.warfare -= _Cal>>
<</if>>
- <<else>>
- <<if $PC.warfare >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master mercenary.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.warfare > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a mercenary.
+ <<else>>
+ You have made progress towards a basic knowledge of mercenary work.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.warfare > 30>>
+ You now have @@.green;some skill@@ as a mercenary.
+ <<else>>
+ You have made progress towards being skilled in mercenary work.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.warfare > 60>>
+ You are now an @@.green;expert mercenary.@@
+ <<else>>
+ You have made progress towards being an expert in mercenary work.
+ <</if>>
<<else>>
- You have made progress towards mastering mercenary work.
+ <<if $PC.warfare >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master mercenary.@@
+ <<else>>
+ You have made progress towards mastering mercenary work.
+ <</if>>
<</if>>
- <</if>>
-<<case "slaving">>
- <<set _oldSkill = $PC.slaving>>
- <<if _X == 1>>
- <<set $PC.slaving += _Cal>>
- <<else>>
- <<set $PC.slaving -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.slaving > 10>>
- You now have @@.green;basic knowledge@@ about how to be a slaver.
- <<else>>
- You have made progress towards a basic knowledge of slaving.
- <</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.slaving > 30>>
- You now have @@.green;some skill@@ as a slaver.
+ <<case "slaving">>
+ <<set _oldSkill = $PC.slaving>>
+ <<if _X == 1>>
+ <<set $PC.slaving += _Cal>>
<<else>>
- You have made progress towards being skilled in slaving.
+ <<set $PC.slaving -= _Cal>>
<</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.slaving > 60>>
- You are now an @@.green;expert slaver.@@
- <<else>>
- You have made progress towards being an expert in slaving.
- <</if>>
- <<else>>
- <<if $PC.slaving >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master slaver.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.slaving > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a slaver.
+ <<else>>
+ You have made progress towards a basic knowledge of slaving.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.slaving > 30>>
+ You now have @@.green;some skill@@ as a slaver.
+ <<else>>
+ You have made progress towards being skilled in slaving.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.slaving > 60>>
+ You are now an @@.green;expert slaver.@@
+ <<else>>
+ You have made progress towards being an expert in slaving.
+ <</if>>
<<else>>
- You have made progress towards mastering slaving.
+ <<if $PC.slaving >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master slaver.@@
+ <<else>>
+ You have made progress towards mastering slaving.
+ <</if>>
<</if>>
- <</if>>
-<<case "engineering">>
- <<set _oldSkill = $PC.engineering>>
- <<if _X == 1>>
- <<set $PC.engineering += _Cal>>
- <<else>>
- <<set $PC.engineering -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.engineering > 10>>
- You now have @@.green;basic knowledge@@ about how to be an arcology engineer.
- <<else>>
- You have made progress towards a basic knowledge of arcology engineering.
- <</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.engineering > 30>>
- You now have @@.green;some skill@@ as an arcology engineer.
+ <<case "engineering">>
+ <<set _oldSkill = $PC.engineering>>
+ <<if _X == 1>>
+ <<set $PC.engineering += _Cal>>
<<else>>
- You have made progress towards being skilled in arcology engineering.
+ <<set $PC.engineering -= _Cal>>
<</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.engineering > 60>>
- You are now an @@.green;expert arcology engineer.@@
- <<else>>
- You have made progress towards being an expert in arcology engineering.
- <</if>>
- <<else>>
- <<if $PC.engineering >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master arcology engineer.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.engineering > 10>>
+ You now have @@.green;basic knowledge@@ about how to be an arcology engineer.
+ <<else>>
+ You have made progress towards a basic knowledge of arcology engineering.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.engineering > 30>>
+ You now have @@.green;some skill@@ as an arcology engineer.
+ <<else>>
+ You have made progress towards being skilled in arcology engineering.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.engineering > 60>>
+ You are now an @@.green;expert arcology engineer.@@
+ <<else>>
+ You have made progress towards being an expert in arcology engineering.
+ <</if>>
<<else>>
- You have made progress towards mastering arcology engineering.
+ <<if $PC.engineering >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master arcology engineer.@@
+ <<else>>
+ You have made progress towards mastering arcology engineering.
+ <</if>>
<</if>>
- <</if>>
-<<case "medicine">>
- <<set _oldSkill = $PC.medicine>>
- <<if _X == 1>>
- <<set $PC.medicine += _Cal>>
- <<else>>
- <<set $PC.medicine -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.medicine > 10>>
- You now have @@.green;basic knowledge@@ about how to be a slave surgeon.
+ <<case "medicine">>
+ <<set _oldSkill = $PC.medicine>>
+ <<if _X == 1>>
+ <<set $PC.medicine += _Cal>>
<<else>>
- You have made progress towards a basic knowledge of slave surgery.
+ <<set $PC.medicine -= _Cal>>
<</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.medicine > 30>>
- You now have @@.green;some skill@@ as a slave surgeon.
- <<else>>
- You have made progress towards being skilled in slave surgery.
- <</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.medicine > 60>>
- You are now an @@.green;expert slave surgeon.@@
- <<else>>
- You have made progress towards being an expert in slave surgery.
- <</if>>
- <<else>>
- <<if $PC.medicine >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master slave surgeon.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.medicine > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a slave surgeon.
+ <<else>>
+ You have made progress towards a basic knowledge of slave surgery.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.medicine > 30>>
+ You now have @@.green;some skill@@ as a slave surgeon.
+ <<else>>
+ You have made progress towards being skilled in slave surgery.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.medicine > 60>>
+ You are now an @@.green;expert slave surgeon.@@
+ <<else>>
+ You have made progress towards being an expert in slave surgery.
+ <</if>>
<<else>>
- You have made progress towards mastering slave surgery.
+ <<if $PC.medicine >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master slave surgeon.@@
+ <<else>>
+ You have made progress towards mastering slave surgery.
+ <</if>>
<</if>>
- <</if>>
-<<case "hacking">>
- <<set _oldSkill = $PC.hacking>>
- <<if _X == 1>>
- <<set $PC.hacking += _Cal>>
- <<else>>
- <<set $PC.hacking -= _Cal>>
- <</if>>
- <<if _oldSkill <= 10>>
- <<if $PC.hacking > 10>>
- You now have @@.green;basic knowledge@@ about how to hack and manipulate data.
+ <<case "hacking">>
+ <<set _oldSkill = $PC.hacking>>
+ <<if _X == 1>>
+ <<set $PC.hacking += _Cal>>
<<else>>
- You have made progress towards a basic knowledge of hacking and data manipulation.
+ <<set $PC.hacking -= _Cal>>
<</if>>
- <<elseif _oldSkill <= 30>>
- <<if $PC.hacking > 30>>
- You now have @@.green;some skill@@ as a hacker.
- <<else>>
- You have made progress towards being skilled in hacking and data manipulation.
- <</if>>
- <<elseif _oldSkill <= 60>>
- <<if $PC.hacking > 60>>
- You are now an @@.green;expert hacker.@@
- <<else>>
- You have made progress towards being an expert in hacking and data manipulation.
- <</if>>
- <<else>>
- <<if $PC.hacking >= 100>>
- <<set $personalAttention = "sex">>
- You are now a @@.green;master hacker.@@
+ <<if _oldSkill <= 10>>
+ <<if $PC.hacking > 10>>
+ You now have @@.green;basic knowledge@@ about how to hack and manipulate data.
+ <<else>>
+ You have made progress towards a basic knowledge of hacking and data manipulation.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.hacking > 30>>
+ You now have @@.green;some skill@@ as a hacker.
+ <<else>>
+ You have made progress towards being skilled in hacking and data manipulation.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.hacking > 60>>
+ You are now an @@.green;expert hacker.@@
+ <<else>>
+ You have made progress towards being an expert in hacking and data manipulation.
+ <</if>>
<<else>>
- You have made progress towards mastering hacking and data manipulation.
+ <<if $PC.hacking >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master hacker.@@
+ <<else>>
+ You have made progress towards mastering hacking and data manipulation.
+ <</if>>
<</if>>
- <</if>>
-<<case "technical accidents">> /* needs work */
- <<set _windfall = (150*$PC.hacking)+random(100,2500), _X = 0>>
- <<if $PC.hacking == -100>>
- <<set _Catchtchance = 10>>
- <<elseif $PC.hacking <= -75>>
- <<set _Catchtchance = 30>>
- <<elseif $PC.hacking <= -50>>
- <<set _Catchtchance = 40>>
- <<elseif $PC.hacking <= -25>>
- <<set _Catchtchance = 45>>
- <<elseif $PC.hacking == 0>>
- <<set _Catchtchance = 50>>
- <<elseif $PC.hacking <= 25>>
- <<set _Catchtchance = 60>>
- <<elseif $PC.hacking <= 50>>
- <<set _Catchtchance = 70>>
- <<elseif $PC.hacking <= 75>>
- <<set _Catchtchance = 85>>
- <<elseif $PC.hacking >= 100>>
- <<set _Catchtchance = 100>>
- <</if>>
- This week your services to the highest bidder earned you @@.yellowgreen;<<print cashFormat(_windfall)>>.@@
- <<if random(0,100) >= _Catchtchance>>
- However, since the source of the attack was traced back to your arcology, your
- <<if $secExpEnabled == 1>> <<set _X = 1>>
- @@.red;authority,@@ <<set $SecExp.core.authority -= random(100,500)>> @@.red;crime rate@@ <<set $SecExp.core.crimeLow += random(10,25)>> and
+ <<case "technical accidents">> /* needs work */
+ <<set _windfall = (150*$PC.hacking)+random(100,2500), _X = 0>>
+ <<if $PC.hacking == -100>>
+ <<set _Catchtchance = 10>>
+ <<elseif $PC.hacking <= -75>>
+ <<set _Catchtchance = 30>>
+ <<elseif $PC.hacking <= -50>>
+ <<set _Catchtchance = 40>>
+ <<elseif $PC.hacking <= -25>>
+ <<set _Catchtchance = 45>>
+ <<elseif $PC.hacking == 0>>
+ <<set _Catchtchance = 50>>
+ <<elseif $PC.hacking <= 25>>
+ <<set _Catchtchance = 60>>
+ <<elseif $PC.hacking <= 50>>
+ <<set _Catchtchance = 70>>
+ <<elseif $PC.hacking <= 75>>
+ <<set _Catchtchance = 85>>
+ <<elseif $PC.hacking >= 100>>
+ <<set _Catchtchance = 100>>
+ <</if>>
+ This week your services to the highest bidder earned you @@.yellowgreen;<<print cashFormat(_windfall)>>.@@
+ <<if random(0,100) >= _Catchtchance>>
+ However, since the source of the attack was traced back to your arcology, your
+ <<if $secExpEnabled == 1>> <<set _X = 1>>
+ @@.red;authority,@@ <<set $SecExp.core.authority -= random(100,500)>> @@.red;crime rate@@ <<set $SecExp.core.crimeLow += random(10,25)>> and
+ <</if>>
+ @@.red;reputation@@ <<run repX(forceNeg(random(50,500)), "event")>>
+ <<if _X != 1>>
+ has
+ <<else>>
+ have all
+ <</if>>
+ been negatively affected.
<</if>>
- @@.red;reputation@@ <<run repX(forceNeg(random(50,500)), "event")>>
- <<if _X != 1>>
- has
- <<else>>
- have all
+ <<if $PC.hacking < 100>>
+ <<= IncreasePCSkills('hacking', 0.5)>>
<</if>>
- been negatively affected.
- <</if>>
- <<if $PC.hacking < 100>>
- <<= IncreasePCSkills('hacking', 0.5)>>
- <</if>>
- <<run cashX(_windfall, "personalBusiness")>>
+ <<run cashX(_windfall, "personalBusiness")>>
-<</switch>>
+ <</switch>>
<</if>>
<<if $CashForRep == 1>>