From 1e62d9bea1c69e67d3b973e41f4a23f304a7865c Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 2 Jun 2019 18:49:43 -0500
Subject: [PATCH] Unneeded
---
src/SecExp/attackReport.tw | 2 +-
src/SecExp/rebellionReport.tw | 16 ++++++++--------
src/SecExp/riotControlCenter.tw | 4 ++--
src/SecExp/secExpSmilingMan.tw | 6 +++---
src/npc/fRelation.tw | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index ef5f14d9435..75cf57ca7c8 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -693,7 +693,7 @@
<br>
Fortunately the arcology survives @@.yellow;mostly intact,@@ however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
<<= IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(1000), "war")>>
+ <<run cashX(-1000, "war")>>
<<if $week <= 30>>
<<set $lowerClass -= random(80) * _majorBattleMod>>
<<set _lostSlaves = random(120) * _majorBattleMod,
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 3cb8a0d67f4..e1f5515c3c0 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -162,7 +162,7 @@
<<set $authority -= random(1000,1200)>>
<br>
The surrender allows the arcology to survive @@.yellow;mostly intact,@@ however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
- <<run cashX(forceNeg(1000), "war")>>
+ <<run cashX(-1000, "war")>>
<<if $week <= 30>>
<<set $lowerClass -= random(100)>>
<<set _lostSlaves = random(150),
@@ -289,7 +289,7 @@
<<set $authority -= random(1000,1200)>>
<br>
The surrender allows the arcology to survive @@.yellow;mostly intact,@@ however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
- <<run cashX(forceNeg(1000), "war")>>
+ <<run cashX(-1000, "war")>>
<<if $week <= 30>>
<<set $lowerClass -= random(100)>>
<<set _lostSlaves = random(150),
@@ -483,7 +483,7 @@
Thanks to the advance riot control weaponry developed by your experts, the rebels were mostly subdued or killed with @@.yellow;little to no collateral damage to the arcology@@ and its inhabitants.
A few businesses were looted, but the damage was very limited.
<<set $arcRepairTime += 2, IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(1000), "war")>>
+ <<run cashX(-1000, "war")>>
<<if $week <= 30>>
<<set $lowerClass -= random(20)>>
<<set _lostSlaves = random(45),
@@ -540,7 +540,7 @@
Unfortunately during the fighting a group of slaves infiltrated the reactor complex and sabotaged it, causing massive power fluctuations and blackouts.
It will take @@.red;time and money to repair the damage.@@
<<set $garrison.reactorTime = $repairTime + random(1) - $fort.reactor, IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(2000), "war")>>
+ <<run cashX(-2000, "war")>>
<<else>>
While the reactor was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
<</if>>
@@ -552,7 +552,7 @@
Unfortunately during the fighting a group of slaves infiltrated the water management complex and sabotaged it, causing huge water leaks throughout the arcology and severely limiting the water supply.
It will take @@.red;time and money to repair the damage.@@
<<set $garrison.waterwayTime = $repairTime + random(1) - $fort.waterway, IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(2000), "war")>>
+ <<run cashX(-2000, "war")>>
<<else>>
While the water management complex was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
<</if>>
@@ -564,7 +564,7 @@
Unfortunately during the fighting a group of slaves infiltrated the facility housing $assistantName's mainframe and sabotaged it. Without its AI the arcology will be next to impossible to manage.
It will take @@.red;time and money to repair the damage.@@
<<set $garrison.assistantTime = $repairTime + random(1) - $fort.assistant, IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(2000), "war")>>
+ <<run cashX(-2000, "war")>>
<<else>>
While the $assistantName's mainframe was left defenseless without a garrison, there was no attempt at sabotage. Let's hope we'll always be this lucky.
<</if>>
@@ -743,7 +743,7 @@
<</if>>
The damage to the structure will be @@.red;costly to repair.@@
<<= IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(2000), "war")>>
+ <<run cashX(-2000, "war")>>
<<else>>
While the penthouse was left without a sizable garrison, there was no dangerous assault against it. Let's hope we'll always be this lucky.
<</if>>
@@ -855,7 +855,7 @@
<</if>>
The damage to the structure will be @@.red;costly to repair.@@
<<= IncreasePCSkills('engineering', 0.1)>>
- <<run cashX(forceNeg(2000), "war")>>
+ <<run cashX(-2000, "war")>>
<<else>>
There was no sizable assault against the penthouse. Let's hope we'll always be this lucky.
<</if>>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 190f2d59f49..9899cd6a2a5 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -169,9 +169,9 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<if $advancedRiotEquip == 0>>
<<link "Develop advanced anti-riot equipment" "riotControlCenter">>
<<set $advancedRiotEquip = 1>>
- <<run cashX(forceNeg(Math.trunc(30000 * $upgradeMultiplierTrade)), "capEx")>>
+ <<run cashX(forceNeg(30000 * $upgradeMultiplierTrade), "capEx")>>
<</link>>
- <br>//Costs <<print cashFormat(Math.trunc(30000 * $upgradeMultiplierTrade))>>. Will allow the selection of advanced riot equipment in case of a rebellion, which will let your troops fight at full effectiveness while doing reduced collateral damage.//
+ <br>//Costs <<print cashFormat(30000 * $upgradeMultiplierTrade)>>. Will allow the selection of advanced riot equipment in case of a rebellion, which will let your troops fight at full effectiveness while doing reduced collateral damage.//
<<else>>
You developed advanced riot equipment, which allows your troops to fight within the confines of your arcology without the fear of doing major collateral damage.
<</if>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index a2e989dde72..cbf3ecafb74 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -21,7 +21,7 @@
<br>
<<if $cash >= 10000>>
<<link "Devote funds to the search for this dangerous criminal">>
- <<run cashX(forceNeg(10000), "event")>>
+ <<run cashX(-10000, "event")>>
<<set $investedFunds = 1>>
<<set $relationshipLM += 1>>
<<set $smilingManProgress += 1>>
@@ -31,7 +31,7 @@
<</link>>
<br>
<<link "Attempt to contact the mysterious figure">>
- <<run cashX(forceNeg(10000), "event")>>
+ <<run cashX(-10000, "event")>>
<<set $investedFunds = 1>>
<<set $relationshipLM += 2>>
<<set $smilingManProgress += 1>>
@@ -41,7 +41,7 @@
<</link>>
<br>
<<link "Invest funds to increase the cyber-security of the arcology">>
- <<run cashX(forceNeg(10000), "event")>>
+ <<run cashX(-10000, "event")>>
<<set $investedFunds = 1>>
<<set $relationshipLM += random(5,10)>>
<<set $smilingManProgress += 1>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 3bf2d0e30fd..caf4e47cdc5 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -64,7 +64,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<set $activeSlave.counter.oral++, $slaves[$partner].counter.oral++, $oralTotal++>>
<<= VCheck.Partner()>>
<<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && ($activeSlave.missingArms == 0) && (_activeSlaveRel == "mother" || _activeSlaveRel == "father")>>
- $activeSlave.slaveName gives you a little smile when $he <<if canHear($activeSlave)>>hears<<else>>learns<</if>> you wish to fuck $him and $his daughter $slaves[$partner].slaveName<<if ($PC.dick == 0)>> and <<if canSee($activeSlave)>>sees<<else>>acknowledges<</if>> your strap-on<</if>>. On your direction, $activeSlave.slaveName sits on the couch. When $slaves[$partner].slaveName enters, _his2 _activeSlaveRel spreads $his arms and tells _him2 to sit on $his lap. $slaves[$partner].slaveName gets the idea and straddles $him so they're face to face. You take $slaves[$partner].slaveName from behind; _he2 gasps as _he2 feels _his2 _activeSlaveRel's hands stimulate _him2 from the front. They make out shamelessly while you take your pleasure. When you finish, $activeSlave.slaveName lies down on the couch so $slaves[$partner].slaveName can ride $his <<if $seeRace == 1>>$activeSlave.race <</if>>face. As $he sucks the cum out of $his daughter's sopping fuckhole, $slaves[$partner].slaveName sucks you hard again. In the mood for something harder this time, you jam yourself into the older $activeSlave.slaveName. $slaves[$partner].slaveName gets off $activeSlave.slaveName's face so _he2 can offer _himself2 for fondling and groping while you pound $activeSlave.slaveName. After you're done, $slaves[$partner].slaveName returns _his2 _activeSlaveRel's affection and gives $him some gentle oral as the older slave lies there exhausted.
+ $activeSlave.slaveName gives you a little smile when $he <<if canHear($activeSlave)>>hears<<else>>learns<</if>> you wish to fuck $him and $his daughter $slaves[$partner].slaveName<<if ($PC.dick == 0)>> and <<if canSee($activeSlave)>>sees<<else>>acknowledges<</if>> your strap-on<</if>>. On your direction, $activeSlave.slaveName sits on the couch. When $slaves[$partner].slaveName enters, _his2 _activeSlaveRel spreads $his arms and tells _him2 to sit on $his lap. $slaves[$partner].slaveName gets the idea and straddles $him so they're face to face. You take $slaves[$partner].slaveName from behind; _he2 gasps as _he2 feels _his2 _activeSlaveRel's hand<<if (_activeSlaveRel.missingArms == 0)>>s<</if>> stimulate _him2 from the front. They make out shamelessly while you take your pleasure. When you finish, $activeSlave.slaveName lies down on the couch so $slaves[$partner].slaveName can ride $his <<if $seeRace == 1>>$activeSlave.race <</if>>face. As $he sucks the cum out of $his daughter's sopping fuckhole, $slaves[$partner].slaveName sucks you hard again. In the mood for something harder this time, you jam yourself into the older $activeSlave.slaveName. $slaves[$partner].slaveName gets off $activeSlave.slaveName's face so _he2 can offer _himself2 for fondling and groping while you pound $activeSlave.slaveName. After you're done, $slaves[$partner].slaveName returns _his2 _activeSlaveRel's affection and gives $him some gentle oral as the older slave lies there exhausted.
<<set $activeSlave.counter.oral += 2, $slaves[$partner].counter.oral += 2, $oralTotal += 2>>
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
--
GitLab