diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 2bac10de259e0df00d4bd5144f5fb8023c76e9d1..945bffbdf8e323f8e0ccf89abc752ec5b28ff2bf 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -3089,7 +3089,6 @@ App.SF.UnitText = function(input) {
let recom1 = `has been recommissioned from the old world for ${V.SF.Lower}. It`;
let jets = `Formerly mothballed strike jets`,
- loc2 = ``,
radar = ``,
AAG = ``;
let prop = ``,
@@ -3098,21 +3097,6 @@ App.SF.UnitText = function(input) {
power1 = ``,
scramble1 = ``;
- if (V.week % 6 === 0) {
- let loc2 = `is`
- if (input !== 'HAT') {
- loc2 += ` moored to`;
- } else {
- loc2 += ` parked on`;
- }
- loc2 += ` the pier in the Naval Yard`;
- if (input === 'HAT') {
- loc2 += `, ready to ferry ${tons} tons of soldiers and vehicles`;
- }
- } else {
- const loc2 = `is patrolling the waters near ${V.arcologies[0].name}`;
- }
-
let recom = `has been recommissioned from the old world, and`;
let reactor0 = `Because diesel engines provide power and breathing oxygen is kept in pressurized canisters, the sub must frequently surface.`;
let reactor1 = ``,
@@ -3124,7 +3108,7 @@ App.SF.UnitText = function(input) {
let control = ``,
missiles = ``;
- let recom2 = `; has been recommissioned for use by ${V.SF.Lower}. It`;
+ let recom2 = `has been recommissioned for use by ${V.SF.Lower}. It `;
let tons = `200`,
skirt = ``,
guns = ``,
@@ -3137,6 +3121,21 @@ App.SF.UnitText = function(input) {
HATframe = ``,
loadout = ``;
+ let loc2 = ``;
+ if (V.week % 6 === 0) {
+ loc2 += `is`
+ if (input !== 'HAT') {
+ loc2 += ` moored to`;
+ } else {
+ loc2 += ` parked on`;
+ }
+ loc2 += ` the pier in the Naval Yard`;
+ if (input === 'HAT') {
+ loc2 += `, ready to ferry ${tons} tons of soldiers and vehicles`;
+ }
+ } else {
+ loc2 += `is patrolling the waters near ${V.arcologies[0].name}`;
+ }
switch (input) {
case 'firebase':
if (S.Firebase >= 0) {
@@ -3767,7 +3766,7 @@ App.SF.UnitText = function(input) {
const text17 = `<br> ''Amphibious Transport:''`;
if (S.HAT >= 2) {
skirt = `The skirt has been upgraded to increase durability and improve cushion when traveling over uneven terrain and waves.`;
- recom2 = `;`;
+ recom2 = ``;
}
if (S.HAT >= 3) {
guns = `A minigun`;
@@ -3798,7 +3797,7 @@ App.SF.UnitText = function(input) {
if (S.HAT >= 10) {
loadout = `An experimental loadout sacrifices all carrying capacity to instead act as a floating gun platform by mounting several rotary autocannons the deck, should the need arise.`;
}
- return `${text17} An air cushion transport vehicle, or hovercraft ${recom2} ${loc2}. ${guns} ${guns2} ${fans} ${turbines} ${speed} ${skirt} ${armor10} ${ramps} ${HATframe} ${loadout}`;
+ return `${text17} An air cushion transport vehicle, or hovercraft; ${recom2}${loc2}. ${guns} ${guns2} ${fans} ${turbines} ${speed} ${skirt} ${armor10} ${ramps} ${HATframe} ${loadout}`;
}
break;
}
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 576d273a637bd296e629e5d22a575eb2b3f55c34..fbb1c021432e0ed37b4f905c3c61d23b2ef0dddc 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -118,19 +118,20 @@ window.saServant = function saServant(slave) {
}
if (V.showVignettes === 1 && (slave.assignment === Job.SERVANT || slave.assignment === Job.SERVER)) {
- const _vignette = GetVignette(slave);
- t += ` __This week__ ${_vignette.text} `;
- if (_vignette.type === "cash") {
- if (_vignette.effect > 0) {
- t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(V.FResult*_vignette.effect))}.</span>`;
- } else if (_vignette.effect < 0) {
- t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(V.FResult*_vignette.effect)))}.</span>`;
+ const vignette = GetVignette(slave);
+ t += ` __This week__ ${vignette.text} `;
+ if (vignette.type === "cash") {
+ let FResult = FResult(slave);
+ if (vignette.effect > 0) {
+ t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(FResult * vignette.effect))}.</span>`;
+ } else if (vignette.effect < 0) {
+ t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(FResult * vignette.effect)))}.</span>`;
} else {
t += `an incident without lasting effect.`;
}
- cashX(Math.trunc(V.FResult * _vignette.effect), "houseServant", slave);
- } else if (_vignette.type === "devotion") {
- if (_vignette.effect > 0) {
+ cashX(Math.trunc(FResult * vignette.effect), "houseServant", slave);
+ } else if (vignette.type === "devotion") {
+ if (vignette.effect > 0) {
if (slave.devotion > 50) {
t += `<span class="hotpink">increasing ${his} devotion to you.</span>`;
} else if (slave.devotion >= -20) {
@@ -140,7 +141,7 @@ window.saServant = function saServant(slave) {
} else {
t += `<span class="hotpink">reducing ${his} hatred of you.</span>`;
}
- } else if (_vignette.effect < 0) {
+ } else if (vignette.effect < 0) {
if (slave.devotion > 50) {
t += `<span class="mediumorchid">reducing ${his} devotion to you.</span>`;
} else if (slave.devotion >= -20) {
@@ -153,9 +154,9 @@ window.saServant = function saServant(slave) {
} else {
t += `an incident without lasting effect.`;
}
- slave.devotion += (1 * _vignette.effect);
- } else if (_vignette.type === "trust") {
- if (_vignette.effect > 0) {
+ slave.devotion += (1 * vignette.effect);
+ } else if (vignette.type === "trust") {
+ if (vignette.effect > 0) {
if (slave.trust > 20) {
t += `<span class="mediumaquamarine">increasing ${his} trust in you.</span>`;
} else if (slave.trust > -10) {
@@ -163,7 +164,7 @@ window.saServant = function saServant(slave) {
} else {
t += `<span class="mediumaquamarine">reducing ${his} terror of you.</span>`;
}
- } else if (_vignette.effect < 0) {
+ } else if (vignette.effect < 0) {
if (slave.trust > 20) {
t += `<span class="gold">reducing ${his} trust in you.</span>`;
} else if (slave.trust >= -20) {
@@ -174,25 +175,26 @@ window.saServant = function saServant(slave) {
} else {
t += `an incident without lasting effect.`;
}
- slave.trust += (1 * _vignette.effect);
- } else if (_vignette.type === "health") {
- if (_vignette.effect > 0) {
+ slave.trust += (1 * vignette.effect);
+ } else if (vignette.type === "health") {
+ if (vignette.effect > 0) {
t += `<span class="green">improving ${his} health.</span>`;
- } else if (_vignette.effect < 0) {
+ } else if (vignette.effect < 0) {
t += `<span class="red">affecting ${his} health.</span>`;
} else {
t += `an incident without lasting effect.`;
}
- slave.health += (2 * _vignette.effect);
+ slave.health += (2 * vignette.effect);
} else {
- if (_vignette.effect > 0) {
+ let FResult = FResult(slave);
+ if (vignette.effect > 0) {
t += `<span class="green">gaining you a bit of reputation.</span>`;
- } else if (_vignette.effect < 0) {
+ } else if (vignette.effect < 0) {
t += `<span class="red">losing you a bit of reputation.</span>`;
} else {
t += `an incident without lasting effect.`;
}
- repX((V.FResult * _vignette.effect * 0.1), "vignette", slave);
+ repX((FResult * vignette.effect * 0.1), "vignette", slave);
}
}
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index dad9013735a86b43cd7e04591a2cdcc6c55a9a17..75818d68ab6b11f779b6acbaf38485e0756e7ee7 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2619,6 +2619,7 @@ LORE: INTERVIEWS
<br>''Sonofrevvan'' for fDance and fBeg.
<br>''skriv'' for fixes and endless code cleaning.
<br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics.
+ <br>''Sonofrevvan'' for making slaves beg and dance.
<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
diff --git a/src/npc/fDance.tw b/src/npc/fDance.tw
index 64921408944fc39f567116f082b880e02e0f3167..d8c403a311fa321102305218c492675e4940c91f 100644
--- a/src/npc/fDance.tw
+++ b/src/npc/fDance.tw
@@ -5,7 +5,7 @@
<<setLocalPronouns $activeSlave>>
<<setPlayerPronouns>>
-You tell your assistant to summon your slave and set some erotic music. When your slave arrives $he finds the lights in your office flashing club colors. You gesture towards the platform in the center of your office and tell $him to dance for you.
+You tell $assistantName to summon $activeSlave.slaveName and set some erotic music. When your slave arrives, $he finds the lights in your office flashing club colors. You gesture towards the platform in the center of your office and tell $him to dance for you.
<<if ($activeSlave.skill.entertainment > 99)>>
$He slides his ass gracefully unto the stage, then dramatically raises $his elongated legs one at a time onto the platform. Circling to $his knees, $he raises $his ass in the air and glides $his hands up $his legs as $he stands upright.
@@ -256,17 +256,17 @@ $His face is
<</switch>>
forcing $him to keep moving or face more pain.
<</if>>
-<<elseif ($activeSlave.devotion < 20)>>
+<<elseif ($activeSlave.devotion <= 20)>>
$He hates being forced to dance for you, but tries $his best in spite of this.
-<<elseif ($activeSlave.devotion < 50)>>
+<<elseif ($activeSlave.devotion <= 50)>>
$He wants to do $his best for you, and tries not to hold back.
-<<elseif ($activeSlave.devotion < 80)>>
+<<elseif ($activeSlave.devotion <= 80)>>
$He is so eager to please you, and works hard to push $himself beyond $his skill limit.
-<<elseif ($activeSlave.devotion < 200)>>
+<<elseif ($activeSlave.devotion <= 100)>>
$He is so honored that you want to use $him in this way, and tries eagerly to please you. $His eyes are filled with adoration and every move $he makes is done with the sole intention of pleasure $his beloved Master.
<</if>>
-<<if ($activeSlave.devotion < 20)>>
+<<if ($activeSlave.devotion <= 20)>>
<<if ($activeSlave.sexualFlaw == "judgemental")>>
$He thinks to $himself that a real _womanP wouldn't need to compensate this way, and judges you harshly.
<<elseif ($activeSlave.behavioralFlaw == "idealistic")>>
@@ -278,7 +278,7 @@ $His face is
The atmosphere of your office is a testament to masculine opulence. Few _womenP in the old world would have the pleasure of completing their work while an attractive $woman flaunts $himself for _hisP pleasure.
You allow the situation to continue for about an hour, before deciding it's time to escalate.
You look up once more at your slave and take some time to review $his dancing performance
-<<if ($activeSlave.devotion > -20)>>
+<<if ($activeSlave.devotion >= -20)>>
<<if ($activeSlave.skill.entertainment == 100)>>
Your slave has a level of skill previously unseen in the old world. Even $his blinks have the seductive pull of a goddess. As you watch $him preform, you think how no _womanP of the old world would ever get to see pure sexuality like this. And not only do get to watch $him, you OWN $him. $His body moves like water, and hips that ebbed and flowed as if the tides themselves panged for a rock hard cock to come and take them. You tried to get some work done, but couldn't take your eyes off $him for even a second. You promise to reward your slave for bringing so much sensuality and beauty into your office; transforming your place of work into a shrine of Masculine dominance.
<<elseif ($activeSlave.skill.entertainment >= 60)>>
@@ -318,7 +318,7 @@ You look up once more at your slave and take some time to review $his dancing pe
But it's not over yet. You tell your slave that it's time to incorporate some stripping into $his dance.
<<if ($activeSlave.sexualFlaw == "shamefast")>>
- <<if ($activeSlave.devotion < 40)>>
+ <<if ($activeSlave.devotion <= 40)>>
$He immediately begins to tear up at the thought of being naked. $His shame is obvious to you, and you remind $him that $his comfort is not your concern.
<<if ($activeSlave.skill.entertainment >= 99)>>
Even though $he is crippled by shame, your slave is a masterful entertainer, able to keep anyone entertained for even the most lengthy of strip teases. With tears still streaming down $his face, $he begins by writhing $his hips and rolling $his ass. $He knows how to use $his hips and ass to draw and keep your attention while slowly moving up to $his chest. $His body is nothing more than an object for your desire, and $he knows how to fulfill $his purpose, even as $he sniffles at the shame of revealing $himself for you. You keep trying to get back to work, but your slave's movements are so enthralling that you cannot seem to break free.
@@ -1576,13 +1576,11 @@ But it's not over yet. You tell your slave that it's time to incorporate some st
End clothing-specific stripping */
Once the last piece of clothing has hit the floor you let your little slut dance naked a little while longer while you finish your last report. Once you have gotten enough of $his dancing you snap your fingers to call your slave over.
-<<if ($activeSlave.devotion < 100)>>
+<<if ($activeSlave.devotion > 80)>>
Your slave hurries to your side and drops to $his knees. $He gladly kneels at your feet, looking up at $his Master in adoration.
-<<elseif ($activeSlave.devotion < 50)>>
+<<elseif ($activeSlave.devotion > 20)>>
Your slave hurries to your side and drops to $his knees. $He obediently kneels at your feet.
-<<elseif ($activeSlave.devotion < 20)>>
- Your slave walks slowly to your desk and kneels. $He looks up at you, hoping that $his life gets easier.
-<<elseif ($activeSlave.devotion < -20)>>
+<<elseif ($activeSlave.devotion < -50)>>
<<if ($activeSlave.fear < -50)>>
$He hurries frantically to your side, and drops quivering to the floor at your feet hoping $he was quick enough to avoid
<<switch $activeSlave.standardPunishment>>
@@ -1615,7 +1613,7 @@ Once the last piece of clothing has hit the floor you let your little slut dance
Once seated, you chain $him to your desk and force $him to $his knees. You may have to start punishing $him more severely.
<</if>>
<<else>>
-Your slave hurries to your side and drops to $his knees. $He gladly kneels at your feet, looking up at $his Master in adoration.
+ Your slave walks slowly to your desk and kneels. $He looks up at you, hoping that $his life gets easier.
<</if>>
/* more varied reactions planned. */
<<if (random(1,100) > (100 + $activeSlave.devotion))>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 824d679150a9249245f7d34e1280724c499833d9..1d99f93b37102020ec282b0d2c1bd4fe97057114 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -112,7 +112,7 @@
<</if>>
<</for>>
- <<if $eventSlave.assignment == "be a servant">>
+ <<if $eventSlave.assignment == "work as a servant">>
<<run generateRandomEventPoolServant($eventSlave)>>
<<else>>
<<run generateRandomEventPoolStandard($eventSlave)>>
diff --git a/src/uncategorized/rieEligibilityCheck.tw b/src/uncategorized/rieEligibilityCheck.tw
index c4a1ea04810ecc16f6173310487155ebb8df0328..3289e54276e48042a9de761817c3ec1d013ee535 100644
--- a/src/uncategorized/rieEligibilityCheck.tw
+++ b/src/uncategorized/rieEligibilityCheck.tw
@@ -5,7 +5,7 @@
<<set $eventSlave = 0, $eligibleSlaves = []>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].assignmentVisible == 1 || $slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine" || $slaves[$i].assignment == "be a servant">>
+ <<if $slaves[$i].assignmentVisible == 1 || $slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine" || $slaves[$i].assignment == "work as a servant">>
<<if $slaves[$i].fuckdoll == 0>>
<<set $eligibleSlaves.push($slaves[$i].ID)>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 63b71a5b282c16268b80e2514ca92b5376419d43..df8275863c23da06c16fec86c5b560e9370f9043 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -100,10 +100,8 @@
</span>
| <<link "Use $his mouth">><<replace "#miniscene">><<include "FLips">><br> <</replace>><</link>>
| <<link "Kiss $him">><<replace "#miniscene">><<include "FKiss">><br> <</replace>><</link>>
- <<if $cheatMode == 1>>
- <<if ($activeSlave.amp == 0 || $activeSlave.amp == -3 || $activeSlave.amp == -5)>>
- | <<link "Have $him dance for you">><<replace "#miniscene">><<include "FDance">><br> <</replace>><</link>>
- <</if>>
+ <<if ($activeSlave.amp == 0 || $activeSlave.amp == -3 || $activeSlave.amp == -5)>>
+ | <<link "Have $him dance for you">><<replace "#miniscene">><<include "FDance">><br> <</replace>><</link>>
<</if>>
| <<link "Play with $his tits">><<replace "#miniscene">><<include "FBoobs">><br> <</replace>><</link>>
| <<link "Caress $him">><<replace "#miniscene">><<include "FCaress">><br> <</replace>><</link>>