From 8deeb0f85cbec0438841e323bc3f95fa178113fe Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 9 May 2017 18:26:04 -0400
Subject: [PATCH] Vanilla fixes and economics accordian.
---
devNotes/beauty-test | 51 ++++---
src/events/intro/introSummary.tw | 9 ++
src/init/storyInit.tw | 3 +
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/arcmgmt.tw | 5 -
src/uncategorized/barracks.tw | 7 +-
src/uncategorized/buildingWidgets.tw | 2 +-
src/uncategorized/economics.tw | 156 ++++++++++++++++++++
src/uncategorized/lawCompliance.tw | 2 +-
src/uncategorized/manufacturing.tw | 2 +-
src/uncategorized/options.tw | 9 ++
src/uncategorized/persBusiness.tw | 12 --
src/uncategorized/reStandardPunishment.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 2 +-
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
15 files changed, 218 insertions(+), 48 deletions(-)
diff --git a/devNotes/beauty-test b/devNotes/beauty-test
index 5a3ee760404..e0f08b3d86f 100644
--- a/devNotes/beauty-test
+++ b/devNotes/beauty-test
@@ -192,16 +192,9 @@
<</if>> /* CLOSES FUCKDOLL CHECK */
/* WIP Content! */
-
-<<if $args[0].butt <= 10>>
- <<set $beauty += (1.5*$args[0].butt)>> /*15*/
-<<else>>
- <<set $beauty += (15+($args[0].butt/4))>> /*20*/
-<</if>>
-
/* Cock + Balls */
-<<if ($arcologies[0].FSAssetExpansionist != "unset") && $arcologies[0].FSGenderFundamentalist == "unset">>
+<<if ($arcologies[0].FSAssetExpansionist > 20) && $arcologies[0].FSGenderFundamentalist == "unset">>
<<if $args[0].dick >= 20>>
<<set $beauty += 17+($args[0].dick*($arcologies[0].FSAssetExpansionist/500))>> /*23*/
<<elseif $args[0].dick >= 10>>
@@ -305,13 +298,13 @@
<</if>>
<<elseif ($arcologies[0].FSGenderRadicalistLawFuta == 3)>>
<<if $args[0].butt >= 5>>
- <</if>>
- <<if $args[0].anus >= 2>>
+ <<set $beauty += ($args[0].butt-5)>>
<</if>>
<<if $args[0].hips >= 1>>
+ <<set $beauty += 4*($args[0].hips-1)>>
<</if>>
- <<if $args[0].analSkill > 60>>
- <<set $beauty += ($args[0].butt-5) + 2*($args[0].anus-2) + 4*($args[0].hips-1)>>
+ <<if $args[0].analSkill > 60 && $args[0].anus >= 2>>
+ <<set $beauty += 2*($args[0].anus-2)>>
<</if>>
<</if>>
<</if>>
@@ -319,7 +312,7 @@
/* boobs content */
-<<if ($arcologies[0].FSTransformationFetishist > 20) || ($arcologies[0].FSAssetExpansionist > 20)>>
+<<if ($arcologies[0].FSTransformationFetishist > 20 && $arcologies[0].FSSlimnessEnthusiast == "unset") || ($arcologies[0].FSAssetExpansionist > 20)>>
<<if $args[0].boobs <= 500>>
<<set $beauty += (0.02*($args[0].boobs-250))>>
<<elseif $args[0].boobs <= 1500>>
@@ -340,13 +333,13 @@
<</if>>
<<elseif ($arcologies[0].FSSlimnessEnthusiast > 20)>>
<<if $args[0].boobs <= 500>>
- <<set $beauty += (0.05*($args[0].boobs))>>
+ <<set $beauty += (0.05*($args[0].boobs))>> /*25*/
<<elseif $args[0].boobs <= 1000>>
- <<set $beauty += 25+(0.01*($args[0].boobs-500))>>
+ <<set $beauty += 10>>
<<elseif $args[0].boobs <= 3000>>
- <<set $beauty += 30>>
+ <<set $beauty += 5>>
<<else>>
- <<set $beauty += 30-(0.005*($args[0].boobs-3000))>>
+ <<set $beauty += 5-(0.005*($args[0].boobs-3000))>>
<</if>>
<<if $args[0].butt <= 3>>
<<set $beauty += (3*($args[0].butt-1))>>
@@ -375,7 +368,23 @@
<<set $beauty += 9>>
<</if>>
<</if>>
-
+<<if $arcologies[0].FSTransformationFetishist > 20>>
+ <<if ($arcologies[0].FSSlimnessEnthusiast > 20)>>
+ <<if $args[0].boobsImplant/$args[0].boobs < .75>>
+ <<set $beauty -= ((0.05*($args[0].boobs))+10)>> /*25*/
+ <</if>>
+ <<if $args[0].buttImplant/$args[0].butt < .75>>
+ <<set $beauty -= ((2*($args[0].butt-1))+10)>>
+ <</if>>
+ <<else>>
+ <<if $args[0].buttImplant/$args[0].butt < .75>>
+ <<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */
+ <</if>>
+ <<if $args[0].boobsImplant/$args[0].boobs < .75>>
+ <<set $beauty -= ((1.5*$args[0].butt)+6)>> /* will get nasty at huge sizes */
+ <</if>>
+ <</if>>
+<</if>>
/* other */
@@ -444,10 +453,6 @@
<</if>>
<</if>>
-
-
-
-
<<if ($arcologies[0].FSGenderRadicalist > 20 && $arcologies[0].FSGenderRadicalistLawFuta != 3) || ($arcologies[0].FSSlimnessEnthusiast > 20)>>
<<if $args[0].hips < 0>>
<<set $beauty += Math.abs($args[0].hips)>>
@@ -703,7 +708,7 @@
<<set _slimPass = 0>>
<</if>>
<<if _slimPass == 1>>
- <<set $beauty += ($arcologies[0].FSSlimnessEnthusiast/20)>>
+ <<set $beauty += 40+($arcologies[0].FSSlimnessEnthusiast/20)>>
<<else>>
<<set $beauty -= ($arcologies[0].FSSlimnessEnthusiast/20)>>
<</if>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index b52e0c2fc78..7091ac09555 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -355,6 +355,15 @@ Girls will not be able to impregnate others if their age is under <<textbox "$po
<br>
+Economic Tabs on weekly reports are
+<<if $useTabs == 0>>
+@@.red;DISABLED@@. [[Enable|Intro Summary][$useTabs = 1]]
+<<else>>
+@@.cyan;ENABLED@@. [[Disable|Intro Summary][$useTabs = 0]]
+<</if>>
+
+<br>
+
<<if $plot == 1>>
Game mode: ''two-handed''. Includes non-erotic events concerning the changing world.
[[Disable non-erotic events|Intro Summary][$plot = 0]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index b627674cb3e..d699f1ebbbe 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -544,6 +544,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $verboseDescriptions = 0>>
/* Accordion 000-250-006 */
<<set $useAccordion = 0>>
+
+<<set $useTabs = 0>>
+
/* alternate clothing access variables */
<<set $clothesBoughtBunny = 0>>
<<set $clothesBoughtConservative = 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 1979e190551..8af0f4f8f1a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -8541,7 +8541,7 @@ By the time you've finished with her sensitive ass, it shines red, and she is cr
<<case "boobs">>
She gasps as your hot mouth finds one of her $activeSlave.nipples nipples, and then moans openly as one of your hands mauls her other breast. Your other hand
<<case "pregnancy">>
- One of your hands begins to caress her<<if $activeSlave.pregnancy > 0>> pregnant<</if>> belly, worshipping its curve. Your other hand
+ One of your hands begins to caress her<<if $activeSlave.preg > 5>> pregnant<</if>> belly, worshipping its curve. Your other hand
<<case "dom" "sadist">>
You press yourself aggressively against her, and she presses back; you grind harder still, letting her know that she can let herself be a little aggressive, too. Groaning with pleasure and satisfaction, she kisses you furiously. One of your hands
<<case "masochist">>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 1b1da19a415..e7fa6b3b55f 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -574,8 +574,3 @@ Your ''business assistant'' manages the menial slave market.
<</if>>
<<silently>><<MenialPopCap>><</silently>>
<</if>>
-
-<<if $FSAnnounced > 0>>
- <br><br>
- <<include "FS Developments">>
-<</if>>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index ee619e0f7ed..177ea719c86 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -62,7 +62,12 @@ There are doors to magazines, armories, and training areas to all sides, and muf
<<if $vignette >= 2>>A third<<elseif $vignette>>Another<<else>>A<</if>> mercenary, who's rather obviously earned enough money to pay for the surgeries and drugs to turn herself into an imposing futanari, is pounding a dickgirl slave.
<<set vignette++>>
<<elseif $activeArcology.FSGenderFundamentalist != "unset">>
- <<if $vignette >= 2>>A third<<elseif $vignette>>Another<<else>>A<</if>> mercenary is fucking a slave doggy style. He's massaging her rounded belly as she enjoys her first foray into motherhood.
+ <<if $vignette >= 2>>A third<<elseif $vignette>>Another<<else>>A<</if>> mercenary is fucking a slave
+ <<if $activeArcology.FSRestart != "unset">>
+ lotus style. His hands are greedily following her womanly curves as they bang.
+ <<else>>
+ doggy style. He's massaging her rounded belly as she enjoys her first foray into motherhood.
+ <</if>>
<<set vignette++>>
<</if>>
<<if $activeArcology.FSPaternalist != "unset">>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index c273f46821c..2e768b02c31 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -365,7 +365,7 @@ Selling this sector would relenquish a 4% interest in $arcologies[0].name. Such
<</for>>
<<for _i = 25; _i <= 29; _i++>>
<<if $sectors[_i].type == "Sweatshops">>
- <<set $sweatshops++>>
+ <<set $Sweatshops++>>
<</if>>
<</for>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 85ec1376f17..9ae0d845778 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -15,6 +15,7 @@
<br><br>
+<<if $useTabs<1>>
<<include "Neighbors Development">>
<br><br>
@@ -23,6 +24,17 @@
<br><br>
+<<if $corpAnnounced == 1>>
+ <br>
+ <<if $corpIncorporated == 0>>
+ <span id="incorporate">
+ You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 20>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading concern. The IPO will involve 1000 shares at ¤20/share.">><</replace>><</link>> //Costs ¤30000//
+ </span>
+ <<else>>
+ <<include "Corporation Developments">>
+ <</if>>
+ <br><br>
+<</if>>
<<include "Reputation">>
<br><br>
@@ -34,3 +46,147 @@
<<include "Personal Notes">>
<</if>>
+<br><br>
+<<if $FSAnnounced > 0>>
+ <br><br>
+ <<include "FS Developments">>
+<</if>>
+<<else>>
+<head>
+<style>
+
+div.tab {
+ overflow: hidden;
+ border: 1px solid #ccc;
+ background-color: transparent;
+}
+
+div.tab button {
+ background-color: inherit;
+ float: left;
+ border: none;
+ outline: none;
+ cursor: pointer;
+ padding: 14px 16px;
+ transition: 0.3s;
+ font-size: 19px;
+}
+
+div.tab button:hover {
+ background-color: #444;
+}
+
+div.tab button.active {
+ background-color: #777;
+}
+
+.tabcontent {
+ display: none;
+ padding: 6px 12px;
+ -webkit-animation: fadeEffect 1s;
+ animation: fadeEffect 1s;
+}
+
+@-webkit-keyframes fadeEffect {
+ from {opacity: 0;}
+ to {opacity: 1;}
+}
+
+@keyframes fadeEffect {
+ from {opacity: 0;}
+ to {opacity: 1;}
+}
+</style>
+</head>
+<body>
+
+<div class="tab">
+ <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
+ <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button>
+ <<if $corpAnnounced == 1>>
+ <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button>
+ <</if>>
+ <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
+ <button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button>
+ <<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.preg >= 8 || $playerAging != 0>>
+ <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button>
+ <</if>>
+ <<if $FSAnnounced > 0>>
+ <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button>
+ <</if>>
+</div>
+
+<div id="Arcologies" class="tabcontent">
+ <div class="content">
+ <<include "Neighbors Development">>
+ </div>
+</div>
+
+<div id="Business" class="tabcontent">
+<div class="content">
+<<include "Personal Business">>
+</div>
+</div>
+
+<<if $corpAnnounced == 1>>
+<div id="Corporation" class="tabcontent">
+<div class="content">
+<<if $corpIncorporated == 0>>
+<span id="incorporate">
+You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 20>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading concern. The IPO will involve 1000 shares at ¤20/share.">><</replace>><</link>> //Costs ¤30000//
+</span>
+<<else>>
+<<include "Corporation Developments">>
+<</if>>
+</div>
+</div>
+<</if>>
+
+<div id="Reputation" class="tabcontent">
+<div class="content">
+<<include "Reputation">>
+</div>
+</div>
+
+<div id="Management" class="tabcontent">
+<div class="content">
+<<include "Arcology Management">>
+</div>
+</div>
+
+<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.preg >= 8 || $playerAging != 0>>
+<div id="Personal" class="tabcontent">
+<div class="content">
+<<include "Personal Notes">>
+</div>
+</div>
+<</if>>
+
+<<if $FSAnnounced > 0>>
+<div id="Societies" class="tabcontent">
+<div class="content">
+<<include "FS Developments">>
+</div>
+</div>
+<</if>>
+
+<script>
+function opentab(evt, tabName) {
+ var i, tabcontent, tablinks;
+ tabcontent = document.getElementsByClassName("tabcontent");
+ for (i = 0; i < tabcontent.length; i++) {
+ tabcontent[i].style.display = "none";
+ }
+ tablinks = document.getElementsByClassName("tablinks");
+ for (i = 0; i < tablinks.length; i++) {
+ tablinks[i].className = tablinks[i].className.replace(" active", "");
+ }
+ document.getElementById(tabName).style.display = "block";
+ evt.currentTarget.className += " active";
+}
+
+document.getElementById("defaultOpen").click();
+</script>
+
+</body>
+<</if>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index d96713fc848..4f3771ad109 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -26,7 +26,7 @@
<<set $activeSlave.dick += random(1,2)>>
<<elseif ($activeSlave.attrKnown == 0) && (random(1,3) == 1)>>
<<set $gingering = "aphrodisiac">>
- <<set $activeSlave.aphrodisiac = 2>>
+ <<set $activeSlave.aphrodisiacs = 2>>
<<set $activeSlave.attrKnown = 1>>
<<set $activeSlave.attrXX = random(60.90)>>
<<set $activeSlave.attrXY = random(60,90)>>
diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw
index 7bf10351d18..bf9f28858b1 100644
--- a/src/uncategorized/manufacturing.tw
+++ b/src/uncategorized/manufacturing.tw
@@ -13,7 +13,7 @@ This is a space in the arcology's service areas,
<<SectorSell>>
<br>
-<<if $sectors[$AS].type = "Sweatshops">>
+<<if $sectors[$AS].type == "Sweatshops">>
<<if $helots > 0>>
<br><br>
You own $helots menial slaves. This facility
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index d94bcee45c6..0dbbf531aee 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -182,6 +182,15 @@ Assignment performance vignettes on the end week report are
<br>
+Economic Tabs on weekly reports are
+<<if $useTabs == 0>>
+@@.red;DISABLED@@. [[Enable|Intro Summary][$useTabs = 1]]
+<<else>>
+@@.cyan;ENABLED@@. [[Disable|Intro Summary][$useTabs = 0]]
+<</if>>
+
+<br>
+
<<if ($verboseDescriptions == 1)>>
Your master suite ''will'' detail slave changes.
[[Disable|Options][$verboseDescriptions = 0]]
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 9084d0e0b5b..e64066e2818 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -342,18 +342,6 @@ Routine upkeep of your demesne costs @@.yellow;¤$costs.@@
<</if>>
<</if>>
-<<if $corpAnnounced == 1>>
- <br>
- <<if $corpIncorporated == 0>>
- <span id="incorporate">
- You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 20>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading concern. The IPO will involve 1000 shares at ¤20/share.">><</replace>><</link>> //Costs ¤30000//
- </span>
- <<else>>
- <<include "Corporation Developments">>
- <</if>>
- <br>
-<</if>>
-
<<if $securityForceActive == 1>>
<<include "Security Force EOW Report">>
<</if>>
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 656ab8bcd91..bd545503e8c 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -268,7 +268,7 @@
You tell her that she clearly needs practice being prompt. Your tone is conversational, but she doesn't mistake it for kindness. It's the tone you use with slaves when imparting guidance which is to be accepted and followed on pain of terrible punishment. You make her explain where she was and what she was doing previously, and require her to walk you there. She does, <<if $activeSlave.trust > 20>>trustingly<<elseif $activeSlave.trust >= -20>>rather fearfully<<else>>shaking with fear<</if>>, and when you get there you tell her to run to her next task. She hesitates for an instant, until you <<if $PC.title == 1>>bellow<<else>>shriek<</if>> at her to run! She takes off,
<<if $activeSlave.shoes == "extreme heels">>
tottering agonizingly along in her extreme heels. She isn't running, not really, but her slutty shoes are so ridiculous that she can't. She's going as fast as she possibly can.
- <<elseif ($activeSlave.shoes == "heels") || ($activeSlave.boots == "heels")>>
+ <<elseif ($activeSlave.shoes == "heels") || ($activeSlave.shoes == "boots")>>
running awkwardly in her <<if $activeSlave.shoes == "heels">>heels<<else>>heeled boots<</if>>.
<<else>>
running as fast as her legs can carry her.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 61f1c32008d..7120b482e71 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2492,7 +2492,7 @@
<<elseif $slaves[$i].inflation != 0 && $slaves[$i].inflationType == "cum">>
In addition to being an orally fixated cumslut, she is required to keep her belly bloated with cum at all times, making her life revolve around being full of cum. @@.yellow;She's become psychologically addicted to cum.@@
<<set $slaves[$i].sexualFlaw = "cum addict">>
- <<elseif $slaves[$i].cockfeeder != 0>>
+ <<elseif $cockFeeder != 0>>
In addition to being an orally fixated cumslut, she eats by sucking dick. @@.yellow;She's become psychologically addicted to cum.@@
<<set $slaves[$i].sexualFlaw = "cum addict">>
<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 92e1e798e3a..0bdfac4cd90 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -1,6 +1,6 @@
:: Slave Assignments Report [nobr]
-<h1> <<print $arcologies[0].name + " Weekly Report - Week " + $week>></h1>
+<h1> <<print $arcologies[0].name + " Weekly Slave Report - Week " + $week>></h1>
<<set $nextLink = "Economics", $nextButton = "Continue", _SL = $slaves.length>>
--
GitLab