From 3b76e61a8e5ab0818d81bee6958aa9c9f9f3c590 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Thu, 7 Mar 2019 18:50:14 -0500
Subject: [PATCH] Art and sanityCheck fixes
---
src/art/artJS.js | 2 +-
src/init/dummy.tw | 4 ++--
src/js/SlaveState.js | 3 +--
src/js/datatypeCleanupJS.js | 6 +++---
src/npc/uploadSlave.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/addCustomDescriptors.tw | 10 ++--------
src/uncategorized/saRecruitGirls.tw | 2 +-
src/uncategorized/slaveInteract.tw | 2 +-
10 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/art/artJS.js b/src/art/artJS.js
index e350ea6bd26..44d1868700f 100644
--- a/src/art/artJS.js
+++ b/src/art/artJS.js
@@ -11,7 +11,7 @@ UIDisplay (optional, only used by legacy art): icon UI Display for vector art, 1
*/
window.SlaveArt = function(artSlave, artSize, UIDisplay) {
const imageChoice = State.variables.imageChoice;
- if (artSlave.customImage !== 0)
+ if (artSlave.customImage !== "")
return CustomArt(artSlave, artSize);
else if (imageChoice === 1) /* VECTOR ART BY NOX/DEEPMURK */
return VectorArt(artSlave, artSize);
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index b910c0245fa..4d711a08a2e 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -17,15 +17,15 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
$LurcherSpeed
$$i
-$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost
+$activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor, $activeSlave.newGamePlus, $activeSlave.nipplesAccessory, $activeSlave.slaveCost, $activeSlave.premature, $activeSlave.missingEyes, $activeSlave.missingArms, $activeSlave.missingLegs,
$activeSlave.noun, $activeSlave.pronoun, $activeSlave.possessive, $activeSlave.possessivePronoun, $activeSlave.object, $activeSlave.objectReflexive
$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
$PC.origRace, $PC.origSkin
-$isReady, $fatherID,
$servantsQuartersSpots
$sayEnunciate, $sEnunciate, $SEnunciate, $ssEnunciate, $cEnunciate, $CEnunciate, $ccEnunciate, $zEnunciate, $ZEnunciate, $chEnunciate, $ChEnunciate, $shEnunciate, $ShEnunciate, $scEnunciate, $ScEnunciate, $schEnunciate, $SchEnunciate, $xEnunciate, $XEnunciate
$ZEnunciate = $ZEnunciate
$Girl
$corpPeopleEnslaved, $slaveAssets, $slaveAssetPrice, $corpProfit, $corpValue, $sharePrice, $oldSharePrice, $generalAssetPrice, $generalAssets, $entrapmentAssets, $entrapmentAssetPrice, $captureAssets, $captureAssetPrice, $trainingAssets, $trainingAssetPrice, $surgicalAssets, $surgicalAssetPrice, $drugAssets, $drugAssetPrice
$TradeShowMenials
+$readySlaves
*/
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index 5dc8c25d955..39e9bcbf754 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1818,9 +1818,8 @@ App.Entity.SlaveState = class SlaveState {
/**
* holds the custom slave image file name (used if images are enabled)
*
- * 0: no custom image
* @type {string|number} */
- this.customImage = 0;
+ this.customImage = "";
/** @type {number[]} */
this.currentRules = [];
/**
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 28e29af6d74..7f6c6f3cce5 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -601,8 +601,8 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
if (typeof slave.customTitleLisp !== "string") {
slave.customTitleLisp = "";
}
- if (typeof slave.customImage !== "string" || slave.customImage === "") {
- slave.customImage = 0;
+ if (typeof slave.customImage !== "string") {
+ slave.customImage = "";
}
}
@@ -1154,7 +1154,7 @@ window.childCustomStatsDatatypeCleanup = function childCustomStatsDatatypeCleanu
child.customTitleLisp = "";
}
if (typeof child.customImage !== "string") {
- child.customImage = 0;
+ child.customImage = "";
}
};
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 555337eaf32..dca3eb0fceb 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -203,5 +203,5 @@ pitKills: 0,
customTat: "$activeSlave.customTat",
customLabel: "",
customDesc: "$activeSlave.customDesc",
-customImage: 0,
+customImage: "",
currentRules: $activeSlave.currentRules
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 992b15c0a19..5aa31448233 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -9264,7 +9264,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<</if>>
and have gentle vaginal sex in the missionary position <<if $PC.vagina == 1>><<if $PC.dick == 1>>, your own pussy moving back and forth gently at the base of your dick as you fuck $him<</if>><</if>>. $He gasps at the first penetration, but you take it slowly and lavish attention on $his lips, breasts, and nipples. Soon $he's shamelessly enjoying $himself. $His first vaginal sex is crowned with an abdominal-clenching orgasm. $He @@.hotpink;adores $his kind <<= WrittenMaster()>>.@@
<<set $activeSlave.devotion += 10, $activeSlave.vaginalCount++, $activeSlave.vagina = 1, $vaginalTotal++>>
- <<if ($activeSlave.chastityVagina == 1>><<set $activeSlave.chastityVagina = 0>><</if>>
+ <<if $activeSlave.chastityVagina == 1>><<set $activeSlave.chastityVagina = 0>><</if>>
<<if canImpreg($activeSlave, $PC)>>
<<= knockMeUp($activeSlave, 25, 0, -1)>>
<</if>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 25c990b0115..dbcc45782f7 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1248,7 +1248,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<br><<link "Dominate the slave on top">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
- You make no reply, but <<if $PC.dick == 1>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina == 1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<elseif canHear($activeSlave>>Hearing<<else>>Acknowledging<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick == 1>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina == 1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
+ You make no reply, but <<if $PC.dick == 1>>advance on the couch, stripping down to reveal a raging erection<<if $PC.vagina == 1>> and ready cunt<</if>>.<<else>>move to a side table, selecting a formidable strap-on.<</if>> <<if canSee($activeSlave)>>Seeing<<elseif canHear($activeSlave)>>Hearing<<else>>Acknowledging<</if>> this, $activeSlave.slaveName @@.hotpink;giggles with anticipation,@@ and pulls $subSlave.slaveName's knees back farther. The slave whines at the stretch, and then gasps as the invading phallus pops free of _his2 asshole. _His2 anus <<if $subSlave.anus > 2>>gapes lewdly, its sphincter so well stretched that it stays invitingly open,<<elseif $subSlave.anus > 1>>gapes slightly, its sphincter remaining just barely open,<<else>>closes up again immediately once it's no longer being penetrated. Its rosebud is<</if>> glistening with lube<<if canPenetrate($activeSlave)>> and precum from $activeSlave.slaveName's cock<</if>>. But you decide to be more circumspect. Pressing your <<if $PC.dick == 1>>dickhead<<else>>phallus<</if>> into $subSlave.slaveName's mouth, you tell _him2 to be thorough with _his2 saliva<<if $PC.vagina == 1>> and not to worry about your pussy<</if>>. _His2 eyes widen at the implication, and _he2 starts to suck lushly.
<br><br>
Suddenly, _he2 jerks and squeals into your <<if $PC.dick == 1>>dick<<else>>crotch<</if>>. With you standing there, $activeSlave.slaveName can't really see much, and $he can't drop $subSlave.slaveName's legs without throwing everything into confusion. So, $he's reduced to blind jabs to get $his <<if canPenetrate($activeSlave)>>cock<<else>>strap-on<</if>> back up the poor slave's butt. It takes $him quite a while to manage it, and when $he's finally seated, $subSlave.slaveName gives as huge a sigh as _he2 can manage with a phallus down _his2 throat. _His2 relief is short lived, however, because soon afterward, you withdraw, leaving a string of spit between _his2 wet lips and the <<if $PC.dick == 1>>head of your turgid cock<<else>>massive head of your strap-on<</if>>.
<br><br>
diff --git a/src/uncategorized/addCustomDescriptors.tw b/src/uncategorized/addCustomDescriptors.tw
index 350709a4dd7..4b6f31b5891 100644
--- a/src/uncategorized/addCustomDescriptors.tw
+++ b/src/uncategorized/addCustomDescriptors.tw
@@ -145,14 +145,8 @@ Change $his custom label: <<textbox "$activeSlave.customLabel" $activeSlave.cust
<br> //For best results, use a short phrase; for example: 'Breeder.'//
<br><br>
-<<if ndef $activeSlave.customImage>><<set $activeSlave.customImage = 0>><</if>>
-Assign $him a custom image:
-<<if $activeSlave.customImage != 0>>
- <<textbox "$activeSlave.customImage" $activeSlave.customImage "Add custom descriptors">>
-<<else>>
- <<textbox "$activeSlave.customImage" "" "Add custom descriptors">>
-<</if>>
-<<link "Reset" "Add custom descriptors">><<set $activeSlave.customImage = 0, $activeSlave.customImageFormat = "png">><</link>>
+Assign $him a custom image: <<textbox "$activeSlave.customImage" $activeSlave.customImage "Add custom descriptors">>
+<<link "Reset" "Add custom descriptors">><<set $activeSlave.customImage = "", delete $activeSlave.customImageFormat>><</link>>
<br> //File must be in// <tt><select id="customImageFormatSelector" style="border: none;"><option value="png">PNG</option><option value="jpg">JPG</option><option value="gif">GIF</option><option value="webm">WEBM</option></select></tt> //format. Place file in the \resources folder. Enter the filename without the extension. For example, for a file with the path// <tt>\bin\resources\headgirl.<span id="customImageFormatValue">png</span></tt>, //enter //<tt>headgirl</tt>.
<<script>>
jQuery(function() {
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index fbe35eb9c86..77c99dd68ff 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -760,7 +760,7 @@
<<elseif $slaves[$i].bellyPreg < 100>>
<<if ($slaves[$i].dick > 0 && $slaves[$i].balls == 0)>>
$He makes sure to wear tight fitting clothes to show off the bulge of $his dick and, most notably, the lack of testicles under it in all $his photo shoots.
- <<elseif ($slaves[$i].chastityVagina || $slaves[$i].chastityPenis>>
+ <<elseif $slaves[$i].chastityVagina || $slaves[$i].chastityPenis>>
In all $his public appearances, $his choice of clothing is always crotchless, leaving $his chastity gear as the only thing protecting $his modesty.
<<elseif (($slaves[$i].ovaries == 0 && $slaves[$i].mpreg == 0) || $slaves[$i].preg < -1)>>
$He frequently livestreams massive orgies involving $himself at the center, making sure to always follow up with $his negative pregnancy tests.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 15112c97b10..4994b642684 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1083,7 +1083,7 @@
| <<link "Combined Chastity Belt">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 1>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 1>><<replace "#chastity">>Combined Chastity Belt<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
<</if>>
<<if $activeSlave.dick > 0>>
- | <<link "Chastity Cage">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 1>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>Chastity Cage<</replace>>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
+ | <<link "Chastity Cage">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 1>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>Chastity Cage<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
| <<link "Combined Chastity Cage">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 1>><<set $activeSlave.chastityPenis = 1>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>Combined Chastity Cage<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
<<if $activeSlave.vagina > -1>>
| <<link "Genital Chastity">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 1>><<set $activeSlave.chastityVagina = 1>><<replace "#chastity">>Genital Chastity<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
--
GitLab