From 1c233613366b996c5db1b152bfd15c69dc19009c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 11 Mar 2018 21:15:20 -0400
Subject: [PATCH] Manual merge of !1509 and other little fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +++
devNotes/twine JS | 2 +-
src/SecExp/attackReport.tw | 10 +++++
src/SecExp/authorityReport.tw | 3 ++
src/SecExp/tradeReport.tw | 2 +-
src/SecExp/widgets/miscSecExpWidgets.tw | 2 +-
....tw => Hair_Fore_Shaved_Sides_Old_copy.tw} | 0
src/events/intro/initNationalities.tw | 6 ++-
src/events/intro/introSummary.tw | 29 +++++++++-----
src/events/intro/pcExperienceIntro.tw | 2 +
src/npc/rgASDump.tw | 5 +++
src/npc/startingGirls/startingGirls.tw | 16 ++++++++
src/npc/takeoverTarget.tw | 26 +++++++++++-
src/pregmod/pRaped.tw | 10 +++++
src/uncategorized/BackwardsCompatibility.tw | 2 +
src/uncategorized/genericPlotEvents.tw | 40 ++++++++++++++++++-
src/uncategorized/pHostageAcquisition.tw | 2 +
src/uncategorized/pRivalryHostage.tw | 12 ++++++
src/uncategorized/persBusiness.tw | 23 +++++++++++
src/uncategorized/personalAttentionSelect.tw | 2 +-
src/uncategorized/reputation.tw | 5 ++-
src/uncategorized/saGuardsYou.tw | 3 +-
src/uncategorized/seIndependenceDay.tw | 2 +
src/utility/descriptionWidgets.tw | 1 +
src/utility/slaveCreationWidgets.tw | 2 +
25 files changed, 191 insertions(+), 22 deletions(-)
rename src/art/vector_revamp/layers/{Hair_Fore_Shaved_Sides_Old_ copy.tw => Hair_Fore_Shaved_Sides_Old_copy.tw} (100%)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dee9e56c2a0..1be232c5a99 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.0/1
+3/11/2018
+
+ 392
+ -SFanon's PC cheat menu
+ -fixes to sellSlave and slaveSold
+
3/10/2018
391
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 41976f3ee94..f1c4d366e2c 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -7501,7 +7501,7 @@ window.todaysOutfit = function(slave) {
} else if(ArcologyZero.FSChineseRevivalist > 0) {
wardrobeFS.push({text: "and wears a brief qipao to show off and look Chinese at the same time.", clothes: "a slutty qipao"});
} else if(ArcologyZero.FSAztecRevivalist > 0) {
- wardrobeFS.push({text: "and drapes a huipil over herself to to fit in with your Aztec revivalism.", clothes: "a huipil"});
+ wardrobeFS.push({text: "and drapes a huipil over herself to fit in with your Aztec revivalism.", clothes: "a huipil"});
}
if(ArcologyZero.FSGenderFundamentalist > 0) {
wardrobeFS.push({text: "and wears a cheerleader outfit to look like a hot slut.", clothes: "a cheerleader outfit"});
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 9a9f768eea4..5f57a4812b3 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -799,6 +799,8 @@
and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
<<elseif $PC.career == "servant">>
and they do little to hide their disgust at being ordered around by an ex-servant.
+ <<elseif $PC.career == "BlackHat">>
+ and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
<<else>>
.
<</if>>
@@ -810,6 +812,8 @@
and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
<<elseif $PC.career == "servant">>
and they do little to hide their disgust at being ordered around by an ex-servant.
+ <<elseif $PC.career == "BlackHat">>
+ and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
<<else>>
.
<</if>>
@@ -821,6 +825,8 @@
, unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
<<elseif $PC.career == "servant">>
, unfortunately some still resent the fact they are ordered around by an ex-servant.
+ <<elseif $PC.career == "BlackHat">>
+ , unfortunately some still resent the fact they are ordered around by an unscrupulous hacker.
<<else>>
.
<</if>>
@@ -832,6 +838,8 @@
, unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
<<elseif $PC.career == "servant">>
, unfortunately some still resent the fact they are ordered around by an ex-servant.
+ <<elseif $PC.career == "BlackHat">>
+ , unfortunately some still resent the fact they are ordered around by a dubious incursion specialist.
<<else>>
.
<</if>>
@@ -849,6 +857,8 @@
The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of an ex-servant.
<<elseif $PC.career == "escort">>
The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of an ex-escort.
+ <<elseif $PC.career == "BlackHat">>
+ The soldiers of the $securityForceName, as loyal as they are, are not enthusiastic to follow the orders of a dubious incursion specialist.
<</if>>
<</if>>
<<if $PC.warfare <= 25 && $PC.warfare > 10>>
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index b96d4b25a34..bd283d1389e 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -29,6 +29,9 @@
<<elseif $PC.career == "servant">>
Given your past career as a servant, you find it hard to assert your authority over the arcology and its inhabitants.
<<set _authGrowth -= 10 * random(5,15)>>
+<<elseif $PC.career == "BlackHat">>
+ Given your past career as a, rather questionable, incursion specialist, you find it hard to assert your authority over the arcology and its inhabitants, despite what you may know about them.
+ <<set _authGrowth -= 10 * random(5,15)>>
<<elseif $PC.career == "gang">>
Given your past life as a gang leader, you find it easier to assert your authority over the arcology and its inhabitants.
<<set _authGrowth += 10 * random(5,15)>>
diff --git a/src/SecExp/tradeReport.tw b/src/SecExp/tradeReport.tw
index ccb8da4dbc7..ccd0c030a58 100644
--- a/src/SecExp/tradeReport.tw
+++ b/src/SecExp/tradeReport.tw
@@ -33,7 +33,7 @@
<<set _tradeChange -= 0.5>>
<</if>>
-<<if $PC.career == "wealth" || $PC.career == "capitalist" || $PC.career == "celebrity">>
+<<if $PC.career == "wealth" || $PC.career == "capitalist" || $PC.career == "celebrity" || $PC.career == "BlackHat">>
<<set _tradeChange += 1>>
<<elseif $PC.career == "escort" || $PC.career == "servant" || $PC.career == "gang">>
<<set _tradeChange -= 0.5>>
diff --git a/src/SecExp/widgets/miscSecExpWidgets.tw b/src/SecExp/widgets/miscSecExpWidgets.tw
index 89af1a1ee9a..a01a9733a04 100644
--- a/src/SecExp/widgets/miscSecExpWidgets.tw
+++ b/src/SecExp/widgets/miscSecExpWidgets.tw
@@ -9,7 +9,7 @@
<<if $terrain == "ravine">>
<<set _initialTrade -= random(5)>>
<</if>>
- <<if $PC.career == "wealth" || $PC.career == "capitalist" || $PC.career == "celebrity">>
+ <<if $PC.career == "wealth" || $PC.career == "capitalist" || $PC.career == "celebrity" || $PC.career == "BlackHat">>
<<set _initialTrade += random(5)>>
<<elseif $PC.career == "escort" || $PC.career == "servant" || $PC.career == "gang">>
<<set _initialTrade -= random(5)>>
diff --git a/src/art/vector_revamp/layers/Hair_Fore_Shaved_Sides_Old_ copy.tw b/src/art/vector_revamp/layers/Hair_Fore_Shaved_Sides_Old_copy.tw
similarity index 100%
rename from src/art/vector_revamp/layers/Hair_Fore_Shaved_Sides_Old_ copy.tw
rename to src/art/vector_revamp/layers/Hair_Fore_Shaved_Sides_Old_copy.tw
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 594304f73c7..e135b73a840 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -38,8 +38,10 @@
<<elseif $PC.career == "servant">>
<<set $trinkets.push("a framed picture of your late Master")>>
<<elseif $PC.career == "gang">>
-<<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
-<<set $minimumSlaveCost -= 1000>>
+ <<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
+ <<set $minimumSlaveCost -= 1000>>
+<<elseif $PC.career == "BlackHat">>
+ <<set $trinkets.push("a news clipping of your first successful live hack")>>
<</if>>
<<if $PC.rumor == "wealth">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 9918b52de44..87c95978d53 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -574,28 +574,30 @@ __''Player Character''__
<<switch $PC.career>>
<<case "capitalist">>
- <<set $PCCreationCareer = "business leader">>
+ <<set $PCCreationCareer = "a business leader">>
<<case "mercenary">>
- <<set $PCCreationCareer = "mercenary">>
+ <<set $PCCreationCareer = "a mercenary">>
<<case "slaver">>
- <<set $PCCreationCareer = "slaver">>
+ <<set $PCCreationCareer = "a slaver">>
<<case "engineer">>
- <<set $PCCreationCareer = "engineer">>
+ <<set $PCCreationCareer = "an engineer">>
<<case "medicine">>
- <<set $PCCreationCareer = "doctor">>
+ <<set $PCCreationCareer = "a doctor">>
<<case "celebrity">>
- <<set $PCCreationCareer = "minor celebrity">>
+ <<set $PCCreationCareer = "a minor celebrity">>
<<case "escort">>
- <<set $PCCreationCareer = "escort">>
+ <<set $PCCreationCareer = "an escort">>
<<case "servant">>
- <<set $PCCreationCareer = "servant">>
+ <<set $PCCreationCareer = "a servant">>
<<case "gang">>
- <<set $PCCreationCareer = "gang leader">>
+ <<set $PCCreationCareer = "a gang leader">>
+ <<case "BlackHat">>
+ <<set $PCCreationCareer = "an incursion specialist">>
<<default>>
- <<set $PCCreationCareer = "member of the idle wealthy">>
+ <<set $PCCreationCareer = "a member of the idle wealthy">>
<</switch>>
<br>
- Before you came to the free cities, you were a ''$PCCreationCareer'' and it is rumoured that you acquired your arcology through ''$PC.rumor''.
+ Before you came to the free cities, you were ''$PCCreationCareer'' and it is rumoured that you acquired your arcology through ''$PC.rumor''.
<br>__Past career:__
<<if $PC.career != "arcology owner">>
@@ -605,6 +607,7 @@ __''Player Character''__
[[slaver|Intro Summary][$PC.career = "slaver"]] |
[[engineer|Intro Summary][$PC.career = "engineer"]] |
[[doctor|Intro Summary][$PC.career = "medicine"]] |
+ [[hacker|Intro Summary][$PC.career = "BackHat"]] |
[[minor celebrity|Intro Summary][$PC.career = "celebrity"]] |
[[escort|Intro Summary][$PC.career = "escort"]] |
[[servant|Intro Summary][$PC.career = "servant"]] |
@@ -783,6 +786,8 @@ __''Player Character''__
Prior to being an arcology owner, you were a surgeon.
<<case "celebrity">>
Prior to being an arcology owner, you were a minor celebrity.
+ <<case "BlackHat">>
+ Prior to being an arcology owner, you specialized in cracking databases and making mockeries of cyber security.
<<case "arcology owner">>
Being an arcology owner defines your life now.
<<case "escort">>
@@ -993,6 +998,8 @@ __''Mods''__
<<set $PC.engineering = 100>>
<<case "medicine">>
<<set $PC.medicine = 100>>
+ <<case "BlackHat">>
+ <<set $PC.hacking = 100>>
<<case "arcology owner">>
<<set $PC.trading = 100, $PC.warfare = 100, $PC.hacking = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<<case "escort">>
diff --git a/src/events/intro/pcExperienceIntro.tw b/src/events/intro/pcExperienceIntro.tw
index 70dfa2e3231..f64d14795e1 100644
--- a/src/events/intro/pcExperienceIntro.tw
+++ b/src/events/intro/pcExperienceIntro.tw
@@ -27,6 +27,8 @@ You're a relative unknown in the Free Cities, but it's clear you're already acco
<br> //As an ex-servant, you will find it hard to maintain reputation<<if $showSecExp == 1>> and authority<</if>>. You know how to lower your upkeep, but not conduct business. Your starting slaves will have free trust and devotion.//
<br>[[Gang Leader|PC Rumor Intro][$PC.career = "gang"]]
<br> //As a gang leader, you know how to haggle slaves<<if $showSecExp == 1>> and assert your authority. Plus upgrades in the security HQ will be cheaper<</if>>, but you will find reputation quite hard to maintain. Your starting slaves will be fitter and posses a free level of combat skill.//
+<br>[[Incursion Specialist|PC Rumor Intro][$PC.career = "BlackHat"]]
+<br> //As a hacker for hire, you know how to gain access computer systems and other devices. Certain upgrades may be cheaper, and you may find alternative approaches to problems<<if $showSecExp == 1>><</if>>, but you will find authority quite hard to maintain<</if>>. Your starting slaves will have a free level of intelligence//
<</if>>
diff --git a/src/npc/rgASDump.tw b/src/npc/rgASDump.tw
index da07cf54af7..0b3a6b42ad9 100644
--- a/src/npc/rgASDump.tw
+++ b/src/npc/rgASDump.tw
@@ -55,6 +55,11 @@
<<if $activeSlave.combatSkill < 1>>
<<set $activeSlave.combatSkill += 1>>
<</if>>
+ <<elseif $PC.career == "BlackHat">>
+ <<set $activeSlave.intelligence++>>
+ <<if $activeSlave.intelligence > 3>>
+ <<set $activeSlave.intelligence = 3>>
+ <</if>>
<<elseif $PC.career == "escort">>
<<if $activeSlave.entertainSkill < 60>>
<<set $activeSlave.entertainSkill += 20>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 1ff850faccd..4580b205796 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -320,6 +320,20 @@ __You are customizing this slave:__
<<set $activeSlave.origin = "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">>
<<set $activeSlave.customTat = "She has a small tattoo of a winning hand of cards on the nape of her neck.">>
<</if>>
+ <<elseif $PC.career == "BlackHat">>
+ <<if $activeSlave.mother == -1 && $activeSlave.father == -1>>
+ <<set $activeSlave.origin = "She was the result of a night of hard celebration after a big score under the glow of monitors and the calming hum of 750 RPM fans. It took quite abit of alcohol to come to terms with drunkenly knocking yourself up.">>
+ <<set $activeSlave.customTat = "She has your former digial calling card tattooed on her neck.">>
+ <<elseif $activeSlave.mother == -1>>
+ <<set $activeSlave.origin = "She was the result of an intruder brute forcing your firewall, overloading your pleasure sensors, and allowing a corrupted packet to slip by. With a quick wipe of your RAM and cache with some pwerful liquor, you have no idea who planted her in your womb.">>
+ <<set $activeSlave.customTat = "She has your former digial calling card tattooed on her neck.">>
+ <<elseif $activeSlave.father == -1>>
+ <<set $activeSlave.origin = "She was born out of a trade for secure data access. Nine months later, your daughter was born.">>
+ <<set $activeSlave.customTat = "She has your former digial calling card tattooed on her neck.">>
+ <<else>>
+ <<set $activeSlave.origin = "She was a case officer you captured after going dark.">>
+ <<set $activeSlave.customTat = "She has your former digial calling card tattooed on her neck.">>
+ <</if>>
<<else>>
<<set $activeSlave.origin = "You won her at cards, a memento from your life as one of the idle rich before you became an arcology owner.">>
<<set $activeSlave.customTat = "She has the silhouette of an arcology tattooed on the nape of her neck.">>
@@ -1458,6 +1472,8 @@ Her nationality is $activeSlave.nationality.
@@.green;+5 health@@ and one free level of @@.cyan;combat skill.@@
<<elseif $PC.career == "wealth">>
two free levels of @@.cyan;sex skills.@@
+ <<elseif $PC.career == "BlackHat">>
+ one free level of @@.cyan;intelligence.@@
<<else>>
@@.hotpink;+10 devotion,@@ one free level of @@.cyan;prostitution skill@@ and @@.cyan;entertainment skill,@@ and two free levels of @@.cyan;sex skills.@@
<</if>>//
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 8f8f2b1e043..4e19234fc50 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -2,7 +2,31 @@
<<set $ui = "start", $showBodyMods = 1>>
-Before you deploy the <<if $PC.rumor == "wealth">>financial reserves that<<elseif $PC.rumor == "diligence">>carefully constructed plan that<<elseif $PC.rumor == "force">>mercenaries and <<if $continent == "Europe">>//maskirovka//<<else>>cover plan<</if>> that<<elseif $PC.rumor == "social engineering">>clever social manipulation that<<else>>optimistic plan you hope<</if>> will allow you to take over an arcology, you need to select a target. There are a number of vulnerable arcologies that you could <<if $PC.rumor == "wealth">>attempt a hostile takeover of<<elseif $PC.rumor == "diligence">>work to take over<<elseif $PC.rumor == "force">>attack<<elseif $PC.rumor == "social engineering">>infiltrate<<else>>aspire to take over<</if>> with a reasonable chance of success. Free Cities are volatile places, even compared to the troubled state of the rest of the world. There are always arcologies whose owners are on the brink of failure, and you could target one of them.
+Before you deploy the
+<<if $PC.rumor == "wealth">>
+ financial reserves that
+<<elseif $PC.rumor == "diligence">>
+ carefully constructed plan that
+<<elseif $PC.rumor == "force">>
+ mercenaries and <<if $continent == "Europe">>//maskirovka//<<else>>cover plan<</if>> that
+<<elseif $PC.rumor == "social engineering">>
+ clever social manipulation that
+<<else>>
+ optimistic plan you hope
+<</if>>
+will allow you to take over an arcology, you need to select a target. There are a number of vulnerable arcologies that you could
+<<if $PC.rumor == "wealth">>
+ attempt a hostile takeover of
+<<elseif $PC.rumor == "diligence">>
+ work to take over
+<<elseif $PC.rumor == "force">>
+ attack
+<<elseif $PC.rumor == "social engineering">>
+ infiltrate
+<<else>>
+ aspire to take over
+<</if>>
+with a reasonable chance of success. Free Cities are volatile places, even compared to the troubled state of the rest of the world. There are always arcologies whose owners are on the brink of failure, and you could target one of them.
<<if $PC.career == "arcology owner">>(Since you've @@.springgreen;owned an arcology before,@@ you identify more potential target arcologies than a novice might.)<</if>>
Alternatively, arcologies are being built every day, and their owners' control is often uncertain. @@.orange;Which arcology will you target?@@
<br><br>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 2a7da8b21fc..d7e7de82afc 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -94,6 +94,16 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<<if $PC.dick > 0>>
"When your master first undressed you, what did he think of his 'girl'?" He mocks as he flicks the tip of your stiffening cock.
<</if>>
+<<case "BlackHat">>
+ <<if $PC.boobs > 0>>
+ "Nice and supple, what are the odds that I can find these babies on the internet?" He smirks as he gropes your breasts.
+ <</if>>
+ <<if $PC.preg >= 20 || $PC.belly >= 5000>>
+ "You'd think someone so skilled at breaking security would understand protection themselves. Or did you trade your pussy for information?" He chuckles as he rubs your pregnant belly.
+ <</if>>
+ <<if $PC.dick > 0>>
+ "Trying to catch a signal with that?" He mocks as he flicks the tip of your stiffening cock.
+ <</if>>
<</switch>>
Finally he reaches your moistening pussy. "Already wet are we? Glad you know your place." He states as he pulls your clothes off and bends you over.
<br><br>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 60cc112a0bd..d47fa344ceb 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2032,6 +2032,8 @@ Setting missing global variables:
<<set $trinkets.push("a framed picture of your late Master")>>
<<elseif $PC.career == "gang">>
<<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
+ <<elseif $PC.career == "BlackHat">>
+ <<set $trinkets.push("a news clipping of your first successful live hack")>>
<</if>>
<</if>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 03861cb1415..bf3008f519b 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -453,7 +453,45 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
As a society free of the encumbrance of governmental oversight, the arcologies of the Free Cities are places where societal evolution and corporate expansion can occur rapidly.
-Even so, the incredible speed with which the arcology has improved under your tenure as compared to that of your predecessor, after you obtained ownership through <<if $PC.rumor == "wealth">>a leveraged buyout,<<elseif $PC.rumor == "diligence">>hard work and competence,<<elseif $PC.rumor == "force">>some episodes of violence,<<elseif $PC.rumor == "social engineering">>the creative use of psychology,<<elseif $PC.rumor == "luck">>an incredible opportunity,<</if>> is nothing short of astonishing. Other arcologies have taken many years to develop along anything but strictly conservative lines, and you are not the only arcology owner with a background <<if $PC.career == "wealth">>of substantial wealth.<<elseif $PC.career == "capitalist">>in business.<<elseif $PC.career == "mercenary">>in the world of private contracting.<<elseif $PC.career == "slaver">>as a slavebreaker.<<elseif $PC.career == "engineer">>in arcology engineering.<<elseif $PC.career == "medicine">>in medicine and surgery.<<elseif $PC.career == "celebrity">>in the public sphere.<<elseif $PC.career == "escort">>involving many personal contacts.<<elseif $PC.career == "servant">>involving the rich and powerful.<<elseif $PC.career == "gang">>involving gangs.<<else>>in the Free Cities.<</if>> It occurs to you that the arcology's growing role as a place where those with the means to do so can live in the society you have created, enjoying themselves and their lives to the fullest while subjugating others, should be commemorated.
+Even so, the incredible speed with which the arcology has improved under your tenure as compared to that of your predecessor, after you obtained ownership through
+<<if $PC.rumor == "wealth">>
+ a leveraged buyout,
+<<elseif $PC.rumor == "diligence">>
+ hard work and competence,
+<<elseif $PC.rumor == "force">>
+ some episodes of violence,
+<<elseif $PC.rumor == "social engineering">>
+ the creative use of psychology,
+<<elseif $PC.rumor == "luck">>
+ an incredible opportunity,
+<</if>>
+is nothing short of astonishing. Other arcologies have taken many years to develop along anything but strictly conservative lines, and you are not the only arcology owner with a background
+<<if $PC.career == "wealth">>
+ of substantial wealth.
+<<elseif $PC.career == "capitalist">>
+ in business.
+<<elseif $PC.career == "mercenary">>
+ in the world of private contracting.
+<<elseif $PC.career == "slaver">>
+ as a slavebreaker.
+<<elseif $PC.career == "engineer">>
+ in arcology engineering.
+<<elseif $PC.career == "medicine">>
+ in medicine and surgery.
+<<elseif $PC.career == "celebrity">>
+ in the public sphere.
+<<elseif $PC.career == "escort">>
+ involving many personal contacts.
+<<elseif $PC.career == "servant">>
+ involving the rich and powerful.
+<<elseif $PC.career == "gang">>
+ involving gangs.
+<<elseif $PC.career == "BlackHat">>
+ involving mysterious data breaches.
+<<else>>
+ in the Free Cities.
+<</if>>
+It occurs to you that the arcology's growing role as a place where those with the means to do so can live in the society you have created, enjoying themselves and their lives to the fullest while subjugating others, should be commemorated.
<br><br>
As any slaveowner with half a mind in the Free Cities knows, there is power in words, and in what they represent. Master. Slave. These two words alone, more than any others, define the arcologies that have taken up the mantle of leading the world forward in these dark times. The time has come to add a new term to the lexicon of the Free Cities - a name. No longer will your arcology be known only as $arcologies[0].name, a bland and uninspiring name if ever there was one.
<br><br>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index 3e1398a98e9..cb13e5ab92e 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -28,6 +28,8 @@
a gang member
<<case "servant">>
a maid
+<<case "BlackHat">>
+ a brilliant code breaker
<<default>>
a prominent Free Cities citizen
<</switch>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index dd3da612d15..547ca12cd61 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -112,6 +112,17 @@ time as a gang leader. She was one of your best, yet you never got close enough,
<<set $activeSlave.muscles = 40>>
<<set $activeSlave.health = 100>>
<<set $activeSlave.combatSkill = 1>>
+<<case "BlackHat">>
+time as a hacker for hire. She supported you on jobs, even sent some choice pictures of herself, but you were never really close,
+ <<set $activeSlave.career = "a shut-in">>
+ <<if $pedo_mode == 1>>
+ <<set $activeSlave.actualAge = random(13,18)>>
+ <<else>>
+ <<set $activeSlave.actualAge = random(18,21)>>
+ <</if>>
+ <<set $activeSlave.face = 75>>
+ <<set $activeSlave.intelligence = 3>>
+ <<set $activeSlave.intelligenceImplant = 1>>
<<case "capitalist">>
career in venture capital. She was a rising manager, young, attractive, and bright. You never worked particularly closely with her,
<<set $activeSlave.career = "a manager">>
@@ -200,6 +211,7 @@ time as a gang leader. She was one of your best, yet you never got close enough,
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
+<<ResyncHeight $activeSlave>>
but you do remember her, and your rival knows it. This is obviously the best they could come up with to provoke an emotional reaction.
<br><br>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 39b11973817..8bb9b5b2bec 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -591,6 +591,29 @@
You have made progress towards mastering hacking and data manipulation.
<</if>>
<</if>>
+
+<<case "technical accidents">> /* needs work */
+ <<set $cash += 25000*$PC.hacking*$arcologies[0].prosperity, _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 technical accidents for the highest bidder earned you @@.yellowgreen;<<print cashFormat(25000*$PC.hacking*$arcologies[0].prosperity)>>.@@ <<if random(0,100) > _Catchtchance>> however as you were traced your <<if $secExp == 1>> <<set _X = 1>> @@.red;authority@@, <<set $authority -= random(100,500)>> @@.red;crime rate@@ <<set $crime += random(10,25)>> and<</if>> @@.red;reputation@@ <<set $rep -= random (100,500)>> <<if _X != 1>> has <<else>> have<</if>> been affected <</if>>.
<</switch>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index c02ee3efe77..a7be0dd814a 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -143,7 +143,7 @@
<<if $personalAttention == "hacking">>
You are training in hacking and data manipulation.
<<elseif $PC.hacking < 100 && $PC.actualAge < $IsPastPrimePC>>
- [[Hire a slaver to train you in hacking|Main][$personalAttention = "hacking"]]
+ [[Hire a specialist to train you in hacking|Main][$personalAttention = "hacking"]]
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 4020af322dc..e701ea3e30d 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -383,7 +383,10 @@ On formal occasions, you are announced as $PCTitle.
<<if $PC.career == "gang" && $rep < 15000>>
Society @@.red;frowns@@ over being run by an ex-gang leader, no matter how strong they might have been.
<<set $rep -= ($rep*0.1)>>
-<<elseif $PC.career == "gang">>
+<<elseif $PC.career == "BlackHat" && $rep < 15000>>
+ Society @@.red;dislikes@@ being run by someone so capable of dredging up secrets, especially when they used to do it for the highest bidder.
+ <<set $rep -= ($rep*0.1)>>
+<<elseif $PC.career == "gang" || $PC.career == "BlackHat">>
Your reputation is strong enough that society has come to accept your background as part of your image.
<</if>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index 94eb82c30a2..4b299deaffe 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -180,8 +180,7 @@ Being continually trusted with your life @@.hotpink;increases her devotion to yo
<<if $bodyguardTrains == 1 && $slaves[$i].devotion > 95 && $slaves[$i].trust > 50 && $slaves[$i].combatSkill > 0 && $slaves[$i].intelligence > 0>>
She's confident in her martial skills, but smart enough to know that she isn't immortal, and devoted enough to worry about who will protect you should she die.
- <<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignment == "be your Concubine" || s.assignment == "be the Wardeness" || s.assignment ==
-"be your Head Girl" || s.assignment == "work as a servant" || s.assignment == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
+ <<set _successorCandidates = $slaves.filter( function(s) { return (s.assignmentVisible == 1 || s.assignment == "be your Concubine" || s.assignment == "be the Wardeness" || s.assignment == "be your Head Girl" || s.assignment == "work as a servant" || s.assignment == "serve in the master suite") && bodyguardSuccessorEligible(s); } )>>
<<set _combatSkilled = _successorCandidates.filter( function(s) { return s.combatSkill > 0; })>>
<<if _combatSkilled.length < 2>>
<<unset $subSlave>>
diff --git a/src/uncategorized/seIndependenceDay.tw b/src/uncategorized/seIndependenceDay.tw
index 608f4d11448..3309c2bd8c7 100644
--- a/src/uncategorized/seIndependenceDay.tw
+++ b/src/uncategorized/seIndependenceDay.tw
@@ -186,6 +186,8 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
You share a rather some of the highlights of your late master's life; the moral of the story is that you've seen how to lead from someone who was a leader... It didn't help your standing much.
<<elseif $PC.career == "celebrity">>
You share a hilarious anecdote from your background as a celebrity, one which the old world tabloids never did learn about, until now.
+ <<elseif $PC.career == "BlackHat">>
+ You share a series of juicy details of some old world politicians, driving home just how much you know.
<<else>>
You cast yourself as one of the leading citizens of the Free Cities, from the beginning.
<</if>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 0825615d1eb..519ee037a5e 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -18,6 +18,7 @@
<<case "slaving">>This week you will learn slaving.
<<case "engineering">>This week you will learn engineering.
<<case "medicine">>This week you will learn medicine.
+<<case "hacking">>This week you will learn hacking.
<<case "proclamation">>This week you plan to issue a proclamation about $proclamationType.
<<default>>
<<if _PA.length > 0>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 99c2f54240b..fc634e1afe6 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -847,6 +847,8 @@
@@.mediumaquamarine;+10 trust@@ and @@.hotpink;+10 devotion.@@
<<elseif $PC.career == "wealth">>
two free levels of @@.cyan;sex skills.@@
+ <<elseif $PC.career == "BlackHat">>
+ one free level of @@.cyan;intelligence.@@
<<else>>
@@.hotpink;+10 devotion,@@ one free level of @@.cyan;prostitution skill@@ and @@.cyan;entertainment skill,@@ and two free levels of @@.cyan;sex skills.@@
<</if>>//
--
GitLab