From 3f86e1fbf6615f14fc02b55169e261fc7fc01f9b Mon Sep 17 00:00:00 2001
From: Blank_Alt <>
Date: Thu, 7 Jan 2021 20:41:55 +1300
Subject: [PATCH] hotfix-collection
---
devNotes/Useful JS Function Documentation.txt | 2 --
src/Mods/SecExp/js/Unit.js | 2 +-
src/Mods/SpecialForce/SpecialForce.js | 3 +++
src/art/vector_revamp/vectorRevampedArtControl.js | 4 ++--
src/facilities/surgery/surgeryPassageFaceAndHair.js | 2 +-
src/npc/surgery/bodySwap/bodySwap.js | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 38ab1c21a08..4c85aa3bc1b 100644
--- a/devNotes/Useful JS Function Documentation.txt
+++ b/devNotes/Useful JS Function Documentation.txt
@@ -403,8 +403,6 @@ releaseRestricted - returns true if the slave has some kind of rule limiting the
Other Functions:
UtilJS [script]
- html5passage(passage_function) - circumvents SugarCube, allowing a plain HTML5 UI within it
-
cmToInchString() - takes an integer e.g. $activeSlave.hLength, returns a string in the format 10 inches
cmToFootInchString() - takes an integer e.g. $activeSlave.height, returns a string in the format 6'5"
diff --git a/src/Mods/SecExp/js/Unit.js b/src/Mods/SecExp/js/Unit.js
index 4796eff75d3..26a146b8ce1 100644
--- a/src/Mods/SecExp/js/Unit.js
+++ b/src/Mods/SecExp/js/Unit.js
@@ -157,7 +157,7 @@ App.SecExp.unit = (function() {
}
input.cyber = input.cyber || 0;
input.commissars = input.commissars || 0;
- input.maxTroops = Math.min(30, input.maxTroops);
+ input.maxTroops = Math.min(0, input.maxTroops);
input.troops = Math.clamp(input.troops, 0, input.maxTroops);
}
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 7c94b67578d..67ce6ff108c 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -1443,6 +1443,7 @@ App.SF.AAR = function(endWeekCall = 1) {
r += `<br>These activities have, overall, <span class='green'>improved your arcology's prosperity.</span>`;
r += ` The goods procured by ${V.SF.Lower} after accounting for the spoils retained by individual soldiers were `;
+ V.SF.lastWeeksProfit = V.SF.lastWeeksProfit || 1;
if (profit > 0) {
r += `<span class='green'>more than sufficient to cover expenses.</span> Excess material and human assets totaling <span class='yellowgreen'>${cashFormat(profit)}</span> (after liquidation) and paying expenses were transferred to your accounts.`;
if (V.economy < 100) {
@@ -1452,6 +1453,8 @@ App.SF.AAR = function(endWeekCall = 1) {
r += `<span class='red'>barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class='yellow'>hopefully purchasing more upgrades will help.</span>`;
r += ` Per the estimates that ${App.SF.SFC()} provides, an additional <span class='yellowgreen'>${cashFormat(profit)}</span> is required for sufficient cover.`;
}
+ r + = `An difference of ${profit/V.SF.lastWeeksProfit}% since last week`;
+ V.SF.lastWeeksProfit = profit;
r += ` ${capSF} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security.</span>`;
r += `<h3>Your instructions to ${App.SF.SFC()}:</h3>`;
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 2237d0a28d3..0cc90dab2b5 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1142,7 +1142,7 @@ class ClothingControl {
stockingCompatability() {
// Theese outfits are made by coloring the leg skin instead of adding a lyer on top
- // They are not compatable with stockings, as there is nothing to go on top of the stockings
+ // They are not compatible with stockings, as there is nothing to go on top of the stockings
if (this.slave.fuckdoll > 0 ||
["restrictive latex", "a latex catsuit", "a comfortable bodysuit"].includes(this.slave.clothes) ||
this.piecewiseClothing.spats) {
@@ -3427,7 +3427,7 @@ class RevampedArtControl {
}
/** Convert from coordinate system in the svg file to the graphic coordinate on page
- * The y-axis in svg counts from the bottom up and in browser it it top down with a canvas height of 1000.
+ * The y-axis in svg counts from the bottom up and in browser, top down with a canvas height of 1000.
* @param {number[][]} M
*/
convertCoordinateSystem(M){
diff --git a/src/facilities/surgery/surgeryPassageFaceAndHair.js b/src/facilities/surgery/surgeryPassageFaceAndHair.js
index ea66d745214..74aa4e184b3 100644
--- a/src/facilities/surgery/surgeryPassageFaceAndHair.js
+++ b/src/facilities/surgery/surgeryPassageFaceAndHair.js
@@ -426,7 +426,7 @@ App.UI.surgeryPassageHairAndFace = function(slave, cheat = false) {
}
if (linkArray.length === 2) {
linkArray.push(makeLink(
- "Give eyes eyes ocular implants",
+ "Give both eyes ocular implants",
"ocular implant",
() => {
eyeSurgery(slave, "both", "remove");
diff --git a/src/npc/surgery/bodySwap/bodySwap.js b/src/npc/surgery/bodySwap/bodySwap.js
index e2542c084a6..ee9e342304b 100644
--- a/src/npc/surgery/bodySwap/bodySwap.js
+++ b/src/npc/surgery/bodySwap/bodySwap.js
@@ -144,7 +144,7 @@ globalThis.bodySwap = function(soul, body, fromGenepool) {
soul.haircuts = body.haircuts;
soul.ovaryAge = body.ovaryAge;
soul.readyOva = body.readyOva;
- soul.womb = body.womb; // this is array assigned by reference, if slave body that is ${body} will be still used anywhere in code (not discarded) — it's WRONG (they now technically share one womb object). Please tell me about it then. But if old body body just discarded — it's no problem then.
+ soul.womb = body.womb; // this is array assigned by reference, if the slave body that is ${body} will be still used anywhere in code (not discarded) — it's WRONG (they now technically share one womb object). Please tell me about it then. But if the previous slave body is just discarded — it's no problem then.
soul.pregAdaptation = body.pregAdaptation;
soul.geneMods = body.geneMods;
soul.NCSyouthening = body.NCSyouthening;
--
GitLab