diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0e74c4bd45ab5e664f358282b40a2d8bcd17dfe8..89893a98b94955ac343222c991e1e551b18baf9a 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,11 @@ Pregmod
0.10.7.1-2.1.x
+ 6
+ -fixes
+ -cleaning
+ -adjustments to secEx balances
+
02/06/2019
5
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index de2b09e8e0fc101ec0c81d810eea906aa6042e46..69753acb2ab78a7706c6bc4ca0271c52c840f9b7 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -29,7 +29,7 @@
<<print Interactions()>>
<<include "WC">>
- <<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>>
+ <<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>> <<= MercCon()>>
<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1,$SF.MercCon.View = 1]]
<br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2,$SF.MercCon.View = 0]]<br>
diff --git a/src/SpecialForce/NamingColonel.tw b/src/SpecialForce/NamingColonel.tw
index 33867ce92e938899535da96de4e182c284beef56..da38d5d19890e63fe3d4bfc958bb00daef8b508e 100644
--- a/src/SpecialForce/NamingColonel.tw
+++ b/src/SpecialForce/NamingColonel.tw
@@ -1,9 +1,9 @@
:: Security Force Naming-Colonel [nobr]
-<<set $nextButton = " ">> <<if ndef $Progresss>> <<set $Progress = -1>> <</if>>
-<<if $Progresss < 0>>
+<<set $nextButton = " ">>
+<<if $SF.IntroProgress < 0>>
You instruct $assistantName to announce to the arcology's citizenry that you will be making an important announcement in the near future regarding the security situation. Given the damage still present from the Daughters' attack, everyone will be tuning in. You also instruct your assistant to begin quietly investigating potential leadership figures for the force itself.
It's been a short while since you told your citizens that you were going to talk to them about their security, and by all accounts, they've turned out in force to watch your address over the arcology's internal communications system. You wake up early, relieve your frustrations on a few slaves woken out of deep sleep, and take position behind your desk. You also call over a slave and push her under your desk. The unspoken instruction is clear, and she begins enthusiastically
- <<if $PC.dick == 1>>
+ <<if $PC.dick > 0>>
sucking your cock, taking it as deep as she can without gagging.
<<else>>
eating you out, pressing her face into your pussy and forcing her tongue deep inside you.
@@ -14,23 +14,21 @@
<br><br>As you speak, you carefully monitor the citizens' opinions as indicated on their communication devices. It is uniformly positive — they know whom they have to thank for their continued survival and dominance. You also monitor your arousal given the ministrations of your slave. A few small movements on your part communicate to your citizens what is happening without being too obvious. Free Cities business etiquette respects business conducted while being subtly serviced (and your doing so during such a public and important broadcast signals how seriously you are taking it), but a climax would be seen as a serious lack of discipline.
<br><br>You finally wrap up your speech, declaring yourself Marshal of the newly-formed <<textbox "$SF.Lower" $SF.Lower "Security Force Naming-Colonel">>
<br><br>You close the link to the communication system and read a message from your assistant that appeared during the last moments of your address. In consultation with major figures in the mercenary community, a suitable candidate for day-to-day command of the new unit has been found. Your instructions were to keep you in the dark about them so as to avoid prejudgment. They are waiting outside your office.
- <br><br>[[Invite them inside|Security Force Naming-Colonel][$Progresss = 1]]
-<<elseif $Progresss < 2>> <<= SFNameCapsCheck()>>
+ <br><br>[[Invite them inside|Security Force Naming-Colonel][$SF.IntroProgress = 1]]
+<<elseif $SF.IntroProgress < 2>> <<= SFNameCapsCheck()>>
The figure that enters is not what you were expecting, given your previous experiences with the mercenary groups that work with the arcology owners of the Free Cities. Most mercenaries you've worked with have been grizzled stout men, veterans of the Old World militaries that finally had too much and went private. Instead, a woman walks in.
- <<if $SF.Colonel.Core == "">>
+ <<if $SF.Colonel.Core === "">>
She strikes you as someone who is likely to be:
<br><br>[[Kind|Security Force Naming-Colonel][$SF.Colonel.Core = "kind"]]
<br>[[Cruel and psychopathic|Security Force Naming-Colonel][$SF.Colonel.Core = "cruel"]]
<br>[[A brazen warmonger|Security Force Naming-Colonel][$SF.Colonel.Core = "brazen"]]
<br>[[Jaded|Security Force Naming-Colonel][$SF.Colonel.Core = "jaded"]]
<br>[[Shell-shocked|Security Force Naming-Colonel][$SF.Colonel.Core = "shell shocked"]]
- <</if>>
- <<if $SF.Colonel.Core !== "">>
+ <<else>>
She is likely to be ''$SF.Colonel.Core''.
<br><br>She strides in, stopping in front of your desk,
<<switch $SF.Colonel.Core>>
- <<case "kind">>
- pulling off a laid-back salute with an easy grin.
+ <<case "kind">> pulling off a laid-back salute with an easy grin.
<<case "cruel">>
her eyes flashing a hard glare in an instant before quickly softening into those of someone who wants something you have.
<<case "brazen">>
@@ -40,21 +38,13 @@
<</switch>>
She is very tall and wearing the pants, boots, gloves, and the tank top undershirt of a standard female combat uniform. Her bare arms and upper body are corded with muscle, and through the tank top's thin fabric you can see both the shape of her muscled abdomen and the curves of her small but perky breasts, complete with what your experience tells you are barbell nipple piercings. Her eyes are alive with intelligence, and you can see her scanning your office, clearly impressed by its opulence. Her hair is shaved close to the scalp, and her ears and nose are heavily pierced. You can make out three long, ugly scars running over top of the mottled tissue of a previous, severe burn along one side of her face, as well as numerous smaller scars and burns on her bare arms. She's been disarmed prior to meeting you; the pistol holster on her hip lies empty, as do at least three knife holsters about her person.
<br><br>Returning your gaze to her face, she crosses her arms underneath her chest, pressing her breasts up and forward. You have her measure. Given the generally patriarchal nature of both the mercenary community, and the same nature combined with the heavily sexualized lifestyle of the Free Cities, she's decided to embrace her position rather than fight it.
- <br><br>"So," she begins, "you're the boss." You invite her to sit down. "No thanks, boss. Besides,"
+ <br><br>"So," she begins, "you're the boss." You invite her to sit down. "No thanks, boss. Besides," She
<<switch $SF.Colonel.Core>>
- <<case "kind">>
- she playfully
- <<case "shell shocked">>
- she uncomfortably
- <<default>>
- she
+ <<case "kind">> playfully
+ <<case "shell shocked">> uncomfortably
<</switch>>
indicates the slave under your desk, "you look a little occupied." She nods at the camera across from you. "Saw the speech. Very nice. I'd heard you crazy bastards do business while getting
- <<if $PC.dick == 1>>
- sucked off,
- <<else>>
- eaten out,
- <</if>>
+ <<if $PC.dick > 0>> sucked off, <<else>> eaten out, <</if>>
but I've never seen anyone actually do it. Hell, most of you people don't want to have to have too much to do with a merc like me. I usually get my instructions remotely."
<<switch $SF.Colonel.Core>>
<<case "jaded" "brazen">>
@@ -75,12 +65,12 @@
<</switch>>
"Joined with another big outfit, became the number two, then shit went bad and I had to run. Been a solo fighter and slaver ever since. I know my work, and I know I can make this work."
- <br><br>You feel your climax approaching and hold up a finger. The merc pauses while you
- <<if $PC.dick == 1>>
- grab the slave's head, forcing your cock roughly down her throat while you cum. She swallows as much as she can before pulling away, coughing.
+ <br><br>You feel your climax approaching and hold up a finger. The merc pauses while you grab the slave's head
+ <<if $PC.dick > 0>>
+ then force your cock roughly down her throat while you cum. She swallows as much as she can before pulling
<<else>>
- grip the slave's head tightly with your thighs, pressing her face tightly against your pussy as you cum. When you release her, she pulls away, coughing.
- <</if>>
+ tightly with your thighs, pressing her face tightly against your pussy as you cum. When you release her, she pulls
+ <</if>> away, coughing.
<br><br>
<<if $SF.Colonel.Core === "shell shocked">>
@@ -116,9 +106,9 @@
A glint runs through her eyes. "Sounds like a good fucking time."
<br><br>You quickly decide she'll do. You tap a few commands on your desk's console, assigning her personal quarters on the arcology's higher levels and transferring her first stipend to her new account. You also ask her what title she wants.
<br><br>"Title?" Another short laugh. "I guess I do need one, given that I'm all official and shit now." She thinks for a moment. "I was a major before I went freelance, and I think I'd like a promotion. Colonel sounds good." You make a note of this in her file. "You people don't seal contracts with a fuck do you?" Reassuring her you don't, she laughs again. "Good. I make it a point never to fuck the boss. It's bad for business." She turns around. "Well, I guess I'd better get to it. Your helper-thing assigned me space on the lower levels for the firebase. I brought a few squads of guys I know from the old days to start, but we'll grow fast once I put the word out, I guarantee it."
- <br><br>[[Let her leave|Security Force Naming-Colonel][$Progresss = 2]]
+ <br><br>[[Let her leave|Security Force Naming-Colonel][$SF.IntroProgress = 2]]
<</if>>
-<<elseif $Progresss < 3>> <<set $nextLink = "RIE Eligibility Check",$nextButton = "Continue">> <<unset $Progresss>>
+<<elseif $SF.IntroProgress < 3>> <<set $nextLink = "RIE Eligibility Check",$nextButton = "Continue">>
She turns and leaves, and you chase the slave out after her. A few minutes later, a soft chime announces the arrival of a message. It's from the Colonel.
<br><br>//Hey boss, just wanted to mention something else. In your speech you said that you were going to be paying for $SF.Lower. In my mind that means it's yours, no matter what anyone else here might think. I do what you tell me to do. I make sure the troops behave as you want them to behave. I've worked for some 'nice guys' in the past, and I can do that job if you want. It's boring, but sustainable, and I'll have the $SF.Lower turning a profit and supporting the arcology in good order. But if you let me <<if $SF.Colonel.Core === "cruel">>off the leash<<else>>do what I do<</if>> and throw any Old World complaints in the trash where they belong, I promise you'll have money pouring into your coffers, even accounting for the good amounts me and my boys will pocket along the way. You'll have an empire in short order.
<<if $mercenaries > 1>>
diff --git a/src/SpecialForce/Proposal.tw b/src/SpecialForce/Proposal.tw
index 10a9998b37807d419372804b3cd6c3ee91863b7f..979ff678f950124a94f35f11d81fbc20f67a1e2d 100644
--- a/src/SpecialForce/Proposal.tw
+++ b/src/SpecialForce/Proposal.tw
@@ -9,6 +9,6 @@ The Free Cities were founded on the principles of unrestrained anarcho-capitalis
<<set _price = 20000>> <<if $PC.warfare >= 100>> <<set _price *= .5>>
<<elseif $PC.warfare >= 50||$PC.career === "arcology owner">> <<set _price *= .75>> <</if>>
<br><<link "Prepare for an announcement.""Security Force Naming-Colonel">> <<replace "#result">>
- <<= SFInit()>> <<set $SF.Active = 1>><<run cashX(forceNeg(_price), "specialForces")>>
+ <<= SFInit()>> <<set $SF.Active = 1,$SF.IntroProgress = -1>> <<run cashX(forceNeg(_price), "specialForces")>>
<</replace>> <</link>><br>//Initial costs are @@.yellowgreen;<<print cashFormat(_price)>>@@ and upon establishment the force will have significant support costs until it is self-sufficient.//
<br><<link "The current measures are enough.""RIE Eligibility Check">> <<replace "#result">> <<set $SF.Active = 0>> <</replace>> <</link>> </span>
\ No newline at end of file
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 725d301ab31ea12be2cb73a1a4aa6e1cc3af5167..1798e89ac207aadf8a8475d4432ca625bb350544 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -73,6 +73,7 @@ window.Count = function() {
else {T.Env=2;}
T.SFSubsidy=5000*(1+((V.SF.Squad.Troops/100)+(V.SF.Size/100)));
SFNameCapsCheck();
+ if (V.SF.IntroProgress > -1) delete V.SF.IntroProgress;
};
window.Firebase = function() {
@@ -443,11 +444,11 @@ window.MercCon = function() {
};
window.Facility = function() {
const V=State.variables;
- V.SF.Facility={Toggle:V.SF.Facility.Toggle, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
+ V.SF.Facility={Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]};
};
window.SFInit = function() {
- Main();Squad();Colonel();MercCon();Facility();
+ Main();Squad();Colonel();
};
window.SFBC = function() {
@@ -685,9 +686,8 @@ window.FlavourText = function() {
const V=State.variables,T=State.temporary,S=V.SF.Squad;
var r=``;
V.nextButton=" "; r += `<br>`;
- r += `You continue towards the common area, the soldiers you pass, nod respectfully, salute, or bow slightly, as they please.`;
- r +=`You pass the briefing areas, the officers and sergeants of the force are conferring over planning tables and display screens regarding their upcoming deployments.`;
- r += `<br><br><div style="margin-left:2em">The commanders are`; if (V.SF.Target === "recruit") {
+ r +=`You continue towards the common area, the soldiers you pass, nod respectfully, salute, or bow slightly, as they please. You pass the briefing areas, the officers and sergeants of the force are conferring over planning tables and display screens regarding their upcoming deployments.`;
+ r += `<br><br><div style="margin-left:2em">The commanders are `; if (V.SF.Target === "recruit") {
r += `viewing lists of potential recruits for ${V.SF.Lower}. Mainly mercenaries and Old World soldiers who might be receptive to an offer of employment and residence within the arcology, in addition to some citizens of the arcology who wish to have some excitement in their lives.`;
} else if (V.SF.Target === "secure") {
r += `reviewing maps of trade routes to the arcology as well as nearby merchant hubs, arranging their future deployments to best protect them and encourage business and trade.`;
@@ -711,7 +711,7 @@ window.FlavourText = function() {
r += `<br>You arrive at the firebase's common area, a nest of bars, pleasure dens, public spaces, and other facilities catering to the soldiers' needs and giving them somewhere to spend their free time, since they do not mingle with your citizens on the higher levels or exit the arcology except on deployment. It is well-occupied by the soldiers not currently tasked with duties, and they respectfully move out of your way as you approach, clearing a path for you to move forward.`;
r += `<br><br><div style="margin-left:2em">`;
- r += `The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are`;
+ r += `The amenities are staffed by menial slaves, captured by the soldiers on their excursions. They are `;
if (V.SF.Depravity <= 0.3 && V.SF.Colonel.Core === "kind") {
r += `wearing plain jumpsuits and slim identification collars to set them apart from the soldiers, and look resigned but not fearful. The soldiers themselves socialize at the bars, in small groups around tables, and in the gambling parlors. Many of them can be seen entering or leaving the dens occupied by the sexual slaves they have acquired. Laughter from the carousing soldiers can be heard at all times. Small groups of slaves move freely between the plaza and their basic accommodations attached to the firebase.`;
} else if (V.SF.Depravity <= 0.6 && V.SF.Colonel.Core === "kind") {
@@ -721,7 +721,7 @@ window.FlavourText = function() {
} else if (V.SF.Depravity <= 1.2) {
r += `topless, wearing only a single undergarment and heavy steel collars to set them apart from the soldiers, and often shoot fearful looks at the soldiers. The soldiers occupy themselves primarily with sex, pulling slaves onto benches and fucking them hard in public. Many soldiers stagger around or lie passed out from drug and alcohol abuse.`;
} else if (V.SF.Depravity >= 1.5 && (V.SF.Colonel.Core === "Warmonger" || V.SF.Colonel.Core !== "Shell Shocked") ) {
- r += `To a one, they are naked, and are wearing heavy shock collars to force obedience. Most are wild-eyed with fear or dull-eyed from mental collapse, and many others bear marks of abuse. Few of the slaves are here long-term, the depraved pleasures of the soldiers resulting in enormous turnover and loss of 'damaged' stock. The extreme libations of the soldiers are ever-present. Drunken soldiers stagger around everywhere, beating slaves too slow to get out of their way. Others lie sprawled out on the ground, rendered senseless from heavy drug abuse. Some walk around naked, and hold slaves down on the benches scattered around, raping or sodomizing them with their cocks or their personal strap-ons as they desire. In alcoves, some soldier-lover pairs fuck loudly, moaning in pleasure.`;
+ r += `naked, and are wearing heavy shock collars to force obedience. Most are wild-eyed with fear or dull-eyed from mental collapse, and many others bear marks of abuse. Few of the slaves are here long-term, the depraved pleasures of the soldiers resulting in enormous turnover and loss of 'damaged' stock. The extreme libations of the soldiers are ever-present. Drunken soldiers stagger around everywhere, beating slaves too slow to get out of their way. Others lie sprawled out on the ground, rendered senseless from heavy drug abuse. Some walk around naked, and hold slaves down on the benches scattered around, raping or sodomizing them with their cocks or their personal strap-ons as they desire. In alcoves, some soldier-lover pairs fuck loudly, moaning in pleasure.`;
if (jsRandom(1,100) <= 50) {
r += `Off to the side, a group of soldiers brutally gangbang a very young slave girl, with one soldier buried balls-deep in her ass, another brutally sawing a barbed strap-on in and out of her pussy, and a third with his cock forced deep down her throat. The slave girl struggles and gags, desperate for breath or relief.`;
} else if (jsRandom(1,100) > 50) {
diff --git a/src/art/vector/Generate_Stylesheet.tw b/src/art/vector/Generate_Stylesheet.tw
index a9597a4c95a3fe4eb3be83a99692512de54e8b53..cb50ba685a6b24f2c6fc5015a064f0e72688c044 100644
--- a/src/art/vector/Generate_Stylesheet.tw
+++ b/src/art/vector/Generate_Stylesheet.tw
@@ -10,16 +10,17 @@
/* setup height scaling and style */
<<if $seeHeight == 0 || ($seeHeight == 1 && $args[1] == 3)>>
- <<set _slaveHeightScale = 100>>
+ <<set _slaveHeightScale = 1>>
<<set _margin = 0>>
<<else>>
- <<set _slaveHeightScale = Math.trunc(_artSlave.height/2)>>
- <<set _margin = 100 - _slaveHeightScale>>
+ <<set _slaveHeightScale = _artSlave.height/200>>
+ <<set _margin = Math.max(50 - (50 * _slaveHeightScale), 0)>>
<</if>>
<<print "<style>."+_art_display_class+" {
position: absolute;
- height: " + _slaveHeightScale + "%;
+ height: 100%;
+ transform: scale(" + _slaveHeightScale + ");
margin-top: " + _margin + "%;
margin-left: auto;
margin-right: auto;
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dbc4211330690c272ae41eda46a6a07d67c294a5..03f944c3392222943712bc7bda97ae181a02489f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1496,11 +1496,7 @@ erectileImplant: 0
<<set $DefaultBirthDestination = "individually decided fates">>
<<set $abbreviateHormoneBalance = 2>>
-<<if def $SF.Toggle>>
- <<set $SF = {Toggle:$SF.Toggle, Facility:{Toggle:$SF.Facility.Toggle}}>>
-<<else>>
- <<set $SF = {Toggle:0, Facility:{Toggle:0}}>>
-<</if>>
-<<set $SF.Active = -1>>
+<<if def $SF.Toggle>> <<set $SF={Toggle:$SF.Toggle}>> <<else>> <<set $SF={Toggle:0}>> <</if>>
+<<set $SF.Active=-1>> <<= Facility()>>
<<goto "Alpha disclaimer">>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index a55c854f33f1a2e8f7ba880b21286480c32b1872..94026f56c35bc21483cff86afdd58fd3d0868f77 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -581,7 +581,7 @@ window.DefaultRules = (function() {
r += `<br>Breeding regulations forbid the use of cervix penetrating dildos on marked slaves, so the virgin ${slave.slaveName} has been given a standard length huge dildo for her pussy.`;
slave.vaginalAccessory = "huge dildo";
} else {
- r += `<br>slave.slaveName is a virgin and has been given a `;
+ r += `<br>${slave.slaveName} is a virgin and has been given a `;
if (slave.vagina >= 2)
r += `massive and oversized dildo to permanently gape her cunt.`;
else {
@@ -650,11 +650,11 @@ window.DefaultRules = (function() {
break;
case "none":
- r += `<br>slave.slaveName is a virgin and has been instructed not to use a vaginal accessory.`;
+ r += `<br>${slave.slaveName} is a virgin and has been instructed not to use a vaginal accessory.`;
break;
default:
- r += `<br>slave.slaveName is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`;
+ r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -834,7 +834,7 @@ window.DefaultRules = (function() {
r += `<br>Breeding regulations forbid the use of anal plugs that can damage a growing fetus on marked slaves, so the anal virgin ${slave.slaveName} has been given a standard length huge plug for her anus.`;
slave.buttplug = "huge plug";
} else {
- r += `<br>slave.slaveName is an anal virgin and has been given a `;
+ r += `<br>${slave.slaveName} is an anal virgin and has been given a `;
if (slave.anus >= 2)
r += `massive and oversized plug to permanently gape her asshole.`;
else {
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 5494d0e3b23a18713802d1760c2fc3a4c33ddccf..cf2394c7099a18e38f7ccc3a18fe6f2aeebe89c7 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1930,13 +1930,13 @@ App.Entity.SlaveState = class SlaveState {
/** Has the slave gone through female puberty.
*
* 0: no; 1: yes */
- this.pubertyXX = 0;
+ //this.pubertyXX = 0;
/** Target .physicalAge for male puberty to occur. */
this.pubertyAgeXY = 13;
/** Has the slave gone through male puberty.
*
* 0: no; 1: yes */
- this.pubertyXY = 0;
+ //this.pubertyXY = 0;
/**
* not fully implemented.
* * 0: no scars
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 5803bd691f59d8c92e08632acdef6459be6ebe85..fdc6b33d3608d857dc1eab972c43756905995b1f 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -244,7 +244,7 @@ __Division Management__
<<set $corpCash += $corpDivExtraSlaves * 10 * menialSlaveCost(-$corpDivExtraSlaves) + $corpDivExtraDev * 16000,
$corpRev += $corpDivExtraSlaves * 10 * menialSlaveCost(-$corpDivExtraSlaves),
$corpAssetsDev -= $corpDivExtraDev * 16000,
- $corpExpandToken += 1
+ $corpExpandToken += 1,
$menialDemandFactor -= $corpDivExtraSlaves,
$corpDivExtra = 0,
$corpDivExtraDev = 0>>
@@ -1465,7 +1465,7 @@ __Slave specialization__
<<if ndef $corpSpecImplants && $corpDivSurgery > 0>> /*This used to be $surgicalUpgradeImplants, it is the surgery specialization*/
<br>Slave implants are [[Applied|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Not Applied|Manage Corporation][$corpSpecImplants = 0, $corpSpecTimer = 2]]
<</if>>
- <<if ndef $corpSpecGenitalia && $corpDivSurgery > 100>> /*This used to be $surgicalUpgradeGenitalia, it is the surgery specialization*/
+ <<if ndef $corpSpecGenitalia && $corpDivSurgeryDev > 100>> /*This used to be $surgicalUpgradeGenitalia, it is the surgery specialization*/
<br>Slaves get their genitalia reconfigured [[Add Pussy|Manage Corporation][$corpSpecPussy = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Pussy|Manage Corporation][$corpSpecPussy = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Dick|Manage Corporation][$corpSpecDick = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Dick|Manage Corporation][$corpSpecDick = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Balls|Manage Corporation][$corpSpecBalls = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Balls|Manage Corporation][$corpSpecBalls = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]]
<</if>>
<<if ndef $corpSpecTrust && $corpDivBreak > 0>> /*This used to be $generalUpgradeBreaking, it is the slave breaking specific specialization*/
@@ -1863,7 +1863,7 @@ __Slave specialization__
<<if $arcologies[0].FSPhysicalIdealist == "unset">>
[[Aim for Frail|Manage Corporation][$corpSpecMuscle = 1, $corpSpecTimer = 2]] |
<</if>>
- [[Aim for Soft][$corpSpecMuscle = 3, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecWeight>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
+ [[Aim for Soft|Manage Corporation][$corpSpecMuscle = 3, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecWeight>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
<</if>>
<<elseif $corpSpecMuscle == 3>>
<br>The corporation is aiming for slaves with soft muscles.
@@ -1876,10 +1876,10 @@ __Slave specialization__
<<elseif $corpSpecMuscle == 4>>
<br>The corporation aims for toned muscles.
<<if $corpSpecTimer == 0>>
- <<if $corpSpecToken > 0 && ($corpDivBreakDev + $corpDivSurgery + $corpDivTrainDev > 100)>>
+ <<if $corpSpecToken > 0 && ($corpDivBreakDev + $corpDivSurgeryDev + $corpDivTrainDev > 100)>>
[[Aim for Ripped|Manage Corporation][$corpSpecMuscle = 5, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
<</if>>
- [[Aim for Soft][$corpSpecMuscle = 3, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecWeight>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
+ [[Aim for Soft|Manage Corporation][$corpSpecMuscle = 3, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecWeight>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
<</if>>
<<elseif $corpSpecMuscle == 5>>
<br>The corporation aims for ripped slaves.
@@ -1955,7 +1955,7 @@ __Slave specialization__
<<elseif $corpSpecEducation == 1>>
<br>The corporation makes sure all slaves have a basic education.
<<if $corpSpecTimer == 0>>
- <<if $corpDivTrain > 200 && $corpSpecToken > 0>>
+ <<if $corpDivTrainDev > 200 && $corpSpecToken > 0>>
[[Advanced Education|Manage Corporation][$corpSpecEducation = 2, $corpSpecToken -= 1, $corpSpecTimer = 2]] |
<</if>>
[[No Education|Manage Corporation][$corpSpecEducation = 1, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecEducation>><<set $corpSpecToken += 1, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 91fc26bea84149c1718ed62c1ce6abff60416d2e..b638764275be877f50a802739692822631def084 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -528,7 +528,7 @@ Once $he's gotten $himself positioned, $subSlave.slaveName reaches around $activ
The distinctive sounds of a sexual encounter in which exactly one of the participants is enjoying $himself are coming from the dormitory. This is by no means uncommon, but this particular nonconsensual assignation sounds interesting, so you stick your head in on your way by. You're treated to the sight of <<EventNameLink $activeSlave>>'s $activeSlave.skin back and <<if ($activeSlave.butt > 4)>>massive ass<<elseif ($activeSlave.butt > 2)>>plush rear<<else>>cute butt<</if>> as $he kneels on one of the bedrolls. It isn't immediately clear what's going on, but $he's doing something with $his <<if canPenetrate($activeSlave)>>dick<<else>>hands<</if>>, and there are a pair of $subSlave.skin feet visible on either side of $him. $He's clearly got someone shoved down into the bedroll in front of $him, doggy style. That's the source of the whining.
<br><br>
-Advancing to get a better view, you identify the bottom as <<if $subSlave.bellyPreg >= 5000>>the pregnant <</if>><<EventNameLink $subslave>>. $activeSlave.slaveName has
+Advancing to get a better view, you identify the bottom as <<if $subSlave.bellyPreg >= 5000>>the pregnant <</if>><<EventNameLink $subSlave>>. $activeSlave.slaveName has
<<if canPenetrate($activeSlave)>>
<<if $activeSlave.dick > 4>>
$his gigantic dick up $subSlave.slaveName's
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 61aabae764bb00d7411e2f2279a8679f96ef5536..cf6be684c9fab00f2ca70a639666eacdcd644256 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -880,7 +880,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<run SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].drugs == "breast injections">>
<<set $slaves[$i].lactation = 1>>
- <<set $activeSlave.lactationDuration = 2>>
+ <<set $slaves[$i].lactationDuration = 2>>
<<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>>
<<set $slaves[$i].hips += 1>>
<<set $slaves[$i].butt += 1>>
@@ -913,7 +913,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<run SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].drugs == "intensive breast injections">>
<<set $slaves[$i].lactation = 1>>
- <<set $activeSlave.lactationDuration = 2>>
+ <<set $slaves[$i].lactationDuration = 2>>
<<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>>
<<set $slaves[$i].hips += 1>>
<<set $slaves[$i].butt += 1>>
@@ -946,7 +946,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<run SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].drugs == "hyper breast injections">>
<<set $slaves[$i].lactation = 1>>
- <<set $activeSlave.lactationDuration = 2>>
+ <<set $slaves[$i].lactationDuration = 2>>
<<if ($slaves[$i].geneMods.NCS == 0) && ($slaves[$i].hips < 1)>>
<<set $slaves[$i].hips += 1>>
<<set $slaves[$i].butt += 2>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 56ed6e7001aae723009d8637d1c325170392b8a3..0bb68500f687419618fa9d61ee2f3538377fa2c1 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -348,11 +348,10 @@
<</if>>
<<set _ML = $marrying.length>>
<<if (($MixedMarriage == 1 || $cheatMode == 1) && $activeSlave.relationship != 5 && $activeSlave.relationship != -3)>>
+ <<set _eligible = 1>>
<<for _m = 0; _m < _ML; _m++>>
<<if $marrying[_m] == $activeSlave.ID>>
<<set _eligible = 0>>
- <<else>>
- <<set _eligible = 1>>
<</if>>
<</for>>
<<if _eligible != 0>>