Skip to content
Snippets Groups Projects
Commit 863f0898 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'sanityFixes' into 'pregmod-master' 

Sanity fixes

See merge request !5109
parents 8dd1a30a a237cfb0
No related branches found
No related tags found
1 merge request!5109Sanity fixes
Hide whitespace changes
Inline Side-by-side
devTools/javaSanityCheck/ignoredVariables
+ 0
− 5
View file @ 863f0898
#Add ignored that are false positives and should therefore be ignored here
#
scarheal
defaultColorMap
clamp
MAX
......@@ -50,7 +49,6 @@ normalOvaMin
normalOvaMax
V
rejects
Engine
transfer
jobsNames
expCheck
......@@ -66,8 +64,6 @@ FSCummunismDecoration;FSIncestFetishistDecoration;FSGenderFundamentalistResearch
maleSurnamePoolSelector
mixedraceNationalities
nationalityPoolSelector
bimboSlaveNames
ArcologyNamesIntellectualDependency;ArcologyNamesSlaveProfessionalism;ArcologyNamesPetiteAdmiration;ArcologyNamesStatuesqueGlorification
Him
anCup
linkHandlers
......@@ -83,7 +79,6 @@ Std
neutral
htmlFor
call
storedButton
#
# ...foo variables - maybe fixed later
otherChoices
......
src/uncategorized/bodyModification.tw
+ 6
− 6
View file @ 863f0898
......@@ -42,9 +42,9 @@
<<if $activeSlave.scar[$scarTarget.local][$scarDesign.local] > 0>>
This is not the first time $he was scarred like this.
<</if>>
<<switch $scarDesign.local>>
<<switch $scarDesign.local>>
<<case "whip">>
Targetting a single area with a whip is not easy. You set the mood by carefully arranging candles dripping on to a whimpering $activeSlave.slaveName, then got $his attention with a quick <<if canSee($activeSLave)>>wave<<elseif canHear($activeSlave)>>crack<<else>>tap<</if>> of the whip. One by one, you carefully snuffed out the candles, flicking hot wax as you went. After pausing a moment, you prepared to leave your mark.
Targetting a single area with a whip is not easy. You set the mood by carefully arranging candles dripping on to a whimpering $activeSlave.slaveName, then got $his attention with a quick <<if canSee($activeSlave)>>wave<<elseif canHear($activeSlave)>>crack<<else>>tap<</if>> of the whip. One by one, you carefully snuffed out the candles, flicking hot wax as you went. After pausing a moment, you prepared to leave your mark.
<<if ["penis", "vagina"].includes($scarTarget.local)>>
<<if $activeSlave.dick > 4 && $seeDicks>>
$His dick was large enough that it was not too difficult to hit,
......@@ -74,7 +74,7 @@
<<default>>
You had no shortage of kinky and medical tools for applying scars. $His $activeSlave.skin $scarTarget.local is bleeding profusely.
<</switch>>
No matter how you chose to apply it, being scarred @@.red; hurt $his health a little.@@
<<set $activeSlave.health -= 10>>
<</if>>
......@@ -1193,7 +1193,7 @@ Choose a site for scaring:
[[Cheeks|Body Modification][$scarTarget.local = "cheek"]]
<<else>>
/* Sorted head to toe */
[[Entire body|Body Modification][$scarTarget.local = "entire body"]]
/* Head */
......@@ -1297,7 +1297,7 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<<set _scarArray.push("left upper arm", "right upper arm", "left thigh", "right thigh")>>
<</if>>
/* Single scar */
<<else>>
<<else>>
<<set _scarArray = [$scarTarget.local]>>
<</if>>
<<for _i to 0; _i < _scarArray.length; _i++>>
......@@ -1311,4 +1311,4 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
<<goto "Body Modification">>
<</link>>
with $scarDesign.local on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, adding to the scars that are already there?<<else>>.<</if>>
<</if>>
\ No newline at end of file
<</if>>
src/uncategorized/newSlaveIntro.tw
+ 16
− 16
View file @ 863f0898
......@@ -41,17 +41,17 @@
<</if>>
<<if $activeSlave.amp != 0>>
<<if ([
"left upper arm", "right upper arm",
"left lower arm", "right lower arm",
"left wrist", "right wrist",
"left upper arm", "right upper arm",
"left lower arm", "right lower arm",
"left wrist", "right wrist",
"left hand", "right hand"
].includes($brandTarget.primary))>>
<<set _brandTarget = $brandTarget.secondary>>
<</if>>
<<if ([
"left upper arm", "right upper arm",
"left lower arm", "right lower arm",
"left wrist", "right wrist",
"left upper arm", "right upper arm",
"left lower arm", "right lower arm",
"left wrist", "right wrist",
"left hand", "right hand"
].includes($scarTarget.primary))>>
<<set _scarTarget = $scarTarget.secondary>>
......@@ -59,17 +59,17 @@
<</if>>
<<if $activeSlave.amp != 0>> /* amp check is in two parts for future multiamp */
<<if ([
"left thigh", "right thigh",
"left calve", "right calve",
"left ankle", "right ankle",
"left thigh", "right thigh",
"left calve", "right calve",
"left ankle", "right ankle",
"left foot", "right foot"
].includes($brandTarget.primary))>>
<<set _brandTarget = $brandTarget.secondary>>
<</if>>
<<if ([
"left thigh", "right thigh",
"left calve", "right calve",
"left ankle", "right ankle",
"left thigh", "right thigh",
"left calve", "right calve",
"left ankle", "right ankle",
"left foot", "right foot"
].includes($scarTarget.primary))>>
<<set _scarTarget = $scarTarget.secondary>>
......@@ -1245,7 +1245,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>&nbsp;&nbsp;&nbsp;&nbsp;
<<link "Whip $him until $he scars">>
<<run App.Medicine.Modification.addScourged($activeSlave)>>
<<run App.Medicine.Modification.addScourged($activeSlave)>>
<<run cashX(forceNeg($modCost), "slaveMod", $activeSlave)>> /* Let's just bill once, for the whip and disinfectant. */
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 10>>
......@@ -1257,7 +1257,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<else>>
body modification studio
<</if>>
and
and
<<if $activeSlave.amp != 1>>
chain $him spread-eagled
<<else>>
......@@ -1276,9 +1276,9 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if canHear($activeSlave)>>
but almost jumps out of $his $activeSlave.skin skin when you crack it behind $him.
<<else>>
and in $his deaf state every blow is a devastating suprise.
and in $his deaf state every blow is a devastating surprise.
<</if>>
$He frantically
$He frantically
<<if $activeSlave.amp != 1>>
wrenches $his hands and feet as you work up and down $his exposed back and limbs, but is completely unable to get free.
<<else>>
......
src/uncategorized/officeDescription.tw
+ 1
− 1
View file @ 863f0898
......@@ -166,7 +166,7 @@
<<case "body purist">>
_heA's depicted striking a sexy pose that shows off every flawless <<if $showInches == 2>>inch<<else>>centimeter<</if>> of _hisA body.
<<case "intellectual dependency">>
_heA's depicted riding a missle; both literally and sexually.
_heA's depicted riding a missile; both literally and sexually.
<<case "slave professionalism">>
_heA's depicted getting hands-on with cruise missile, priming it to go off.
<<case "petite admiration">>
......
src/uncategorized/personalAssistantAppearance.tw
+ 6
− 6
View file @ 863f0898
......@@ -149,7 +149,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "intellectual dependency">>
_HeA's taken to frequently sucking _himselfA off and displays a clear oral fixation.
<<case "slave professionalism">>
_HeA's wearing a refined suit that reveals just the right amount of cleavage and tastefully carresses _hisA third leg.
_HeA's wearing a refined suit that reveals just the right amount of cleavage and tastefully caresses _hisA third leg.
<<case "petite admiration">>
_HeA's recently adjusted _hisA height to be quite short: _heA finds having an erection easier than dragging _hisA cock along the ground.
<<case "statuesque glorification">>
......@@ -1665,7 +1665,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
_HeA is wearing nothing at all; it would just get in the way. _HeA's hard and ready to go, not that _heA could think of anything else to do.
<</if>>
<<case "slave professionalism">>
_HeA is wearing a fine suit and ready to offer a deal noone could refuse.
_HeA is wearing a fine suit and ready to offer a deal no one could refuse.
<<case "petite admiration">>
_HeA is wearing nothing at all and has recently rendered _himselfA quite short; the perfect height to slip through a crowd, unseen and slapping booty.
<<case "statuesque glorification">>
......@@ -1844,12 +1844,12 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "body purist">>
_HeA is wearing nothing at all, happy to show off _hisA flawless body. _HisA curves are perfect; it's the only way to describe _himA.
<<case "intellectual dependency">>
_HeA is wearing nothing at all; it would just get in the way.
_HeA is wearing nothing at all; it would just get in the way.
<<if $arcologies[0].FSIntellectualDependencyLawBeauty == 1>>
_HisA lavish makeup, long nails, luxurious hair,
<<if $arcologies[0].FSSlimnessEnthusiastLaw != 1>>
<<if $arcologies[0].FSSlimnessEnthusiast == "unset">>
<<if $arcologies[0].FSAssetExpansioninst != "unset" || $arcologies[0].FSTransformationFetishist != "unset">>
<<if $arcologies[0].FSAssetExpansionist != "unset" || $arcologies[0].FSTransformationFetishist != "unset">>
heaving<<if $arcologies[0].FSTransformationFetishist != "unset">> fake<</if>> tits, downright massive<<if $arcologies[0].FSTransformationFetishist != "unset">> implant-filled<</if>> ass,
<<else>>
huge tits, fat ass,
......@@ -1858,7 +1858,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<if $arcologies[0].FSTransformationFetishist != "unset">>
breast implants, fake ass,
<<else>>
tits pushing the boundry of good taste, nearly obscene ass,
tits pushing the boundary of good taste, nearly obscene ass,
<</if>>
<</if>>
<</if>>
......@@ -1973,4 +1973,4 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<default>>
_HeA's a little abstract symbol; when _heA speaks, the symbol glows slightly.
<</switch>>
\ No newline at end of file
<</switch>>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment