From a1bb05d3935f1f7c2e86f45cd160a732de4c5f27 Mon Sep 17 00:00:00 2001
From: Jones <Jones>
Date: Thu, 7 Mar 2019 16:18:11 +0100
Subject: [PATCH] More tweaks
Lower fuckdoll prices
Lower arcade upkeep
Removed arcade aphrodisiac injections
Added arcade Health injections
Added benefit for satisfying lower class: attracts more lower class to the arcology
---
src/init/storyInit.tw | 2 +
src/js/datatypeCleanupJS.js | 1 +
src/js/economyJS.js | 12 ++---
src/uncategorized/BackwardsCompatibility.tw | 3 ++
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/arcade.tw | 23 +++++---
src/uncategorized/arcadeReport.tw | 59 ++++++++++-----------
src/uncategorized/arcmgmt.tw | 26 +++++----
src/uncategorized/buySlaves.tw | 38 ++++++-------
src/uncategorized/costsWidgets.tw | 5 +-
src/uncategorized/reShelterInspection.tw | 2 +-
src/uncategorized/repBudget.tw | 4 ++
src/uncategorized/saWorkAGloryHole.tw | 12 ++---
src/uncategorized/slaveAssignmentsReport.tw | 43 ++++++++++++---
14 files changed, 140 insertions(+), 92 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1c9ad034058..e4bf3a6a25b 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -588,6 +588,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $arcadeUpgradeInjectors = 0>>
<<set $arcadeUpgradeFuckdolls = 0>>
<<set $arcadeUpgradeCollectors = 0>>
+<<set $arcadeUpgradeHealth = -1>>
<<set $arcadeName = "the Arcade">>
<<set $arcadeNameCaps = "The Arcade">>
<<set $arcade = 0>>
@@ -824,6 +825,7 @@ You should have received a copy of the GNU General Public License along with thi
/* Slave sexual services and goods variables */
<<set $publicFuckdolls = 0>>
<<set $lowerClassSexDemand = 15600>>
+<<set $lowerClassSatisfied = 0>>
<<set $middleClassSexDemand = 10780>>
<<set $upperClassSexDemand = 8000>>
<<set $topClassSexDemand = 8000>>
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index cf6126e8b6b..80b8fbf089f 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -1607,6 +1607,7 @@ window.FacilityDatatypeCleanup = (function() {
V.arcadeUpgradeInjectors = Math.clamp(+V.arcadeUpgradeInjectors, 0, 1) || 0;
V.arcadeUpgradeCollectors = Math.clamp(+V.arcadeUpgradeCollectors, 0, 1) || 0;
V.arcadeUpgradeFuckdolls = Math.clamp(+V.arcadeUpgradeFuckdolls, 0, 2) || 0;
+ V.arcadeUpgradeHealth = Math.clamp(+V.arcadeUpgradeHealth, -1, 2) || 0;
}
function CellblockDatatypeCleanup() {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 6d8c855cd8f..3b1a1310f8b 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -150,9 +150,9 @@ window.getBrothelAdsCosts = function() {
window.getArcadeCosts = function() {
var facilityCost = State.variables.facilityCost;
var arcade = State.variables.arcade;
- var costs = (arcade * facilityCost * 0.5);
- costs += (0.2 * State.variables.arcadeUpgradeInjectors * arcade * facilityCost)
- + (0.2 * State.variables.arcadeUpgradeCollectors * arcade * facilityCost);
+ var costs = (arcade * facilityCost * 0.05);
+ costs += (0.02 * State.variables.arcadeUpgradeInjectors * arcade * facilityCost)
+ + (0.05 * State.variables.arcadeUpgradeCollectors * arcade * facilityCost) + (0.02 * State.variables.arcadeUpgradeHealth * arcade * facilityCost);
return costs;
};
@@ -849,7 +849,7 @@ window.getSlaveCost = function(s) {
cost += drugsCost * 2;
break;
}
- if(s.curatives > 0 && s.assignmentVisible === 1) {
+ if(s.curatives > 0) {
cost += drugsCost * s.curatives;
}
if(s.aphrodisiacs !== 0) {
@@ -900,7 +900,7 @@ window.slaveSexSupplyArcade = function() {
// Accounting for fuckdolls
if(V.fuckdolls > 0) {
- fuckdollSexAmount = (V.fuckdolls - (V.arcade - V.arcadeSlaves) * 140 + (V.arcade - V.arcadeSlaves) * (175 + 35 * V.arcadeUpgradeInjectors);
+ fuckdollSexAmount = (V.fuckdolls - (V.arcade - V.arcadeSlaves)) * 140 + (V.arcade - V.arcadeSlaves) * (175 + 35 * V.arcadeUpgradeInjectors);
} else {
fuckdollSexAmount = 0;
}
@@ -910,7 +910,7 @@ window.slaveSexSupplyArcade = function() {
if(s.assignment === "work a glory hole") {
slaveSexAmount = Math.trunc((190 + (20 * (4 - s.anus)) + (10 * (4 - s.vagina))) * 0.8);
} else if(s.assignment === "be confined in the arcade") {
- slaveSexAmount = Math.trunc((190 + (20 * (4 - s.anus)) + (10 * (4 - s.vagina))) * (1 + V.arcadeUpgradeInjectors * 0.2));
+ slaveSexAmount = (190 + (20 * (4 - (s.anus - 2 * V.arcadeUpgradeInjectors))) + (10 * (4 - (s.vagina - 2 * V.arcadeUpgradeInjectors))));
} else {
slaveSexAmount = 0;
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index a2bcac81031..84f7a593459 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2634,6 +2634,9 @@ Setting missing global variables:
<<if ndef $lowerClassSexDemand>>
<<set $lowerClassSexDemand = 15600>>
<</if>>
+<<if ndef $lowerClassSatisfied>>
+ <<set $lowerClassSatisfied = 0>>
+<</if>>
<<if ndef $middleClassSexDemand>>
<<set $middleClassSexDemand = 10780>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 2da414975ba..14eac6aef75 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -18909,7 +18909,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><br>
There is little noise; the slaves are closely restrained. Indeed, you have to look closely to see that they're being fucked at all. Here and there, though, there are signs. When someone fucks a slave's face, _hisU throat bulges, and _heU often gags and struggles a little within the restraints. When their <<if _pussy>>pussies<<else>>assholes<</if>> get fucked, there's also some involuntary struggling, and if the phallus being thrust into them is particularly large, a rhythmic bulging of their abdomens can be discerned.
<<if $arcadeUpgradeInjectors == 1>>
- The quiet hissing of the drug injectors adds a menacing undertone, and the bodies frequently jerk as electrostimulation is applied to force them to tighten their holes.
+ The bodies frequently jerk as electrostimulation is applied to force them to tighten their holes.
<</if>>
<<if $arcadeUpgradeCollectors == 1>>
The pumping collectors attached to the slaves' breasts<<if _dick>> and cocks<</if>> carry the white fluid away to be processed elsewhere.
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 99970ee7723..bd9317c898b 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -95,26 +95,37 @@ $arcadeNameCaps
<</if>>
<<if $arcade > $arcadeSlaves && $fuckdolls > 0>>
<<set _fuckdollRoom = $arcade - $arcadeSlaves>>
- <br>There is room in your arcade for <<print _fuckdollRoom>> menial fuckdolls. <<if $fuckdolls > 1>>They'll be more efficient in the arcade so you restrain them there.<<else>>Your fuckdoll will be more efficient serving in the arcade so you send her there.<</if>>
+ <br>There is room in the arcade for <<print _fuckdollRoom>> menial fuckdolls. <<if $fuckdolls > 1>>They'll be more efficient in the arcade so you restrain them here.<<else>>Your fuckdoll will be more efficient serving in the arcade so you send her here.<</if>>
<</if>>
-<<set _Tmult0 = Math.trunc($arcade*500*$upgradeMultiplierArcology)>>
+<<set _Tmult0 = Math.trunc($arcade*1000*$upgradeMultiplierArcology)>>
[[Expand the arcade|Arcade][cashX(forceNeg(_Tmult0), "capEx"), $arcade += 20]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
-<br>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
<<if $arcadeUpgradeInjectors == 1>>
- It has been upgraded with aphrodisiac injection systems and electroshock applicators. If the aphrodisiacs fail to force an orgasm from an inmate, they are shocked to tighten their holes regardless.
+ <br>It has been upgraded with electroshock applicators. Whether they're enjoying themselves or not is irrelevant, they are shocked to tighten their holes regardless.
<<elseif $arcadeUpgradeCollectors == 1>>
- It has been retrofitted to milk lactating slaves<<if $seeDicks != 0>> and cockmilk slaves capable of ejaculating<</if>>, though less efficiently than a dedicated facility.
+ <br>It has been retrofitted to milk lactating slaves<<if $seeDicks != 0>> and cockmilk slaves capable of ejaculating<</if>>, though less efficiently than a dedicated facility.
<<else>>
<br>It is a standard arcade. It can be upgraded to either maximize the pleasure of those that visit it at the expense of the health of the inmates, or to keep them healthy (if not happy) and milk them of useful fluids.<br>
[[Upgrade the arcade with invasive performance-enhancing systems|Arcade][cashX(forceNeg(_Tmult1), "capEx"), $arcadeUpgradeInjectors = 1]] | [[Retrofit the arcade to collect useful fluids|Arcade][cashX(forceNeg(_Tmult1), "capEx"), $arcadeUpgradeCollectors = 1]]<br>
//Choosing either upgrade will cost <<print cashFormat(_Tmult1)>> and will increase upkeep costs. They are mutually exclusive; only one can be chosen.// <br>
<</if>>
+<<if $arcadeUpgradeHealth == 2>>
+ <br>It has been upgraded with curative injectors and set to maximum power. Inmates will be kept decently healthy so they can be held locked in place for as long as necessary while remaining productive througout. [[Decrease power|Arcade][$arcadeUpgradeHealth = 1]]
+<<elseif $arcadeUpgradeHealth == 1>>
+ <br>It has been upgraded with curative injectors. inmates will be kept alive and productive, so they may be held locked in place for as long as necessary and available for use. [[Increase power|Arcade][$arcadeUpgradeHealth = 2]] | [[Turn off|Arcade][$arcadeUpgradeHealth = 0]]
+<<elseif $arcadeUpgradeHealth == 0>>
+ <br>It has been upgraded with curative injectors, but they are currently turned off. [[Turn on|Arcade][$arcadeUpgradeHealth = 1]]
+<<else>>
+ <br>The arcade can be upgraded to include curative injectors in order to keep inmates from succumbing under the harsh treatment. You are assured the inmates won't like their time in the arcade any better, it is purely intended to keep them functional and ready for use around the clock. It comes equipped with two settings. [[Install curative injectors|Arcade][$arcadeUpgradeHealth = 1]]
+<</if>>
+
<br>$arcadeNameCaps is
<<if $arcadeUpgradeFuckdolls == 1>>
- equipped to convert inmates into standard Fuckdolls.
+ equipped to convert inmates into standard Fuckdolls. The converter can be put to work on your order. [[Turn on conversion|Arcade][$arcadeUpgradeFuckdolls = 2]]
+<<elseif $arcadeUpgradeFuckdolls == 2>>
+ equipped to convert inmates into standard Fuckdolls. The converter is currently active and will convert the least popular girl at the end of the week. [[Turn off conversion|Arcade][$arcadeUpgradeFuckdolls = 1]]
<<else>>
<<set _Tmult2 = Math.trunc(5000*$upgradeMultiplierArcology)>>
not equipped to convert inmates into standard Fuckdolls. [[Upgrade the arcade to create Fuckdolls|Arcade][cashX(forceNeg(_Tmult2), "capEx"), $arcadeUpgradeFuckdolls = 1]] //Costs <<print cashFormat(_Tmult2)>>//
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 890d391653c..1d5b3919feb 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -12,14 +12,12 @@
<<if (_DL > 1)>>''There are _DL inmates confined in $arcadeName.''<<else>>''There is one inmate confined in $arcadeName.''<</if>>
<<if ($arcologies[0].FSDegradationist > 20)>>
<<if $arcologies[0].FSDegradationistLaw == 1>>
- The tenants located near the arcade don't mind having it nearby, even though the crowd of menial slaves waiting their turn spills out into the hallway, 24 hours a day.
+ The tenants located near the arcade consider the facility a normal part of their surroundings, including the crowd of menial slaves waiting their turn spills out into the hallway, 24 hours a day.
<<else>>
- The tenants located near the arcade don't mind having it nearby.
+ The tenants located near the arcade consider the facility a normal part of their surroundings.
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 20)>>
- Many of the better tenants located near the arcade consider it an @@.red;intolerable@@ establishment to have nearby.
-<<else>>
- Some of the better tenants located near the arcade consider it an @@.red;obnoxious@@ establishment to have nearby.
+ The tenants located near the arcade consider it an @@.red;intolerable@@ establishment.
<</if>>
<<if $arcadeDecoration != "standard">>
<br><br> $arcadeNameCaps's customers enjoy @@.green;getting off in $arcadeDecoration surroundings.@@
@@ -31,32 +29,32 @@
/* Perform facility based rule changes */
<<set $slaves[$i].clothes = "no clothing">>
+ /* Health */
+ <<if $arcadeUpgradeHealth == 2 && $slaves[$i].health < 40>>
+ <<set $slaves[$i].health += 2>>
+ <<elseif $slaves[$i].health > 20>>
+ <<set $slaves[$i].health -= 5>>
+ <<elseif $arcadeUpgradeHealth == 1 && $slaves[$i].health < -30>>
+ <<set $slaves[$i].health += 2,
+ >>
+ <<elseif $slaves[$i].health > -50>>
+ <<set $slaves[$i].health -= 3>>
+ <<elseif $slaves[$i].health > -90>>
+ <<set $slaves[$i].health -= 1>>
+ <</if>>
+ /* Curatives */
+ <<if $arcadeUpgradeHealth == 2>>
+ <<set $slaves[$i].curatives = 2>>
+ <<elseif $arcadeUpgradeHealth == 1>>
+ <<set $slaves[$i].curatives = 1>>
+ <</if>>
+ /* Stimulation or lack thereof trust/devotion effect */
<<if ($arcadeUpgradeInjectors == 1)>>
- <<if ($slaves[$i].health > -60)>>
- <<set $slaves[$i].health -= 10>>
- <<elseif ($slaves[$i].health > -80)>>
- <<set $slaves[$i].health -= 2>>
- <<else>>
- <<set $slaves[$i].health -= 1>>
- <</if>>
- <<set $slaves[$i].aphrodisiacs = 2, $slaves[$i].devotion -= 5, $slaves[$i].trust -= 10>>
- <<elseif ($arcadeUpgradeCollectors > 0)>>
- <<if ($slaves[$i].health > 20)>>
- <<set $slaves[$i].health -= 5>>
- <<elseif ($slaves[$i].health > -50)>>
- <<set $slaves[$i].health -= 3>>
- <<else>>
- <<set $slaves[$i].health -= 1>>
- <</if>>
- <<set $slaves[$i].trust -= 5>>
+ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 10>>
<<else>>
- <<if ($slaves[$i].health > -20)>>
- <<set $slaves[$i].health -= 5>>
- <<elseif ($slaves[$i].health > -90)>>
- <<set $slaves[$i].health -= 1>>
- <</if>>
<<set $slaves[$i].trust -= 5>>
<</if>>
+ /* Muscles */
<<if ($slaves[$i].muscles > -100)>>
<<set $slaves[$i].muscles-->>
<</if>>
@@ -194,11 +192,8 @@
_cockmilked of them retain testicles and are brutally cockmilked as they are used.
<</if>>
The arcade makes you @@.yellowgreen;<<print cashFormat(_profits)>>@@ from selling the inmates' holes<<if ($arcadeUpgradeCollectors > 0)>> and @@.yellowgreen;<<print cashFormat(_milkprofits)>>@@ from selling the fluids they produced<</if>> this week.
- <<if ($arcologies[0].FSDegradationist > 20)>>
- <<elseif ($arcologies[0].FSPaternalist > 20)>>
+ <<if ($arcologies[0].FSPaternalist > 20)>>
<<run repX(forceNeg(Math.trunc(_profits/20)), "arcade")>>
- <<else>>
- <<run repX(forceNeg(Math.trunc(_profits/100)), "arcade")>>
<</if>>
<</if>>
@@ -268,7 +263,7 @@
b.whoreCosts += si.cost;
b.rep += si.rep;
}
- b.maintenance = State.variables.arcade * State.variables.facilityCost * (0.5 + 0.2 * State.variables.arcadeUpgradeInjectors + 0.2 * State.variables.arcadeUpgradeCollectors);
+ b.maintenance = State.variables.arcade * State.variables.facilityCost * (0.05 + 0.02 * State.variables.arcadeUpgradeInjectors + 0.05 * State.variables.arcadeUpgradeCollectors);
b.totalIncome = b.whoreIncome;
b.totalExpenses = b.whoreCosts + b.maintenance;
b.profit = b.totalIncome - b.totalExpenses;
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index a7df62f460b..ed3dbd2416c 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -819,19 +819,28 @@ _SCD = Math.trunc(($upperClass * (2 + _slaveDemandU)) + ($topClass * (12 + _slav
/*Lower Class Citizens*/
/*Work left for lower class citizens*/
<<set _LCD = Math.trunc((($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + _lowerClass + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18) - ($NPCSlaves + $menials) * _slaveProductivity) * $rentEffectL * _lowerClassP)>>
+<<if $lowerClassSatisfied != 0>>
+ <<set _LCD *= 1 + $lowerClassSatisfied * 0.06>>
+<</if>>
<<if _LCD < 0>>
<<set _LCD = 0>>
<</if>>
<<if isNaN(_LCD)>>
<br>@@.red;LCD is NaN, report this issue!@@
<<else>>/*Changing population depending on work available*/
+ <br>
+ <<if $lowerClassSatisfied < 0>>
+ Your lower class is @@.red;sexually frustrated@@ and would rather live elsewhere.
+ <<elseif $lowerClassSatisfied > 0>>
+ Your lower class is @@.green;sexually satiated@@ and their happiness attracts others.
+ <</if>>
<<if $lowerClass < _LCD>>
<<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * (0.3 * _terrain)) + 1,
$lowerClass += _LCImmigration>>
<<if _LCImmigration > 1>>
- <br>@@.green;<<print _LCImmigration>> lower class citizens@@ moved to your arcology.
+ @@.green;<<print _LCImmigration>> lower class citizens@@ moved to your arcology.
<<elseif _LCImmigration > 0>>
- <br>@@.green;One lower class citizen@@ moved to your arcology.
+ @@.green;One lower class citizen@@ moved to your arcology.
<</if>>
<<elseif $lowerClass > _LCD>>
<<set _LCEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1>>
@@ -843,14 +852,14 @@ _SCD = Math.trunc(($upperClass * (2 + _slaveDemandU)) + ($topClass * (12 + _slav
<<set $lowerClass -= _LCEmigration,
_enslaved += _enslavedEmigrants>>
<<if _LCEmigration > 1>>
- <br>@@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology.
+ @@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology.
<<if _enslavedEmigrants > 1>>
@@.green;<<print _enslavedEmigrants>> of them were enslaved instead.@@
<<elseif _enslavedEmigrants > 0>>
@@.green;One of them was enslaved instead.@@
<</if>>
<<elseif _LCEmigration > 0>>
- <br>@@.red;One lower class citizen@@ left your arcology due to a lack of work.
+ @@.red;One lower class citizen@@ left your arcology due to a lack of work.
<</if>>
<</if>>
<<if _enslaved > 0>>
@@ -1134,14 +1143,13 @@ You own
<<if $fuckdolls > 0>>
- <<set _fuckdollsEarnings = Math.trunc((1 + random(-50,50) / 1000) * (($fuckdolls - $fuckdollsArcade) * ($arcadePrice - 0.5) * 140 + $fuckdollsArcade * ($arcadePrice - 0.5) * (175 + 35 * $arcadeUpgradeInjectors)) / 10)>> /*The "/ 10" at the end is just there to keep the price in line with other current prices, hopefully prices will get to a spot where this can be dropped*/
+ <<set _fuckdollsEarnings = Math.trunc((($fuckdolls - $fuckdollsArcade) * ($arcadePrice - 0.5) * 140 + $fuckdollsArcade * ($arcadePrice - 0.5) * (175 + 35 * $arcadeUpgradeInjectors)) / 10)>> /*The "/ 10" at the end is just there to keep the price in line with other current prices, hopefully prices will get to a spot where this can be dropped*/
<<if $fuckdolls > 1>> <<print commaNum($fuckdolls)>> standard fuckdolls,<<elseif $fuckdolls == 1>>one fuckdoll,<</if>><<if $fuckdollsArcade > 1>> <<print commaNum($fuckdollsArcade)>> arcade fuckdolls,<<elseif $fuckdollsArcade == 1>>one arcade fuckdoll,<</if>>
<<if $publicFuckdolls == 1>>
- <<run repX(_fuckdollsEarnings * $arcadePrice, "publicServant")>> /*They should probably not be called "publicServants" but their own thing TODO*/
+ <<run repX(_fuckdollsEarnings / 5, "publicFuckdoll")>>
<<set _fuckdollsEarnings = Math.trunc($fuckdolls * -0.5)>> /*The upkeep of a fuckdoll*/
- <<else>>
- <<run cashX(_fuckdollsEarnings, "fuckdolls")>>
<</if>>
+ <<run cashX(_fuckdollsEarnings, "fuckdolls")>>
<</if>>
<<if _menialEarnings + _bioreactorEarnings + _fuckdollsEarnings > 0>>
@@ -1265,7 +1273,7 @@ costing you @@.red;<<print cashFormat(_menialEarnings + _bioreactorEarnings + _f
<<if $arcologies[0].FSDegradationistLaw == 1>>
Requiring menials to be given time to fuck human sex toys in the arcade reduces labor efficiency, slowing growth and costs money for each menial slave you own.
<<set _AWeekGrowth-->>
- <<run cashX()
+ <<run cashX($menials * 3 * $arcadePrice, "fuckdolls")>>
<</if>>
<<if $arcologies[0].FSBodyPuristLaw == 1>>
The drug surcharge used to fund the purity regime reduces growth.
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index b6a32e15947..415b0cc5047 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -343,10 +343,7 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
[[(all)|Buy Slaves][cashX(($menials*(menialSlaveCost(-$menials))), "menialTransfer"),$menialDemandFactor-=$menials,$menials = 0]]
<<if $arcologies[0].FSPaternalist == "unset">>
<<if $arcadeUpgradeFuckdolls > 0>>
- <<set _fconvertCost = 1000>>
- <<if _menialPrice >= 1100>>
- <<set _fconvertCost = (_menialPrice+100)>>
- <</if>>
+ <<set _fconvertCost = 100>>
<br> [[Convert to Fuckdoll|Buy Slaves][$menials-=1,$fuckdolls+=1,cashX(forceNeg(_fconvertCost), "menialTransfer")]]
<<if $menials >= 10>>
[[(x10)|Buy Slaves][$menials-=10,$fuckdolls+=10,cashX(forceNeg(10*(_fconvertCost)), "menialTransfer")]]
@@ -358,11 +355,11 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
//Conversion costs <<print cashFormat(_fconvertCost)>> each//
<</if>>
<<if $dairyFeedersUpgrade > 0>>
- <br> [[Convert to Bioreactor|Buy Slaves][$menials-=1,$menialBioreactors+=1,cashX(-500, "menialTransfer")]]
+ <br> [[Convert to Bioreactor|Buy Slaves][$menials-=1,$menialBioreactors+=1,cashX(-100, "menialTransfer")]]
<<if $menials >= 10>>
- [[(x10)|Buy Slaves][$menials-=10,$menialBioreactors+=10,cashX(-5000, "menialTransfer")]]
+ [[(x10)|Buy Slaves][$menials-=10,$menialBioreactors+=10,cashX(-1000, "menialTransfer")]]
<<if $menials >= 100>>
- [[(x100)|Buy Slaves][$menials-=100,$menialBioreactors+=100,cashX(-50000, "menialTransfer")]]
+ [[(x100)|Buy Slaves][$menials-=100,$menialBioreactors+=100,cashX(-10000, "menialTransfer")]]
<</if>>
<</if>>
[[(all)|Buy Slaves][$menialBioreactors+=$menials,cashX(forceNeg(500*$menials), "menialTransfer"),$menials=0]]
@@ -379,20 +376,19 @@ The market price of menials is <<print cashFormat(_menialPrice)>>.
<br>You do not own any standard Fuckdolls.
<</if>>
<<if ($fuckdolls > 0) || ($arcologies[0].FSPaternalist == "unset")>>
-The market price of standard Fuckdolls is <<print cashFormat(_menialPrice*2)>>.
+The market price of standard Fuckdolls is <<print cashFormat(_menialPrice)>>.
<<set _optionsBreak = 0>>
<<if _bulkMax > 0>>
-<<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice*2>>
- [[Buy|Buy Slaves][$fuckdolls+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice*2), "fuckdollsTransfer")]]
- <<if $cash > (menialSlaveCost(10)*2)*10>>
- [[(x10)|Buy Slaves][$fuckdolls+=10,$menialSupplyFactor-=10,cashX(forceNeg((menialSlaveCost(10)*2)*10), "fuckdollsTransfer")]]
+<<if $arcologies[0].FSPaternalist == "unset" && $cash > _menialPrice>>
+ [[Buy|Buy Slaves][$fuckdolls+=1,$menialSupplyFactor-=1,cashX(forceNeg(_menialPrice), "fuckdollsTransfer")]]
+ <<if $cash > menialSlaveCost(10)*10>>
+ [[(x10)|Buy Slaves][$fuckdolls+=10,$menialSupplyFactor-=10,cashX(forceNeg(menialSlaveCost(10)*10), "fuckdollsTransfer")]]
<</if>>
- <<if $cash > (menialSlaveCost(100)*2)*100>>
- [[(x100)|Buy Slaves][$fuckdolls+=100,$menialSupplyFactor-=100,cashX(forceNeg((menialSlaveCost(100)*2)*100), "fuckdollsTransfer")]]
+ <<if $cash > menialSlaveCost(100)*100>>
+ [[(x100)|Buy Slaves][$fuckdolls+=100,$menialSupplyFactor-=100,cashX(forceNeg(menialSlaveCost(100)*100), "fuckdollsTransfer")]]
<</if>>
- <<if $cash > ((_menialPrice+1)*4)>>
- <<set _fuckdollBulkPremium = Math.trunc(1 + Math.clamp($cash/(_menialPrice*2),0,_bulkMax)/400)>>
- [[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/(_menialPrice*2+_fuckdollBulkPremium),0,_bulkMax))*(_menialPrice*2+_fuckdollBulkPremium)), "fuckdollsTransfer")]]
+ <<if $cash > ((_menialPrice+1)*2)>>
+ [[(max)|Buy Slaves][$fuckdolls+=Math.trunc(Math.clamp($cash/_menialPrice,0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/_menialPrice,0,_bulkMax)),cashX(forceNeg(Math.trunc(Math.clamp($cash/_menialPrice,0,_bulkMax))*_menialPrice), "fuckdollsTransfer")]]
<</if>>
//Bulk transactions may require offering a premium.//
<<set _optionsBreak = 1>>
@@ -400,14 +396,14 @@ The market price of standard Fuckdolls is <<print cashFormat(_menialPrice*2)>>.
<</if>>
<<if $fuckdolls >= 1>>
<<if _optionsBreak>>|<</if>>
- [[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,cashX((_menialPrice*2), "fuckdollsTransfer")]]
+ [[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,cashX(_menialPrice, "fuckdollsTransfer")]]
<<if $fuckdolls >= 10>>
- [[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,cashX((menialSlaveCost(-10)*20), "fuckdollsTransfer")]]
+ [[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,cashX((menialSlaveCost(-10)*10), "fuckdollsTransfer")]]
<<if $fuckdolls >= 100>>
- [[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,cashX((menialSlaveCost(-100)*200), "fuckdollsTransfer")]]
+ [[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,cashX((menialSlaveCost(-100)*100), "fuckdollsTransfer")]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][cashX($fuckdolls*(menialSlaveCost(-$fuckdolls)*2), "fuckdollsTransfer"),$menialDemandFactor-=$fuckdolls,$fuckdolls = 0]]
+[[(all)|Buy Slaves][cashX($fuckdolls*(menialSlaveCost(-$fuckdolls), "fuckdollsTransfer")),$menialDemandFactor-=$fuckdolls,$fuckdolls = 0]]
<</if>>
<</if>>
diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw
index a8f2669f1da..4dc30888084 100644
--- a/src/uncategorized/costsWidgets.tw
+++ b/src/uncategorized/costsWidgets.tw
@@ -359,10 +359,9 @@
@@.yellowgreen;<<print cashFormat(($drugsCost*2))>>@@
<<set _individualCosts += ($drugsCost*2)>>
<</switch>>
- <<if $args[0].curatives == 1 && $args[0].assignmentVisible != 1>>
- <<elseif $args[0].curatives > 0>>
+ <<if $args[0].curatives > 0>>
<br> <i>Health drugs:</i>
- @@.yellowgreen;<<print cashFormat($drugsCost+($args[0].curatives*$drugsCost))>>@@
+ @@.yellowgreen;<<print cashFormat($args[0].curatives*$drugsCost)>>@@
<<set _individualCosts += $drugsCost+($args[0].curatives*$drugsCost)>>
<</if>>
<<if ($args[0].aphrodisiacs !== 0)>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 1ab369f10b6..a84acbdc545 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -154,7 +154,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
<<replace "#result">>
_Inspectee.slaveName is sealed in a box and currently in use, so it would be extremely unwise to let the inspector report on _Inspectee.slaveName's permanent position in the service industry. So, you greet _him2 politely, and bring _him2 down to $arcadeName to show _him2 _Inspectee.slaveName. The inspector has a single moment to stiffen in shock at the sight before _he2 stiffens involuntarily due to the security drone tasing _him2 unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by three more fuckable holes. When the inspector awakes to a dick intruding _his2 body, the pitch blackness and sound proofing disorientates _him2.
<<if $arcadeUpgradeInjectors == 1>>
- _He2 gasps as a needle breaks _his2 skin, filling _his2 veins with a potent mixture of aphrodisiacs to help _him2 better service the cock in _his2 cunt. _He2 attempts to defy, but a strong shock forces _him2 to tighten and bring _his2 partner to climax.
+ _He2 attempts to defy, but a strong shock forces _him2 to tighten and bring _his2 partner to climax.
<<elseif $arcadeUpgradeCollectors == 1>>
_He2 groans at the feeling of something sucking away at _his2 milkless tits, but it does nothing the distract from _his2 rape. _He2 struggles to resist in any way _he2 can, but _he2 is too firmly anchored to move.
<<else>>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index f539894bc0a..c8bb2317ad9 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -53,6 +53,10 @@ for(var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<<print budgetLine("publicServant", "Public servants")>>
+ <<print budgetLine("publicFuckdoll", "Free fuckdolls")>>
+
+ <<print budgetLine("publicGloryHole", "Free glory holes")>>
+
<<print budgetLine("concubine", "Concubine")>>
<<print budgetLine("headGirl", "Head girl")>>
diff --git a/src/uncategorized/saWorkAGloryHole.tw b/src/uncategorized/saWorkAGloryHole.tw
index 3a02da653bb..727c25cfa96 100644
--- a/src/uncategorized/saWorkAGloryHole.tw
+++ b/src/uncategorized/saWorkAGloryHole.tw
@@ -5,12 +5,12 @@
<<if $slaves[$i].assignment == "be confined in the arcade">>
<<if $arcadeUpgradeInjectors == 1>>
- <<set $beauty = Math.trunc(random(170,210)+(20*(4-$slaves[$i].anus))+(10*(4-$slaves[$i].vagina)) * 1.2)>> /*Amount of sexual acts per week in the arcade with upgrade*/
+ <<set $beauty = random(170,210)+ 20 * (4 - ($slaves[$i].anus - 2 * $arcadeUpgradeInjectors)) + 10 * ( 4 - ($slaves[$i].vagina - 2 * $arcadeUpgradeInjectors)) + Math.trunc($slaves[$i].health / 5)>> /*Amount of sexual acts per week in the arcade with upgrade*/
<<else>>
- <<set $beauty = random(170,210)+(20*(4-$slaves[$i].anus))+(10*(4-$slaves[$i].vagina))>> /*Amount of sexual acts per week in the arcade*/
+ <<set $beauty = random(170,210) + 20 * (4 - $slaves[$i].anus) + 10 * (4 - $slaves[$i].vagina) + Math.trunc($slaves[$i].health / 5)>> /*Amount of sexual acts per week in the arcade*/
<</if>>
<<else>>
- <<set $beauty = Math.trunc(random(170,210)+(20*(4-$slaves[$i].anus))+(10*(4-$slaves[$i].vagina)) * 0.8)>> /*Amount of sexual acts per week with a gloryhole*/
+ <<set $beauty = Math.trunc((random(170,210) + 20 * (4 - $slaves[$i].anus) + 10 * (4 - $slaves[$i].vagina) + $slaves[$i].health / 5) * 0.8)>> /*Amount of sexual acts per week with a gloryhole*/
<</if>>
<<set $FResult = $arcadePrice>>
@@ -253,11 +253,11 @@ $His feelings, skills, and appearance do not matter. $He is condemned to a world
<</if>>
<<else>> /*Shouldn't be "publicServant" but a new appropriate repX name*/
<<if $slaves[$i].assignment == "work a glory hole">>
- <<run repX(Math.trunc($beauty*$FResult/5), "publicServant", $slaves[$i])>>
+ <<run repX(Math.trunc($beauty*$FResult/5), "publicGloryHole", $slaves[$i])>>
<<elseif $slaves[$i].assignment == "be confined in the arcade">>
- <<run repX(Math.trunc($beauty*$FResult/5), "publicServant", $slaves[$i])>>
+ <<run repX(Math.trunc($beauty*$FResult/5), "arcade", $slaves[$i])>>
<<else>>
- <<run repX(Math.trunc($beauty*$FResult/5), "publicServant", $slaves[$i])>>
+ <<run repX(Math.trunc($beauty*$FResult/5), "working a gloryhole in an unregistered building", $slaves[$i])>>
<</if>>
<</if>>
<<set _profits += Math.trunc($beauty*$FResult)>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index dfa981c400f..049119895c9 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -44,9 +44,9 @@ _slaveSexSupplyClub = slaveSexSupplyClub()>>
$arcologies[0].FSDegradationist -= Math.trunc(5 * _degradationistPenalty)>>
<<run repX(-100 * _degradationistPenalty, "futureSocieties")>>
<<if _degradationistPenalty > 0.5>>
- <br>Your endeavors to see slaves as less than human are hampered as citizens find that there are too few slaves ready to be treated as sexual objects around, your development towards a degradationist society is damaged as a result.
+ <br>Your endeavors to see slaves as less than human are hampered as citizens find that there are too few slaves ready to be treated as sexual objects around. @@.red;Development towards a degradationist society is damaged@@ as a result.
<<else>>
- <br>Your endeavors to see slaves as less than human are slightly hampered as citizens find that thare are not quite enough slaves ready to be treated as sexual objects around, your development towards a degradationist society is lightly damaged as a result.
+ <br>Your endeavors to see slaves as less than human are slightly hampered as citizens find that thare are not quite enough slaves ready to be treated as sexual objects around. @@.red;Development towards a degradationist society is lightly damaged@@ as a result.
<</if>>
<<else>>
<br>Your citizens were expecting to see more slaves available as sexual objects, but there aren't enough complaints to damage your societal development at this time.
@@ -59,7 +59,7 @@ _slaveSexSupplyClub = slaveSexSupplyClub()>>
<<if _slaveSexSupplyArcade >= _arcadeDemandDeg * 1.5>>
<<set $arcologies[0].FSDegradationist += 2>>
<<run repX(500, "futureSocieties")>>
- <br>Your citizens find themselves surrounded by slaves ready to be degraded and used as sexual objects, this goes a long way to helping establish your degradationist society.
+ <br>Your citizens find themselves surrounded by slaves ready to be degraded and used as sexual objects, this @@.green;helps to establish your degradationist society@@.
<<else>>
<br>You are providing your citizens with an adequate amount of slaves to be used as sexual objects, as is expected in your degradationist society.
<</if>>
@@ -112,13 +112,42 @@ _slaveSexSupplyClub = slaveSexSupplyClub()>>
<<set _lowerClassSexDemand -= _slaveSexSupplyArcade>>
<</if>>
<<print _lowerClassSexDemand>>
-<<if _lowerClassSexDemand > Math.trunc($lowerClass * _LCRent) * 2>>
+<<if _lowerClassSexDemand > $lowerClass * _LCRent * 3>> /*You are providing < 40% of their desired amount of sex*/
<br>Your lower class citizens have @@.red;far too few options for sexual relief@@ inside your arcology.
-<<elseif _lowerClassSexDemand > Math.trunc($lowerClass * _LCRent)>>
+ <<if $week <= 30>>
+ They trust you will take care of this issue as soon as you are settled in.
+ <<set $lowerClassSatisfied = 0>>
+ <<else>>
+ It is @@.red;causing dissatisfaction@@ among your lower class.
+ <<set $lowerClassSatisfied = -1>>
+ <</if>>
+<<elseif _lowerClassSexDemand > $lowerClass * _LCRent * 2>> /*You are providing between 40 and 60% of their desired amount of sex*/
<br>Your lower class citizens need @@.red;some more avenues for sexual relief@@ inside your arcology.
-<<else>>
+ <<if $week <= 40>>
+ They see @@.green;you are on the right track@@ and anticipate further improvements.
+ <<set $lowerClassSatisfied = 1>>
+ <<elseif $week <= 60>>
+ Their patience is being tested.
+ <<set $lowerClassSatisfied = 0>>
+ <<else>>
+ It is @@.red;causing dissatisfaction@@ among your lower class.
+ <<set $lowerClassSatisfied = -1>>
+ <</if>>
+<<elseif _lowerClassSexDemand > $lowerClass * _LCRent>> /*You are providing between 60 and 80% of their desired amount of sex*/
+ <br>Your lower class citizens have no issue finding the sexual relief they need inside your arcology.
+ <<if $week <= 50>>
+ They are @@.green;delighted@@ with how quickly you've provided for them.
+ <<set $lowerClassSatisfied = 1>>
+ <<else>>
+ <<set $lowerClassSatisfied = 0>>
+ <</if>>
+<<elseif _lowerClassSexDemand == 0>> /*You are providing 100% or more of their desired amount of sex*/
<br>Your lower class citizens are @@.green;delighted with the abundence of sexual services@@ inside your arcology.
-<</if>> /*These states still need some consequences, potentially also dependant on $week TODO*/
+ <<set $lowerClassSatisfied = 2>>
+<<else>> /*You are providing > 80% of their desired amount of sex*/
+ <br>Your lower class citizens are @@.green;happy with the availability of sexual services@@ inside your arcology.
+ <<set $lowerClassSatisfied = 1>>
+<</if>>
<br><br>
<<for $i = 0; $i < _SL; $i++>>
--
GitLab