From 080d0f811c246cf9edc0240a769396456682bf16 Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Sat, 10 Aug 2019 17:15:00 -0700
Subject: [PATCH] javaSanityCheckPass
---
devTools/javaSanityCheck/excluded | 1 +
src/SecExp/attackHandler.tw | 6 +++---
src/SecExp/attackOptions.tw | 2 +-
src/SecExp/proclamations.tw | 2 +-
src/SecExp/rebellionReport.tw | 14 +++++++-------
src/SecExp/secExp.js | 2 +-
src/js/economyJS.js | 4 ++--
src/js/rulesAssistantOptions.js | 4 ++--
src/uncategorized/nextWeek.tw | 5 ++---
src/uncategorized/reFSAcquisition.tw | 18 +++++++++---------
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded
index bf251325486..366db3e9aa9 100644
--- a/devTools/javaSanityCheck/excluded
+++ b/devTools/javaSanityCheck/excluded
@@ -12,3 +12,4 @@ src/pregmod/editGenetics.tw;L
src/001-lib/Jquery/Jquery.js;O
src/001-lib/mousetrap/mousetrap.js;O
src/002-config/sugarCubeConfig.js;O
+src/SecExp/secExp.js;O
\ No newline at end of file
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 90e3b35b763..0c486e85308 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -293,7 +293,7 @@
<<if $Bodyguard.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105))>>
<<if $Bodyguard.health >= 50>>
<<set _woundChance -= 1>>
<</if>>
@@ -421,7 +421,7 @@
<<if $HeadGirl.skill.combat == 1>>
<<set _woundChance -= 3>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($HeadGirl, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($HeadGirl, 105))>>
<<if $HeadGirl.health >= 50>>
<<set _woundChance -= 2>>
<</if>>
@@ -1255,4 +1255,4 @@
<<goto "attackReport">>
<</if>>
-<</if>> /* closes check for bribery */
+<</if>> /* closes check for bribery */
\ No newline at end of file
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index a0d3930311a..cef3841d9d7 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -259,7 +259,7 @@ __Battle Plan__:
/* troop deployment */
<br><br>
<<if App.SecExp.Check.deployableUnits() > 0>>
- With your current readiness level you can send an additonal <strong><<print App.SecExp.Check.deployableUnits()>></strong> units out of a possible <strong><<print App.SecExp.Check.activeUnits()>></strong>.
+ With your current readiness level you can send an additional <strong><<print App.SecExp.Check.deployableUnits()>></strong> units out of a possible <strong><<print App.SecExp.Check.activeUnits()>></strong>.
<</if>>
<<set _mL = $militiaUnits.length>>
<<set _sL = $slaveUnits.length>>
diff --git a/src/SecExp/proclamations.tw b/src/SecExp/proclamations.tw
index a6714b92bd8..2597c51ade5 100644
--- a/src/SecExp/proclamations.tw
+++ b/src/SecExp/proclamations.tw
@@ -5,7 +5,7 @@
<<if ndef $SecExp.proclamation.cooldown>>
__Issue a proclamation:__
<br>You can dedicate the week to issuing a proclamation, a powerful tool that will have an immediate noticeable effect on the arcology.
- <<if def $SecExp.proclamation.currency && def $SecExp.proclamation.type>>
+ <<if (def $SecExp.proclamation.currency && def $SecExp.proclamation.type)>>
You will use $SecExp.proclamation.currency to enact it and will be about $SecExp.proclamation.type.
<</if>>
<br>Use:
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index c0be106ab58..ad1ffa862bf 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -82,7 +82,7 @@
<hr>
<<if $slaveRebellion == 1>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print num(Math.trunc($troopCount))>> strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up against their owners and conquer their freedom through blood. Our defense force, <<print num(Math.trunc(App.SecExp.conflict.troopCount()))>> strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
inflicting <<print num(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>><<print num(Math.trunc($losses))>> casualties<<elseif $losses > 0>>a casualty<<else>>zero<</if>> themselves.
<<else>>
@@ -214,7 +214,7 @@
<<set $rebelDefeatAftermath = 5>>
<</if>>
<<else>>
- Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, <<print num($troopCount)>> strong, fought with them street by street
+ Today, the _day of _month _year, our arcology was inflamed by the fires of rebellion. <<print num(Math.trunc($attackTroops))>> rebels from all over the structure dared rise up to dethrone their arcology owner. Our defense force, <<print num(App.SecExp.conflict.troopCount())>> strong, fought with them street by street
<<if $enemyLosses != $attackTroops>>
inflicting <<print num(Math.trunc($enemyLosses))>> casualties, while sustaining <<if $losses > 1>> <<print num(Math.trunc($losses))>> casualties <<else>> a casualty<</if>> themselves.
<<else>>
@@ -619,7 +619,7 @@
<<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
<<if $Concubine.health >= 50>>
<<set _woundChance -= 1>>
<</if>>
@@ -682,7 +682,7 @@
<<if $Bodyguard.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($Bodyguard, 105))>>
<<if $Bodyguard.health >= 50>>
<<set _woundChance -= 1>>
<</if>>
@@ -792,7 +792,7 @@
<<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
<<if $Concubine.health >= 50>>
<<set _woundChance -= 1>>
<</if>>
@@ -903,7 +903,7 @@
<<if $Concubine.skill.combat == 1>>
<<set _woundChance -= 2>>
<</if>>
- <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105)>>
+ <<set _woundChance -= 0.25 * (getLimbCount($Concubine, 105))>>
<<if $Concubine.health >= 50>>
<<set _woundChance -= 1>>
<</if>>
@@ -992,4 +992,4 @@
<</if>>
<<set $slaveRebellion = 0>>
<<set $citizenRebellion = 0>>
-<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
+<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
\ No newline at end of file
diff --git a/src/SecExp/secExp.js b/src/SecExp/secExp.js
index d173d6f84da..82223e1638e 100755
--- a/src/SecExp/secExp.js
+++ b/src/SecExp/secExp.js
@@ -1367,7 +1367,7 @@ App.SecExp.Check = (function() {
if(V.secBots.isDeployed > 0) {
init++;
}
- if (V.SF.Toggle && V.SF.Active >= 1 && V.SFinitervention) { // battle
+ if (V.SF.Toggle && V.SF.Active >= 1 && V.SFIntervention) { // battle
init++;
}
if(V.slaveRebellion+V.citizenRebellion > 0) {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 22c1eb835da..0b0fb8f2649 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -458,7 +458,7 @@ window.calculateCosts = (function() {
}
function getEnvironmentCosts(cost) {
- if (State.variables.secExp === 1) {
+ if (State.variables.secExpEnabled === 1) {
if (State.variables.terrain === 'oceanic' || State.variables.terrain === 'marine') {
if (State.variables.docks > 0) {
cost *= (1 - State.variables.docks * 0.05);
@@ -1547,4 +1547,4 @@ window.forceNeg = function(x) {
Number.prototype.toFixedHTML = function() {
return num(Number.prototype.toFixed.apply(this, arguments)).replace(/\.0+$/, '<span style="opacity: 0.3">$&</span>');
-};
+};
\ No newline at end of file
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 810fe44b20f..10d0817b5eb 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -570,7 +570,7 @@ window.rulesAssistantOptions = (function() {
class BooleanSwitch extends ElementWithLabel {
/**
* @param {string} prefix
- * @param {Array} values values for "false" and "true"
+ * @param {Array} values for "false" and "true"
*/
constructor(prefix, values = [false, true]) {
super(prefix, prefix);
@@ -4132,4 +4132,4 @@ window.rulesAssistantOptions = (function() {
}
return rulesAssistantOptions;
-})();
+})();
\ No newline at end of file
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 7120c085043..ab832025b1f 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -374,8 +374,7 @@
<<if $sentUnitCooldown > 0>>
<<set $sentUnitCooldown-->>
<</if>>
-
-<<if def $SecExp.proclamation.cooldown && $SecExp.proclamation.cooldown > 0>>
+<<if (def $SecExp.proclamation.cooldown) && $SecExp.proclamation.cooldown > 0>>
<<set $SecExp.proclamation.cooldown-->>
<<else>>
<<run delete $SecExp.proclamation.cooldown>>
@@ -463,4 +462,4 @@
<<if ($rep > 17500)>> <<set $rep = 17500>> <</if>>
<</if>>
<<set $NaNArray = findNaN()>>
-<<goto "Main">>
+<<goto "Main">>
\ No newline at end of file
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 91a923472f3..c9dcaf6e081 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -404,7 +404,7 @@
<<set $activeSlave.underArmHStyle = "waxed">>
<<set $slaveCost = slaveCost($activeSlave)>>
<<set $slaveCost -= 3000>>
-
+
<<case "Slave Professionalism Two">>
<<set $contractCost = 1000>>
@@ -585,8 +585,8 @@
<<if $activeSlave.height >= 150>>
<<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [-3, -1]}))>>
<<if $activeSlave.height >= 150>>
- <<set activeSlave.height = random(90,130)>>
- <<set activeSlave.geneticQuirks.dwarfism = 2>>
+ <<set $activeSlave.height = random(90,130)>>
+ <<set $activeSlave.geneticQuirks.dwarfism = 2>>
<</if>>
<</if>>
<</if>>
@@ -609,8 +609,8 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a porn star">>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement because $he felt your arcology would be a nice place to retire to.">>
-<<set activeSlave.height = random(90,100)>>
-<<set activeSlave.geneticQuirks.dwarfism = 2>>
+<<set $activeSlave.height = random(90,100)>>
+<<set $activeSlave.geneticQuirks.dwarfism = 2>>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
<<set $activeSlave.buttImplant += 2>>
@@ -653,7 +653,7 @@
<<set $activeSlave.trust = random(0,10)>>
<<set $slaveCost = slaveCost($activeSlave)>>
<<set $slaveCost -= 1000>>
-
+
<<case "Statuesque Glorification Two">>
<<set $contractCost = 1000>>
@@ -1309,7 +1309,7 @@ The call comes in from a middle-class area. It appears that the tired looking wo
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-This one, unusually, is voice-only. The caller seems extremely intoxicated as $he struggles to explain $his situation, and you're not far off on that assumption; $he overdosed on illicit drugs at a party and can't think straight any longer. $He apparently can not remember where $he came from and is desperate for any sort of support, even if it means enslavement. It's not like $he has much freedom left with $his mind in tatters anyway.
+This one, unusually, is voice-only. The caller seems extremely intoxicated as $he struggles to explain $his situation, and you're not far off on that assumption; $he overdosed on illicit drugs at a party and can't think straight any longer. $He apparently cannot remember where $he came from and is desperate for any sort of support, even if it means enslavement. It's not like $he has much freedom left with $his mind in tatters anyway.
<<case "Slave Professionalism">>
@@ -1610,7 +1610,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Statuesque Glorification">>
When $he arrives, $he is the very picture of someone out of $his depth. It's clear $he feels some relief over not being at the mercy of the slavers, but $he knows enough about the Free Cities to know that $he's likely to buy $his presence here through long years of sexual labor.
<<case "Statuesque Glorification Two">>
- When $he arrives, $he is the very picture of someone in over $his head. The only thing seperating $him from ridicule is a pair of high heels; a fact $he is very aware of as $he struggles with doubts through the enslavement process.
+ When $he arrives, $he is the very picture of someone in over $his head. The only thing separating $him from ridicule is a pair of high heels; a fact $he is very aware of as $he struggles with doubts through the enslavement process.
<<case "Chattel Religionist">>
$He lets out a convulsive sob when you accept $his servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm — chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor woman's face. $He waits patiently for a hint of your will, <<if canAchieveErection($activeSlave)>>$his cock painfully erect<<elseif $activeSlave.dick > 0>>precum dripping from $his soft dick<<else>>$his pussy visibly moist<</if>> at the prospect of the servile sex $he is convinced is $his duty.
<<case "Chattel Religionist Two">>
@@ -1749,4 +1749,4 @@ The call comes in from an office, and you suppress the urge to check whether $as
</span>
-<</if>>
+<</if>>
\ No newline at end of file
--
GitLab