From dc5cbd19ad2e49f952c9f2a8d422fe1b74419196 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 2 Dec 2019 15:31:14 -0500
Subject: [PATCH] sanity checked
---
devTools/javaSanityCheck/ignoredVariables | 14 ++++++++++++++
src/SecExp/rebellionReport.tw | 2 +-
src/init/dummy.tw | 4 +++-
src/js/rulesAutosurgery.js | 2 +-
src/npc/fKiss.tw | 4 ++--
src/player/actions/fCaress.tw | 4 ++--
src/player/actions/fEmbrace.tw | 2 +-
src/player/js/PlayerState.js | 2 +-
src/pregmod/fPat.tw | 2 +-
src/pregmod/pRaped.tw | 2 +-
src/uncategorized/RESS.tw | 12 ++++++------
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/main.tw | 4 +++-
13 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index c96f63e33c8..328b8a63f02 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -82,6 +82,20 @@ saRules
plural
orig
bimboMaleNames
+# PC
+vision
+majorInjury
+criticalDamage
+marriage
+lovers
+FWBs
+BFFs
+friends
+likes
+dislikes
+hates
+loathes
+obsession
# corporation
canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;easyMode;roll;divisionCategories;divisionCategoriesList;getStored;setStored;endweek;corpDivSurgeryFounded;hasDividend;hasPayout;perUnit;acquire
# corporation - newgame+
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 2124012a861..18fe35634fa 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -548,7 +548,7 @@
<<if $PC.preg >= 30>>
<<set _woundChance += random(1,5)>>
<</if>>
- <<if $PC.balls >= 20
+ <<if $PC.balls >= 20>>
<<set _woundChance += random(1,5)>>
<</if>>
<<if $PC.balls >= 9>>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index 06c2973349f..6f15512d888 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -27,7 +27,9 @@ $activeSlave.sexAmount, $activeSlave.sexQuality
$activeSlave.fertKnown
$activeSlave.cum
$drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs
-$PC.origRace, $PC.origSkin
+$PC.origRace, $PC.origSkin, $PC.majorInjury, $PC.criticalDamage
+$PC.eye.left.vision
+$PC.relationships.marriage, $PC.relationships.lovers, $PC.relationships.FWBs, $PC.relationships.BFFs, $PC.relationships.friends, $PC.relationships.likes, $PC.relationships.dislikes, $PC.relationships.hates, $PC.relationships.loathes, $PC.relationships.obsession
$servantsQuartersSpots
$clubSpots, $DJRepBonus
$sayEnunciate, $sEnunciate, $SEnunciate, $ssEnunciate, $cEnunciate, $CEnunciate, $ccEnunciate, $zEnunciate, $ZEnunciate, $chEnunciate, $ChEnunciate, $psEnunciate, $PsEnunciate, $shEnunciate, $ShEnunciate, $scEnunciate, $ScEnunciate, $schEnunciate, $SchEnunciate, $xEnunciate, $XEnunciate
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index d18440b0ca0..40bf8d2bd25 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -302,7 +302,7 @@ window.rulesAutosurgery = (function() {
if (slave.faceImplant <= 15 && slave.face <= 95 && thisSurgery.cosmetic > 0) {
commitProcedure("a nicer face", slave => {
if (slave.faceShape === "masculine") { slave.faceShape = "androgynous"; }
- slave.faceImplant += 25 - 5 * Math.trunc(V.PC.skillmedicine / 50) - 5 * V.surgeryUpgrade;
+ slave.faceImplant += 25 - 5 * Math.trunc(V.PC.skill.medicine / 50) - 5 * V.surgeryUpgrade;
slave.face = Math.clamp(slave.face + 20, -100, 100);
});
} else if (slave.faceImplant <= 15 && slave.ageImplant !== 1 && slave.visualAge >= 25 && thisSurgery.cosmetic > 0) {
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 2d6515d679d..e29db3360e0 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -221,7 +221,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
unremarkable breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
tiny breasts.
<<elseif $PC.title > 0>>
manly chest.
@@ -253,7 +253,7 @@ Then, you gently raise $his <<if $activeSlave.face > 95>>heartrendingly beautifu
soft breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
small chest.
<<elseif $PC.title > 0>>
manly chest.
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index a10b6645975..d9bc953fb27 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -96,7 +96,7 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
unremarkable breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
tiny breasts.
<<elseif $PC.title > 0>>
manly chest.
@@ -116,7 +116,7 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
soft breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
small chest.
<<elseif $PC.title > 0>>
manly chest.
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 2e6c7b64e32..063e040e2fd 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -108,7 +108,7 @@ You walk around $him and put your hands around $his abdomen,<<if (hasAnyLegs($ac
soft breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
small chest.
<<elseif $PC.title > 0>>
manly chest.
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index 7f29519748e..e7a5557cd90 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -1903,7 +1903,7 @@ App.Entity.PlayerState = class PlayerState {
*
* 0: no; 1: yes */
this.premature = 0;
- /** Have you had had a vasectomy?
+ /** Have you had a vasectomy?
*
* 0: no; 1: yes */
this.vasectomy = 0;
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index dbb6b8ff113..59fc505ecda 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -243,7 +243,7 @@ You move your hand down to caress $his forehead, and then slide your hand along
unremarkable breasts.
<<elseif $PC.boobs >= 500>>
breasts.
- <<elseif $PC.boobs >= 300>>>>
+ <<elseif $PC.boobs >= 300>>
tiny breasts.
<<elseif $PC.title > 0>>
manly chest.
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 3643721f7bd..cbe88c18657 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -149,7 +149,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
"Trying to catch a signal with that?" he mocks as he flicks the tip of your stiffening cock.
<</if>>
<</switch>>
- Finally he reaches your moistening pussy. "Already wet are we? Glad you know your place," he states as he pulls your clothes off and bends you over.<<if $PC.vagina == 0>> "And you still have your innocence, how delightful!"</if>>
+ Finally he reaches your moistening pussy. "Already wet are we? Glad you know your place," he states as he pulls your clothes off and bends you over.<<if $PC.vagina == 0>> "And you still have your innocence, how delightful!"<</if>>
<br><br>
You can feel the head of his cock teasing your
<<if $PC.vagina == 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 7fc7396422a..321937e53c9 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -13379,11 +13379,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $activeSlave.toyHole == "dick" || ($sexualOpeness == 1 && canPenetrate($activeSlave))>>
You walk forward, pressing $him against the far wall, and then turn yourself around, pinning $him against the wall with your butt<<if $activeSlave.belly >= 5000>>, working your way under $his _belly belly<</if>>. As $he hesitates, wondering what to do about this, you grab $his hands and place them on your
<<if $PC.butt >= 5>>
- enormous, <<if <<if $PC.buttImplant != 0>>>>beachball cheeks<<else>>wobbling ass<</if>>,
+ enormous, <<if $PC.buttImplant != 0>>beachball cheeks<<else>>wobbling ass<</if>>,
<<elseif $PC.butt >= 4>>
- huge, <<if <<if $PC.buttImplant != 0>>>>balloon of an<<else>>soft<</if>> ass,
+ huge, <<if $PC.buttImplant != 0>>balloon of an<<else>>soft<</if>> ass,
<<elseif $PC.butt >= 3>>
- big<<if <<if $PC.buttImplant != 0>>>> fake<</if>> ass,
+ big<<if $PC.buttImplant != 0>> fake<</if>> ass,
<<else>>
ass,
<</if>>
@@ -13396,11 +13396,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<elseif $activeSlave.belly >= 150000>>
You walk forward, pressing $him against the far wall, and then turn yourself around, pinning $him against the wall with your butt, working your way under $his _belly belly. As $he hesitates, wondering what to do about this, you grab $his hands and place them on your
<<if $PC.butt >= 5>>
- enormous, <<if <<if $PC.buttImplant != 0>>>>beachball cheeks<<else>>wobbling ass<</if>>,
+ enormous, <<if $PC.buttImplant != 0>>beachball cheeks<<else>>wobbling ass<</if>>,
<<elseif $PC.butt >= 4>>
- huge, <<if <<if $PC.buttImplant != 0>>>>balloon of an<<else>>soft<</if>> ass,
+ huge, <<if $PC.buttImplant != 0>>balloon of an<<else>>soft<</if>> ass,
<<elseif $PC.butt >= 3>>
- big<<if <<if $PC.buttImplant != 0>>>> fake<</if>> ass,
+ big<<if $PC.buttImplant != 0>> fake<</if>> ass,
<<else>>
ass,
<</if>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 25acd85d071..bb31ca17a1c 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1959,7 +1959,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
"Thank you, <<Master>>," $he <<say>>s dutifully. "Your, um, your cum i<<s>> the be<<s>>t.<<if $PC.balls >= 10>> I'll never go hungry with you either.<</if>>" Momentarily unsure of $himself, $he blushes, and decides to take refuge in dicksucking.
<</if>>
<<if $activeSlave.skill.oral > 60>>
- $He's a well-trained cocksucker, and as the suction and $his active tongue go to work, $he reaches up and <<if $PC.vagina != -1>>begins to lavish attention on your pussy with both hands. $He fingers your labia lovingly before starting to dip $his fingers inside you in time with $his oral strokes at your shaft.<<else>>cups your<<if $PC.balls >= 30>>monstrous balls<<elseif $PC.balls >= 14>>hand-filling <<elseif $PC.ball >= 9>>huge <<elseif $PC.balls >= 5>>big <</if>>balls lovingly. A testicular massage during a blowjob might not actually increase ejaculation volume, but the care $he shows suggests that the hungry slut might believe it does.<</if>>
+ $He's a well-trained cocksucker, and as the suction and $his active tongue go to work, $he reaches up and <<if $PC.vagina != -1>>begins to lavish attention on your pussy with both hands. $He fingers your labia lovingly before starting to dip $his fingers inside you in time with $his oral strokes at your shaft.<<else>>cups your<<if $PC.balls >= 30>>monstrous balls<<elseif $PC.balls >= 14>>hand-filling <<elseif $PC.balls >= 9>>huge <<elseif $PC.balls >= 5>>big <</if>>balls lovingly. A testicular massage during a blowjob might not actually increase ejaculation volume, but the care $he shows suggests that the hungry slut might believe it does.<</if>>
<<else>>
$He's not an outstanding oral slave, so after $he's working away reasonably well, you take $his head in both hands and fuck $his face. Not cruelly, but with comprehensive dominance. $He can breathe, but $he has to concentrate to do so, letting you rape $his throat like a good little bitch.
<</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index c80a6a9e356..5a81ee450ce 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -1,7 +1,9 @@
:: Main [nobr]
<<if $releaseID >= 1000 || ["0.9", "0.8", "0.7", "0.6"].includes($ver)>>
- <<if $releaseID >= 1050>>
+ <<if $releaseID >= 1057>>
+ <<elseif $releaseID < 1057>>
+ ''@@.red;MAJOR INCOMPATIBILITY WARNING:@@'' your saved game was created using version $ver build $releaseID. Due to overwhleming changes to the player object, you must run [[backwards compatibility|Backwards Compatibility]].
<<elseif $releaseID < 1050 && ndef $SecExp || ndef $secExpEnabled>>
<<= App.SecExp.Check.general()>>
<<goto "Main">>
--
GitLab