From 4dcc31ae945ddd232fafba00c53d4c65196ae051 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 26 Feb 2019 00:57:45 -0600
Subject: [PATCH] StillDunno
---
artTools/vector_revamp_layer_split.py | 2 +-
src/art/vector_revamp/vectorRevampedArtControl.js | 2 +-
src/endWeek/saChoosesOwnClothes.js | 10 +++++-----
src/init/setupVars.tw | 6 ++----
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/artTools/vector_revamp_layer_split.py b/artTools/vector_revamp_layer_split.py
index 600a7d358cf..4f0951b31ca 100644
--- a/artTools/vector_revamp_layer_split.py
+++ b/artTools/vector_revamp_layer_split.py
@@ -110,7 +110,7 @@ for layer in layers:
svg = regex_xmlns.sub('', svg)
svg = svg.replace(' inkscape:connector-curvature="0"', '') # this just saves space
svg = svg.replace('\n', '').replace('\r', '') # print cannot be multi-line
- svg = regex_space.sub('><', svg) # remove indentaion
+ svg = regex_space.sub('><', svg) # remove indentation
svg = svg.replace('svg:', '') # svg namespace was removed
transformGroups = regex_transformVar.findall(svg)
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index e6debc8e8e2..0ea1e9f5c37 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1184,7 +1184,7 @@ class RevampedArtControl {
{
result.push("Art_Vector_Revamp_Flaccid_" + penisSize);
- if (this.artSlave.chastityPenis) {
+ if (this.artSlave.chastityPenis == 1) {
result.push("Art_Vector_Revamp_Chastity_Cage_" + penisSize);
}
}
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 17b1ae68fcd..32eeeb6d794 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -63,20 +63,20 @@ window.saChoosesOwnClothes = (function() {
slave.devotion += 1;
if (V.arcologies[0].FSRestart !== "unset" && slave.choosesOwnChastity == 1) {
- if (slave.vagina > -1 && slave.breedingMark === 1 && (slave.chastityVagina)) {
+ if (slave.vagina > -1 && slave.breedingMark === 1 && slave.chastityVagina === 1) {
r += `${He} unfastens ${his} chastity belt knowing full well ${his} role in life is to carry ${his} ${WrittenMaster(slave)}'s children. `;
slave.chastityVagina = 0;
- } else if (slave.vagina > -1 && slave.ovaries === 1 && slave.preg === 0 && !(slave.chastityVagina)) {
+ } else if (slave.vagina > -1 && slave.ovaries === 1 && slave.preg === 0 && slave.chastityVagina !== 1) {
r += `${He} also affixes a chastity belt over ${his} vagina to discourage use of ${his} reproductive organ. `;
slave.chastityVagina = 1;
- } else if (slave.vagina > -1 && (slave.ovaries === 0 || slave.preg < -1) && slave.chastityVagina) {
+ } else if (slave.vagina > -1 && (slave.ovaries === 0 || slave.preg < -1) && slave.chastityVagina === 1) {
r += `${He} removes ${his} chastity belt since no matter how hard someone tries, ${he} can never become pregnant. `;
slave.chastityVagina = 0;
}
- if (slave.dick > 0 && slave.balls > 0 && !(slave.chastityPenis)) {
+ if (slave.dick > 0 && slave.balls > 0 && slave.chastityPenis !== 1) {
r += `${He} also affixes a chastity cage onto ${his} dick to discourage use of ${his} reproductive organ. `;
slave.chastityPenis = 1;
- } else if (slave.dick > 0 && slave.balls === 0 && slave.chastityPenis) {
+ } else if (slave.dick > 0 && slave.balls === 0 && slave.chastityPenis === 1) {
r += `${He} removes ${his} chastity cage since even if ${he} could get erect, ${he} only shoots blanks. `;
slave.chastityPenis = 0;
}
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index c7d293ae425..7efa84944bf 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -2077,13 +2077,11 @@ Then pick _namePool.random(), or display those names as possible choices, or do
{name: "Large dildo", value: "large dildo"},
{name: "Long, large dildo", value: "long, large dildo", rs: "buyBigDildos"},
{name: "Huge dildo", value: "huge dildo"},
- {name: "Long, huge dildo", value: "long, huge dildo", rs: "buyBigDildos"}
- ]>>
+ {name: "Long, huge dildo", value: "long, huge dildo", rs: "buyBigDildos"}]>>
<<set setup.dickAccessories = [
{name: "No default setting", value: "no default setting"},
- {name: "None", value: "none"}
- ]>>
+ {name: "None", value: "none"}]>>
<<set setup.buttplugs = [
{name: "No default setting", value: "no default setting"},
--
GitLab