From 857fb4caa6d64f12639d9e6a5782374ba9ac68d0 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 10 Mar 2019 23:27:47 +0100
Subject: [PATCH] some fixes
---
sanityCheck-java | 1 -
src/SecExp/weaponsManufacturing.tw | 2 +-
src/SpecialForce/Upgrades.tw | 4 ++--
.../mod_EditChildCheatDatatypeCleanupNew.tw | 2 +-
src/cheats/mod_EditChildCheatNew.tw | 2 +-
.../mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 +-
src/cheats/mod_editSlaveCheatNew.tw | 2 +-
src/facilities/nursery/childSummary.tw | 4 ++--
src/facilities/nursery/nursery.tw | 6 ++---
src/npc/newSlaveIncestSex.tw | 24 +++++++++----------
src/pregmod/fFeet.tw | 2 +-
src/pregmod/fMarry.tw | 2 +-
src/pregmod/implantManufactory.tw | 4 ++--
src/pregmod/incubator.tw | 4 ++--
src/pregmod/manageCorporation.tw | 2 +-
src/pregmod/physicalDevelopment.tw | 4 ++--
src/pregmod/widgets/economyWidgets.tw | 6 ++---
src/pregmod/widgets/seBirthWidgets.tw | 24 +++++++++----------
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/clinicReport.tw | 2 +-
.../freeRangeDairyAssignmentScene.tw | 10 ++++----
src/uncategorized/newSlaveIntro.tw | 4 ++--
src/uncategorized/ptWorkaround.tw | 2 +-
src/uncategorized/saHormoneEffects.tw | 6 ++---
src/uncategorized/walkPast.tw | 4 ++--
src/utility/extendedFamilyWidgets.tw | 2 +-
src/utility/miscWidgets.tw | 2 +-
testfile | 9 +++++++
29 files changed, 75 insertions(+), 67 deletions(-)
delete mode 100755 sanityCheck-java
create mode 100644 testfile
diff --git a/sanityCheck-java b/sanityCheck-java
deleted file mode 100755
index c564d01dfc6..00000000000
--- a/sanityCheck-java
+++ /dev/null
@@ -1 +0,0 @@
-git ls-files "src/*.tw" | xargs java -jar SanityCheck.jar
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 02c30b35092..dac9a124aee 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -6,7 +6,7 @@
This sector of the arcology has been dedicated to weapons manufacturing. These factories supply
<<if $militiaUnits.length > 0>> your militia and<</if>>
<<if $slaveUnits.length > 0>> your slave soldiers and<</if>>
-<<if $mercenaries >0>> your mercenaries and<</if>>
+<<if $mercenaries > 0>> your mercenaries and<</if>>
many small old world nations as the advanced technology that free cities have available is hard to come by otherwise.
<br>
<<if $weapProductivity == 1>>
diff --git a/src/SpecialForce/Upgrades.tw b/src/SpecialForce/Upgrades.tw
index 9cea530ae17..e1aaa7b15af 100644
--- a/src/SpecialForce/Upgrades.tw
+++ b/src/SpecialForce/Upgrades.tw
@@ -3,7 +3,7 @@
<<else>>There are no more upgrades available.<</if>>
<<if $SF.Upgrade > 0 && ($SF.Size !== _max)>>
<<set _cost = Math.ceil(Math.abs($cash*.05*(1.25+($SF.Size/1000))))>>
- <br>[[Re-unlock upgrading.|Firebase][$SF.Upgrade = 0,cashX(forceNeg(_cost), "specialForces")]] @@.red;<<print cashFormat(_cost)>> <</if>>
+ <br>[[Re-unlock upgrading.|Firebase][$SF.Upgrade = 0,cashX(forceNeg(_cost), "specialForces")]] @@.red;<<print cashFormat(_cost)>>@@ <</if>>
<<if ($SF.Size < 30||$SF.Size !== _max) && $SF.Upgrade < 1>>
<br>Which facility or equipment do you wish to upgrade this week? <br>
@@ -169,4 +169,4 @@
[[Build $SF.Lower's support facility|Firebase][$SF.Upgrade = 1, $SF.Facility.Active++, cashX(forceNeg(_cSFF), "specialForces")]]
<<else>>//Cannot afford to build $SF.Lower's support facility.//<</if>>
//Costs @@.red;<<print cashFormat(_cSFF)>>@@//
- <</if>>*/
\ No newline at end of file
+ <</if>>*/
diff --git a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
index ec7216a9b3c..a31efdc29ca 100644
--- a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
@@ -170,7 +170,7 @@
<<print "No Giant Clit when Dick is present, reset Clit to 0 (Normal)" >><br>
<<set $tempSlave.clit = 0>>
<</if>>
-<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg >0)>>
+<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg > 0)>>
<<print "Slave has no Ovaries and no Analwomb, Pregnancy reset to 0">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index 0cef8259710..3ec87572c40 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2740,7 +2740,7 @@
<<if $tempSlave.brand == 0>>
''$He has no Branding''
<<else>>
- ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
+ ''@@.yellow;$He@@ has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
<</if>>
<br><br>
''Branding Location:''
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index d4e358b389e..59a49e80b1d 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -140,7 +140,7 @@
<<print "No Giant Clit when Dick is present, reset Clit to 0 (Normal)" >><br>
<<set $tempSlave.clit = 0>>
<</if>>
-<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg >0)>>
+<<if ($tempSlave.ovaries == 0) && ($tempSlave.mpreg == 0) && ($tempSlave.preg > 0)>>
<<print "Slave has no Ovaries and no Analwomb, Pregnancy reset to 0">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 284cad66810..e0c3752c811 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -3546,7 +3546,7 @@
<<if $tempSlave.brand == 0>>
''$He has no Branding''
<<else>>
- ''@@.yellow;$He has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
+ ''@@.yellow;$He@@ has $tempSlave.brand branded onto $his <<if $tempSlave.brandLocation == 0>>@@.red;[NEEDS TO BE SET]<<else>> $tempSlave.brandLocation @@<</if>>''
<</if>>
<br><br>
''Branding Location:''
diff --git a/src/facilities/nursery/childSummary.tw b/src/facilities/nursery/childSummary.tw
index 0eda8190384..760106b9eee 100644
--- a/src/facilities/nursery/childSummary.tw
+++ b/src/facilities/nursery/childSummary.tw
@@ -70,7 +70,7 @@
sortButtonsByTrust();
<</script>>
<</link>>
- <br/>
+ <br>
<div id="qlWrapper" class="quicklist devotion">
<<for !_.isUndefined(_buttons[0])>>
<<set _button = _buttons.shift()>>
@@ -215,7 +215,7 @@ will
<<if ((_Pass != 'Main') || (def $Flag) || ($useSlaveSummaryTabs == 0) || ($childAssignmentTab == "all"))>>
<<print '<span id="slave-' + $cribs[_csi].ID + '"> </span>'>>
<</if>>
-<br/>
+<br>
<<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>> <</if>>
<<run clearSummaryCache()>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index b92e89dd576..fb80be2063f 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -183,7 +183,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<<if (0 < _SL)>>
<<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
- <br/>//Sorting:// ''<span id="qlNurserySort">$sortNurseryList</span>.''
+ <br>//Sorting:// ''<span id="qlNurserySort">$sortNurseryList</span>.''
<<link "Sort by Name">>
<<set $sortNurseryList = 'Name'>>
<<replace "#qlNurserySort">>$sortNurseryList<</replace>>
@@ -212,7 +212,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
sortNurseryPossiblesByPregnancyCount();
<</script>>
<</link>>
- <br/>
+ <br>
<</if>>
<div id="qlNursery">
<<for _u = 0; _u < _SL; _u++>>
@@ -470,7 +470,7 @@ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery
<br><br>''Children in $nurseryName''
<br>
/* FOR TESTING */
-<<for _c = 0; _c <$cribs.length; _c++>>
+<<for _c = 0; _c < $cribs.length; _c++>>
<<link "$cribs[_c].slaveName" "Long Child Description">>
<<include "Child Summary">>
<</link>>
diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw
index 75e1d4b8721..122276c759b 100644
--- a/src/npc/newSlaveIncestSex.tw
+++ b/src/npc/newSlaveIncestSex.tw
@@ -1,6 +1,6 @@
:: newSlaveIncestSex [nobr]
-<br/><br/>
+<br><br>
/* setup pronouns (switch on vagina for sisters and herms regardless of genes) */
<<set _oneshe = "she" >>
@@ -88,14 +88,14 @@
<</if>>
<<if $debugMode >>
-RELATIVE SLAVE (FIRST): <br/>
-_one ($relative.relation) <br/>
-$relative.physicalAge <br/>
-_oneshe / _oneher <br/>
-RELATIVE2 SLAVE (SECOND): <br/>
-_other ($relative2.relation) <br/>
-$relative2.physicalAge <br/>
-_othershe / _otherher <br/>
+RELATIVE SLAVE (FIRST): <br>
+_one ($relative.relation) <br>
+$relative.physicalAge <br>
+_oneshe / _oneher <br>
+RELATIVE2 SLAVE (SECOND): <br>
+_other ($relative2.relation) <br>
+$relative2.physicalAge <br>
+_othershe / _otherher <br>
<</if>>
<span id="result">
@@ -103,7 +103,7 @@ _othershe / _otherher <br/>
<<replace "#result">>
Now that you own them, you want to see proof of their love for each other. You order the <<if _one == "twin">>twins<<elseif _one == _other && _one == "brother">>brothers<<elseif _one == _other && _one == "sister">>sisters<<else>>_one and _other<</if>> to perform mutual oral sex in front of you.
Hesitantly, they assume the 69 position on your couch. They have either never done this in front of a stranger or have never had sex this way before. You remind them that they are sex slaves now. They need to follow all orders, including sexual ones, so this is a relatively gentle start.
-<br/><br/>
+<br><br>
<<if _one == "twin">>One _one<<else>>The _onelong<</if>> shows more boldness as _oneshe lowers _oneher head towards _oneher _otherlong's privates.
<<if $relative2.dick == 0 >>
Carefully, _oneshe spreads _oneher _other's labia. Then _oneshe continues to give _oneher _other's exposed pussy a few experimental licks. At first, _oneher efforts seem to be futile, but after a while the _otherlong's clit becomes engorged and _otherher juices start flowing.
@@ -114,9 +114,9 @@ As the _other's arousal grows, _othershe becomes more eager to please _otherher
<<if ($relative.dick == 0) != ($relative2.dick == 0) >>
Of course, _othershe has to adapt _otherher actions <<if $relative.dick == 0 >>from the feelings on _otherher dick to the pussy pressed against _otherher lips.<<else>>from the feelings at _otherher pussy to the dick in _otherher mouth.<</if>>
<</if>>
-<br/><br/>
+<br><br>
You can tell how uncomfortable they are with you watching them, but as they become increasingly worked up, they lose their inhibitions. Soon, you are watching some fairly enthralling <<print $RecETSevent.replace("incest","") >> incest action at your office<<if _actions.length >>, including some enthusiastic <<print _actions.join(" and ")>><</if>>. Eventually, they bring each other to impressive mutual orgasms. Their lusty moans are muffled only by each others' crotches. Spent, exhausted, and with their faces covered in each others <<print _secretions.join(" and ")>>, they untangle to rest comfortably on your couch.
-<br/><br/>
+<br><br>
You indicate them to present themselves to you. Still shaking from the aftershocks of their orgasms, they stand side by side in front of you, panting, naked and with their _genitals dripping mixed juices. You simply nod, showing your approval. They are visibly relieved, and not only sexually. They are more confident of having made the right choice in enslaving themselves to you, since you seem @@.mediumaquamarine;trustworthy@@ and @@.hotpink;sympathetic.@@ They hug again, kissing and licking the sexual fluids off each others' stained faces.
<</replace>>
<<set $relative.devotion += 4>>
diff --git a/src/pregmod/fFeet.tw b/src/pregmod/fFeet.tw
index 431c7c68fe8..988a4fc63b3 100644
--- a/src/pregmod/fFeet.tw
+++ b/src/pregmod/fFeet.tw
@@ -502,7 +502,7 @@ You call $activeSlave.slaveName to your office, telling $him to use $his feet to
<<if $activeSlave.vagina >= 0>>
expose $his vagina and spreads $his <<if $activeSlave.labia == 3>>extremely large <<elseif $activeSlave.labia == 2>>large <<elseif $activeSlave.labia == 1>>pretty <<else>>minimal <</if>>pussylips to show where $he wants cum.
<<elseif $activeSlave.mpreg == 1>>
- expose $his <<if $activeSlave.anus >3 >>gaping <<elseif $activeSlave.anus >2 >>very loose <<elseif $activeSlave.anus >1 >>loose <<elseif $activeSlave.anus >0 >>tight <<else>>virgin <</if>>asshole to show where $he wants cum.
+ expose $his <<if $activeSlave.anus > 3 >>gaping <<elseif $activeSlave.anus > 2 >>very loose <<elseif $activeSlave.anus > 1 >>loose <<elseif $activeSlave.anus > 0 >>tight <<else>>virgin <</if>>asshole to show where $he wants cum.
<<else>>
hug $his stomach.
<</if>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 0bee3b389fb..1465fe709da 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -132,7 +132,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif ($activeSlave.fetish == "cumslut")>>
be your cum <<s>>ucker,
<<elseif ($activeSlave.fetish == "humiliation")>>
- be <<s>tripped bare and <<sh>>own off,
+ be <<s>>tripped bare and <<sh>>own off,
<<elseif ($activeSlave.fetish == "buttslut")>>
have thing<<s>> <<sh>>oved up my butt,
<<elseif ($activeSlave.fetish == "boobs")>>
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index b6baed36ebf..24817e64022 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -49,7 +49,7 @@ The manufactory is capable of producing customized fillable implants.
<<if ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep <= 6000*_PCSkillCheck)>> /* show only after belly implants already researched */
//You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants//
<br>
- <<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep >6000*_PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
+ <<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep > 6000 * _PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
[[Purchase schematics for cervix filter micropumps|Implant Manufactory][cashX(forceNeg(70000*_PCSkillCheck), "capEx"), $cervixImplants = 1]]
//Costs <<print cashFormat(70000*_PCSkillCheck)>>//
<br> //Will allow the construction of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
@@ -130,4 +130,4 @@ Fluid Production Implants
<<elseif ($prostateImplants > 0)>>
The manufactory is capable of producing ejaculation enhancing prostate implants.
<br>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 6852e5433be..d503ba78dfc 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -37,7 +37,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
*/
<<if (0 < _SL)>>
<<set $sortIncubatorList = $sortIncubatorList || 'Unsorted'>>
- <br/>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
+ <br>//Sorting:// ''<span id="qlIncubatorSort">$sortIncubatorList</span>.''
<<link "Sort by Name">>
<<set $sortIncubatorList = 'Name'>>
<<replace "#qlIncubatorSort">>$sortIncubatorList<</replace>>
@@ -66,7 +66,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
sortIncubatorPossiblesByPregnancyCount();
<</script>>
<</link>>
- <br/>
+ <br>
<</if>>
<div id="qlIncubator">
<<for _u = 0; _u < _SL; _u++>>
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 652628a1b94..ac4e6691994 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1963,7 +1963,7 @@ __Slave specialization__
<</if>>
<</if>>
<<if $corpSpecEducation == 0>>
- <brThe corporation focuses on uneducated slaves.
+ <br>The corporation focuses on uneducated slaves.
<<if $corpSpecTimer == 0>>
<<if $corpSpecToken > 0>>
[[Basic Education|Manage Corporation][$corpSpecEducation = 1, $corpSpecTimer = 2]] |
diff --git a/src/pregmod/physicalDevelopment.tw b/src/pregmod/physicalDevelopment.tw
index 0abab9447a2..14abee4477f 100644
--- a/src/pregmod/physicalDevelopment.tw
+++ b/src/pregmod/physicalDevelopment.tw
@@ -253,7 +253,7 @@
<</if>>
<</if>>
<<if $args[0].butt < 3>>
- <<if random(1,100) >80>>
+ <<if random(1,100) > 80>>
<<set $args[0].butt += 1>>
<</if>>
<</if>>
@@ -1651,7 +1651,7 @@
<</if>>
<</if>>
<<if $args[0].butt < 3>>
- <<if random(1,100) >80>>
+ <<if random(1,100) > 80>>
<<set $args[0].butt += 1>>
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index 99e69b2ec2b..df977dc9396 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -541,7 +541,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Error if decimal or not "all" or "max" string */
@@ -564,7 +564,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if Math.ceil(State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Successful sell */
@@ -575,7 +575,7 @@
<<print cashFormat($corpCash)>>
<</replace>>
<<replace `'#'+$args[0]+'AssetsDisp'`>>
- <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) <1>> <1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
+ <<print cashFormat(State.variables[$args[0]+"AssetPrice"] * State.variables[$args[0]+"Assets"])>> (<<if (State.variables[$args[0]+"Assets"]/500) < 1>> < 1 <<else>><<print commaNum(Math.ceil(State.variables[$args[0]+"Assets"]/500))>> <</if>>unit<<if State.variables[$args[0]+"Assets"]/500 > 1>>s<</if>>)
<</replace>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>><</replace>>
/* Unsuccessful sell but have enough assets for more than 1 unit */
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 859e0c6236f..9ef20983955 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -628,16 +628,16 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<if $slaves[$i].mpreg == 1>>
<<if $slaves[$i].anus < 2>>
<br>
- $His tight ass @@.red;hindered $his <<if _curBabies >1>>babies<<else>>baby's<</if>> birth@@.
+ $His tight ass @@.red;hindered $his <<if _curBabies > 1>>babies<<else>>baby's<</if>> birth@@.
<</if>>
<<else>>
<<if $slaves[$i].vagina < 2>>
<br>
- $His tight vagina @@.red;hindered $his <<if _curBabies >1>>babies<<else>>baby's<</if>> birth@@.
+ $His tight vagina @@.red;hindered $his <<if _curBabies > 1>>babies<<else>>baby's<</if>> birth@@.
<</if>>
<<if $slaves[$i].vaginaLube == 0>>
<br>
- $His dry vagina made pushing $his <<if _curBabies >1>>children<<else>>child<</if>> out @@.red;painful@@.
+ $His dry vagina made pushing $his <<if _curBabies > 1>>children<<else>>child<</if>> out @@.red;painful@@.
<</if>>
<</if>>
<<if $slaves[$i].hips < 0>>
@@ -646,7 +646,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<</if>>
<<if $slaves[$i].weight < -95>>
<br>
- $His very thin body @@.red;was nearly incapable of birthing $his <<if _curBabies >1>>children<<else>>child<</if>>@@.
+ $His very thin body @@.red;was nearly incapable of birthing $his <<if _curBabies > 1>>children<<else>>child<</if>>@@.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].weight <= -30>>
<br>
@@ -662,10 +662,10 @@ This decriptions can be expanded with more outcomes later. But it's not practica
$His very young body was @@.red;not designed to be able pass a baby@@.
<<elseif $slaves[$i].physicalAge < 9>>
<br>
- $His young body had @@.red;a lot of trouble@@ birthing $his <<if _curBabies >1>>babies<<else>>baby<</if>>.
+ $His young body had @@.red;a lot of trouble@@ birthing $his <<if _curBabies > 1>>babies<<else>>baby<</if>>.
<<elseif $slaves[$i].physicalAge < 13>>
<br>
- $His young body had @@.red;trouble birthing@@ $his <<if _curBabies >1>>babies<<else>>baby<</if>>.
+ $His young body had @@.red;trouble birthing@@ $his <<if _curBabies > 1>>babies<<else>>baby<</if>>.
<<set _compoundCondition = 1>>
<</if>>
<<if $slaves[$i].tired > 0>>
@@ -675,15 +675,15 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<</if>>
<<if $slaves[$i].muscles < -95>>
<br>
- $He tried and tried but $his frail body @@.red;could not push $his <<if _curBabies >1>>children<<else>>child<</if>> out@@.
+ $He tried and tried but $his frail body @@.red;could not push $his <<if _curBabies > 1>>children<<else>>child<</if>> out@@.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].muscles < -30>>
<br>
- $His very weak body @@.red;barely managed to push@@ out $his <<if _curBabies >1>>children<<else>>child<</if>>.
+ $His very weak body @@.red;barely managed to push@@ out $his <<if _curBabies > 1>>children<<else>>child<</if>>.
<<set _compoundCondition = 1>>
<<elseif $slaves[$i].muscles < -5>>
<br>
- $His weak body @@.red;struggled to push@@ out $his <<if _curBabies >1>>children<<else>>child<</if>>.
+ $His weak body @@.red;struggled to push@@ out $his <<if _curBabies > 1>>children<<else>>child<</if>>.
<</if>>
<<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth*1.25>>
<br>
@@ -698,16 +698,16 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<if $slaves[$i].mpreg == 1>>
<<if $slaves[$i].anus >= 2>>
<br>
- $His @@.green;loose ass@@ made birthing $his <<if _curBabies >1>>children<<else>>child<</if>> easier.
+ $His @@.green;loose ass@@ made birthing $his <<if _curBabies > 1>>children<<else>>child<</if>> easier.
<</if>>
<<else>>
<<if $slaves[$i].vagina >= 2>>
<br>
- $His @@.green;loose vagina@@ made birthing $his <<if _curBabies >1>>children<<else>>child<</if>> easier.
+ $His @@.green;loose vagina@@ made birthing $his <<if _curBabies > 1>>children<<else>>child<</if>> easier.
<</if>>
<<if $slaves[$i].vaginaLube > 0>>
<br>
- $His @@.green;moist vagina@@ hastened $his <<if _curBabies >1>>children's<<else>>child's<</if>> birth.
+ $His @@.green;moist vagina@@ hastened $his <<if _curBabies > 1>>children's<<else>>child's<</if>> birth.
<</if>>
<</if>>
<<if $slaves[$i].laborCount > 0>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 5ecd2a45525..7c0870d74e4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -12396,7 +12396,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<set $activeSlave.dick-->>
<</if>>
<<if $activeSlave.balls > 1 && random(1,100) > 70>>
- As a side effect, $his @@orange:lime;balls have also atrophied,@@ which $he sees as an added benefit.
+ As a side effect, $his @@.orange:lime;balls have also atrophied,@@ which $he sees as an added benefit.
<<set $activeSlave.balls-->>
<<if (($activeSlave.geneMods.NCS == 1) && ($activeSlave.balls > 1) && (random(1,100) > 50))>>
<<set $activeSlave.balls-->>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index abaca9fbff5..07e87aab349 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -226,7 +226,7 @@
<<case "bovine patterns">>
$He stares at $his new cow's anus. Finally, $he focuses on the upsides of being permanently transformed like this. "<<Master>>, I hope thi<<s>> mean<<s>> I'll have to be fed up the butt a lot," $he <<say>>s, referencing the milking systems' anal feeders.
<<case "possessive">>
- $He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. "Be<<s>t pla<<c>>e for that date, <<Master>>," $he <<say>>s. "Being a butt <<s>>lut i<<s>> my life now."
+ $He stares, realizing that the ring of numbers around $his anus give the date $he was enslaved by you. "Be<<s>>t pla<<c>>e for that date, <<Master>>," $he <<say>>s. "Being a butt <<s>>lut i<<s>> my life now."
<<case "paternalist">>
$He stares, $his mouth working as $he spells out '<<= WrittenMaster($activeSlave)>> Helped Me Love Anal.' "Oh <<Master>>, you did," $he coos. "You did! Thank you <<s>>o much for helping me become the anal <<s>>lut I wa<<s>> alway<<s>> meant to be!"
<</switch>>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index fbebaa1fb68..afaf90f20c6 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -174,7 +174,7 @@
<</if>>
<<if $slaves[$i].preg >= $slaves[$i].pregData.minLiveBirth && $slaves[$i].pregControl == "speed up">>
<<set $slaves[$i].pregControl = "none">>
- ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2 course of rapid gestation agents is finished''.
+ ''@@.pink;$slaves[$i].slaveName's@@'' child is ready to pop out of _his2 womb, ''@@.yellow;_his2@@ course of rapid gestation agents is finished''.
<</if>>
<<elseif $slaves[$i].preg > 2 && $slaves[$i].pregKnown == 0>>
During $his tests, $he discovers that $slaves[$i].slaveName @@.lime;is pregnant.@@
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index b9e929d30d3..30678a8c4ac 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -142,7 +142,7 @@ Eventually, $activeSlave.slaveName arrives at $his designated milking stall.
$His _assayType _assayedSlave.slaveName is at the dairy, too. _He2 is in the adjacent stall. The two of them are going to be milked right next to each other.
<</if>>
-The only "furniture" in the stall looks like a dentist's chair. It looks very medical, but it turns out to be quite comfortable actually. $He <<if $activeSlave.devotion >90>>eagerly<<elseif $activeSlave.slaveName < 40>>hesitantly<</if>> gets into the chair.
+The only "furniture" in the stall looks like a dentist's chair. It looks very medical, but it turns out to be quite comfortable actually. $He <<if $activeSlave.devotion > 90>>eagerly<<elseif $activeSlave.slaveName < 40>>hesitantly<</if>> gets into the chair.
<<if $Milkmaid == 0 >>
Automated machinery springs to life, preparing $him for milking.
<<else>>
@@ -164,14 +164,14 @@ Suction cups are attached <<if $activeSlave.nipples == "fuckable">>over<<else>>t
A suction cup is attached over $his hidden cumhole.
<</if>>
<</if>>
-<br/>
+<br>
<<if $dairyFeedersSetting == 1>>
Near the headrest of the chair, an artificial phallus is installed. The cow can easily reach it with $his mouth. The phallus provides hydration and nutrition when sucked. The supplement consists of excess or low-quality milk and cum from the dairy itself as well as aphrodisiacs and hormones enhancing lactation and semen production.
<<if $activeSlave.sexualFlaw == "cum addict" || $activeSlave.fetish == "cumslut">>
$activeSlave.slaveName eagerly shoves the artificial phallus into $his mouth. $He gives it an experimental suckle. To $his joy, $he soon is rewarded with a fresh spurt of semen-like nutrition supplement. Then $he readjusts the holder to keep the phallus lodged in $his mouth, effectively forcing $himself to keep sucking the artificial dick.
<</if>>
<</if>>
-<br/>
+<br>
The milking chair comes with a small screen, providing mental stimulation for the cow. It is highly pornographic, of course. It also includes live-streams of close-ups from the cows being milked or their orifices being penetrated. $activeSlave.slaveName selects $his favorite program<<if canSee($activeSlave)>> to watch<<elseif canHear($activeSlave)>> to listen to<<else>> to feel the vibrations from<</if>>. It features
<<if $activeSlave.attrXY > $activeSlave.attrXX || $activeSlave.behavioralQuirk == "adores men">>
men
@@ -217,7 +217,7 @@ The milking chair comes with a small screen, providing mental stimulation for th
<br><br>
Sexual stimulation increases product output.
<<if $Milkmaid == 0 && $dairyStimulatorsSetting == 0>>
- Unfortunately, there is neither a milkmaid providing personal assistance nor automatic sodomizers installed in your dairy.<br/>
+ Unfortunately, there is neither a milkmaid providing personal assistance nor automatic sodomizers installed in your dairy.<br>
<<else>>
<<if $Milkmaid != 0>>
<<setLocalPronouns $Milkmaid 2>>
@@ -231,7 +231,7 @@ Sexual stimulation increases product output.
<<if $milkmaidImpregnates == 1 && canPenetrate($Milkmaid) && $Milkmaid.pubertyXY == 1 && $Milkmaid.ballType == "human">>
If at all possible, it is _his2 duty to thoroughly knock up _his2 charges.
<</if>>
- <br/>
+ <br>
<</if>>
<<if $dairyStimulatorsSetting > 0>>
Automated sodomizers help the cows produce by penetrating their anuses. The milking chairs built-in sensors measure $activeSlave.slaveName's anal capacity.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index bd794d915d4..6b38306ea17 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -205,7 +205,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
$He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> You teasingly ask if $he'd like to feel it sometime, eliciting a delighted squeal from the $girl. @@.green;$He's a pregnancy fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
- $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so $he can be close to that belly.
+ $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @@.hotpink;eager to please you@@ so $he can be close to that belly.
<<set $activeSlave.devotion += 5>>
<</if>>
<<else>>
@@ -221,7 +221,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
$He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> You teasingly ask if $he'd like to feel it sometime, eliciting a delighted squeal from the $girl. @@.green;$He's an impregnation fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
- $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so $he can be close to that belly.
+ $He keeps stealing glances at your <<if $PC.belly >= 120000>>massive<<elseif $PC.belly >= 60000>>giant<<elseif $PC.belly >= 15000>>huge<<elseif $PC.belly >= 5000>>big<</if>> baby bump.<<if canAchieveErection($activeSlave)>> $His dick rapidly hardening.<</if>> As you inspect $him, you take care to gently brush your pregnancy across $him as you move. $He is practically bursting with lust by the end and @@.hotpink;eager to please you@@ so $he can be close to that belly.
<<set $activeSlave.devotion += 5>>
<</if>>
<<else>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 92a2427673f..2f747332944 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -266,7 +266,7 @@
<<case "abusive" "anal addict" "attention whore" "breast growth" "breeder" "cum addict" "malicious" "neglectful" "self hating">>
has a paraphilia. Typical methods will have no effect on this kind of flaw.
<<set $activeSlave.training = 0>>
- @@.yellow;$His training assignment has defaulted to
+ @@.yellow;$His@@ training assignment has defaulted to
<<if ($activeSlave.devotion <= 20) && ($activeSlave.trust >= -20)>>
breaking $his will.
<<set $personalAttention[_ptwi].trainingRegimen = "break her will">>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index a255ffc1e2f..7d14e2040c5 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -194,7 +194,7 @@
<<elseif $slaves[$i].hormoneBalance >= 300>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
@@ -294,7 +294,7 @@
<<elseif $slaves[$i].hormoneBalance >= 250>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
@@ -394,7 +394,7 @@
<<elseif $slaves[$i].hormoneBalance >= 200>>
<<if ($slaves[$i].faceShape == "masculine")>>
- Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>><childlike <</if>>androgyny.@@
+ Hormonal effects cause @@.orange;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike <</if>>androgyny.@@
<<set $slaves[$i].faceShape = "androgynous">>
<<elseif ($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.lime;$his face to soften into <<if $slaves[$i].geneMods.NCS == 1>>childlike normalcy<<else>>femininity<</if>>.@@
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 855b9e62556..3f9fc0a7da4 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -319,7 +319,7 @@
<<case "a string bikini">>
$His string bikini covers only $his nipples, leaving the remainder of $his <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>> naked.
<<case "a scalemail bikini">>
- $His scalemail bikini covers <<if $activeSlave.boobs < 300>>all of $his flat chest.<<elseif $activeSlave.boobs < 700>>$his breasts entirely.<<elseif $activeSlave.boobs <1500>>much of $his breasts, while still emphasizing them.<<else>>the front of $his breasts.<</if>> .
+ $His scalemail bikini covers <<if $activeSlave.boobs < 300>>all of $his flat chest.<<elseif $activeSlave.boobs < 700>>$his breasts entirely.<<elseif $activeSlave.boobs < 1500>>much of $his breasts, while still emphasizing them.<<else>>the front of $his breasts.<</if>> .
<<case "striped panties">>
$His cute panties covers only $his crotch, leaving $his <<if $activeSlave.boobs < 300>>flat chest<<else>>breasts<</if>> bare.
<<case "clubslut netting">>
@@ -3863,4 +3863,4 @@
<</switch>>
<</if>>
</span>
-//
\ No newline at end of file
+//
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 820c05ee616..0548a3081b6 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -876,7 +876,7 @@
<<if $j < $children.length-1>>
$children[$j].slaveName,
<<else>>
- and $children[$j].slaveName@@.
+ and $children[$j].slaveName.
<</if>>
<</for>>@@
are your half-sisters.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index fb4a1602590..293a6ba7d7a 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -438,7 +438,7 @@
%/
<<widget "SlaveInteractDickGropeOption">>
<<replace #dickgropeoption>>
- <<if ($activeSlave.dick >0)>>
+ <<if ($activeSlave.dick > 0)>>
<<if !($activeSlave.chastityPenis)>>
| <<link "Grope $his dick">><<replace "#miniscene">><<include "FondleDick">><br> <</replace>><</link>>
<<if canPenetrate($activeSlave) && $sexualOpeness == 1>>
diff --git a/testfile b/testfile
new file mode 100644
index 00000000000..7f01b61ba0e
--- /dev/null
+++ b/testfile
@@ -0,0 +1,9 @@
+<<print "
+ <span id=\"" + _span + "\">
+ <<link \"Cheat Edit Arcology " + $i + " (" + $arcologies[$i].name + ")\">>
+ <<replace #arc" + $i + ">>
+ <<EditNeighborCheat " + $i + ">>
+ <</replace>>
+ <</link>>
+ </span>
+">> |
--
GitLab