diff --git a/src/js/useSlave.JS b/src/js/useSlave.JS new file mode 100644 index 0000000000000000000000000000000000000000..0f2c6685ce58f644375fb8dd3c6fc372a5a4f3d0 --- /dev/null +++ b/src/js/useSlave.JS @@ -0,0 +1,3 @@ +window.useSlaveDisplay = function (slave) { + // Goal: Be able to write the entire "use her" block with only dom fragments. +} \ No newline at end of file diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index a10392e6c4ffc836d9a65516162c174d63ea6e36..f61a4cc25eb6d821cc080b7391ccc65fb47a1328 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -70,33 +70,10 @@ <span id="miniscene">//Or use $him here://</span> <<if $activeSlave.fuckdoll == 0>> <span id="sexoption"> - <<if ($activeSlave.vagina > -1)>> - <<if canDoVaginal($activeSlave)>> - <<link "Fuck $him">><<replace "#miniscene">><<include "FVagina">><br><</replace>><</link>> - <<if canDoAnal($activeSlave)>> - | <<link "Use $his holes">><<replace "#miniscene">><<include "FButt">><br> <</replace>><</link>> - <</if>> - <<else>> - //Remove $his chastity belt if you wish to fuck $him// - <</if>> - <</if>> - <<if $activeSlave.bellyPreg >= 300000>> - <<if canDoVaginal($activeSlave) || canDoAnal($activeSlave)>> - | <<link "Fuck $him on $his belly">><<replace "#miniscene">><<include "FBellyFuck">><br> <</replace>><</link>> - <<if $pregInventions >= 1>> - | <<link "Fuck $him in $his maternity swing">><<replace "#miniscene">><<include "FMaternitySwing">><br> <</replace>><</link>> - | <<link "Fuck $him with the help of $his assistants">><<replace "#miniscene">><<include "FAssistedSex">><br> <</replace>><</link>> - | <<link "Fuck $him in your goo pool">><<replace "#miniscene">><<include "FPoolSex">><br> <</replace>><</link>> - <</if>> - <</if>> - <</if>> + <<SlaveInteractSexOption>> </span> <span id="analsexoption"> - <<if canDoAnal($activeSlave)>> - | <<link "Fuck $his ass">><<replace "#miniscene">><<include "FAnus">><br> <</replace>><</link>> - <<else>> - | //Remove $his chastity belt if you wish to fuck $his ass// - <</if>> + <<SlaveInteractAnalSexOption>> </span> | <<link "Use $his mouth">><<replace "#miniscene">><<include "FLips">><br> <</replace>><</link>> | <<link "Kiss $him">><<replace "#miniscene">><<include "FKiss">><br> <</replace>><</link>> @@ -117,31 +94,13 @@ | <<link "Drink $his milk">><<replace "#miniscene">><<include "FSuckle">><br> <</replace>><</link>> <</if>> <span id="analgropeoption"> - <<if canDoAnal($activeSlave)>> - | <<link "Grope $his butt">><<replace "#miniscene">><<include "FondleButt">><br> <</replace>><</link>> - <</if>> + <<SlaveInteractAnalGropeOption>> </span> <span id="gropeoption"> - <<if ($activeSlave.vagina > -1)>> - <<if canDoVaginal($activeSlave)>> - | <<link "Grope $his pussy">><<replace "#miniscene">><<include "FondleVagina">><br> <</replace>><</link>> - | <<link "Eat $him out">><<replace "#miniscene">><<include "FLickPussy">><br> <</replace>><</link>> - <</if>> - <</if>> + <<SlaveInteractGropeOption>> </span> <span id="dickgropeoption"> - <<if ($activeSlave.dick > 0)>> - <<if !($activeSlave.chastityPenis)>> - | <<link "Grope $his dick">><<replace "#miniscene">><<include "FondleDick">><br> <</replace>><</link>> - <<if canPenetrate($activeSlave)>> - <<if $sexualOpeness == 1 || $activeSlave.toyHole == "dick">> - | <<link "Ride $his dick">><<replace "#miniscene">><<include "FDick">><br> <</replace>><</link>> - <</if>> - <</if>> - <<else>> - | //Remove $his dick chastity belt if you wish to play with $his cock// - <</if>> - <</if>> + <<SlaveInteractDickGropeOption </span> <<if hasAnyLegs($activeSlave) && $PC.dick > 0>> | <<link "Get a footjob">><<replace "#miniscene">><<include "FFeet">><br> <</replace>><</link>> @@ -309,13 +268,6 @@ <<if canDoAnal($activeSlave)>> | <<link "Fuck $his rear hole">><<replace "#miniscene">><<FFuckdollAnal>><br><</replace>><</link>> <</if>> - <span id = "impreg"> - <<if (canGetPregnant($activeSlave)) && ($activeSlave.geneticQuirks.superfetation != 2 || $geneticMappingUpgrade != 0) && $seePreg != 0>> - <<if canImpreg($activeSlave, $PC)>> - | <<link "Put a baby in $him">><<replace "#miniscene">><<FFuckdollImpreg>><br><</replace>><</link>> - <</if>> - <</if>> - </span> <</if>> <<set _activeSlaveRepSacrifice = repGainSacrifice($activeSlave, $arcologies[0])>> <<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0 || $eugenicsFullControl == 1 || $arcologies[0].FSRestart == "unset")>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index bea3d710d5cd3caa98d3a8707d9d9c1501cc1f00..d7c20a01b2f665af54200f3856f8e79253bd9e39 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -16,76 +16,76 @@ Call as <<SlaveInteractImpreg>> <<widget "SlaveInteractImpreg">> <<replace #impreg>> <<if $activeSlave.fuckdoll == 0>> - <<if canGetPregnant($activeSlave) && ($activeSlave.geneticQuirks.superfetation != 2 || $geneticMappingUpgrade != 0) && ($activeSlave.fuckdoll == 0) && $seePreg != 0>> - <<if canImpreg($activeSlave, $PC)>> - | <<link "Impregnate $him yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - <</if>> - <<if canImpreg($activeSlave, $activeSlave)>> - | <<link "Use $his own seed to impregnate $him">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if canGetPregnant($activeSlave) && ($activeSlave.geneticQuirks.superfetation != 2 || $geneticMappingUpgrade != 0) && ($activeSlave.fuckdoll == 0) && $seePreg != 0>> + <<if canImpreg($activeSlave, $PC)>> + | <<link "Impregnate $him yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> + <<if canImpreg($activeSlave, $activeSlave)>> + | <<link "Use $his own seed to impregnate $him">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> + | [["Use another slave to impregnate " + $him|FSlaveImpreg]] <</if>> - | [["Use another slave to impregnate " + $him|FSlaveImpreg]] - <</if>> - <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">> - <<if $enema == 1>> - <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> - <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with water">><<set $activeSlave.inflationType = "water">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - <</if>> - <<if $medicalEnema == 1>> - <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">> + <<if $enema == 1>> + <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> + <<if $activeSlave.inflationType == "water" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with water">><<set $activeSlave.inflationType = "water">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> <</if>> - <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if $medicalEnema == 1>> + <<if $activeSlave.inflationType == "aphrodisiac" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with aphrodisiacs">><<set $activeSlave.inflationType = "aphrodisiac">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> + <<if $activeSlave.inflationType == "curative" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with curatives">><<set $activeSlave.inflationType = "curative">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> + <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> - <<if $activeSlave.inflationType == "tightener" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with rectal tighteners">><<set $activeSlave.inflationType = "tightener">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> /* inflation < 3 */ + <</if>> /* enema == 1 */ + <<if $dairyPiping == 1>> + <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>> + <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> + <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force-feed $him milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> + <<else>> + | //$dairyNameCaps is not producing enough milk to pump through the pipes// <</if>> - <</if>> /* inflation < 3 */ - <</if>> /* enema == 1 */ - <<if $dairyPiping == 1>> - <<if ($milkPipeline > 88 && $milkPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>> - <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> - <<if $activeSlave.inflationType == "milk" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - | <<link "Force-feed $him milk">><<set $activeSlave.inflationType = "milk">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>> + <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> + <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force-feed $him cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> + <<else>> + | //$dairyNameCaps is not producing enough cum to pump through the pipes// <</if>> - <<else>> - | //$dairyNameCaps is not producing enough milk to pump through the pipes// - <</if>> - <<if ($cumPipeline > 88 && $cumPipeline != 0) || $arcologies[0].FSPastoralistLaw == 1>> + <</if>> /* dairyPiping == 1 */ + <<if $wcPiping == 1>> <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> - <<if $activeSlave.inflationType == "cum" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - | <<link "Force-feed $him cum">><<set $activeSlave.inflationType = "cum">><<set $activeSlave.inflationMethod = 1>><<replace "#miniscene">><<include "FillUpFace">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if $activeSlave.inflationType == "urine" || $activeSlave.inflationType == "none">> + | <<link "Fill $his ass with urine">><<set $activeSlave.inflationType = "urine">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> <</if>> <</if>> - <<else>> - | //$dairyNameCaps is not producing enough cum to pump through the pipes// - <</if>> - <</if>> /* dairyPiping == 1 */ - <<if $wcPiping == 1>> - <<if ($activeSlave.inflation < 3 && $activeSlave.pregKnown == 0 && $activeSlave.bellyImplant < 1500) || ($activeSlave.inflation < 1)>> - <<if $activeSlave.inflationType == "urine" || $activeSlave.inflationType == "none">> - | <<link "Fill $his ass with urine">><<set $activeSlave.inflationType = "urine">><<set $activeSlave.inflationMethod = 2>><<replace "#miniscene">><<include "FillUpButt">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - <</if>> - <</if>> - <</if>> /* wcPiping == 1 */ - <</if>> /* assigned to dairy or arcade */ - <<if $activeSlave.inflation == 0 && $activeSlave.bellyImplant < 1500>> - <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">> - | [["Use another slave to force-feed " + $him|SlaveOnSlaveFeedingWorkAround]] - <<if $buckets == 1>> - | <<link "Make $him consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - <<if $activeSlave.pregKnown == 0>> - | <<link "Force $him to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> - | <<link "Force two gallons of slave food into $him">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> /* wcPiping == 1 */ + <</if>> /* assigned to dairy or arcade */ + <<if $activeSlave.inflation == 0 && $activeSlave.bellyImplant < 1500>> + <<if $activeSlave.assignment != "work in the dairy" && $activeSlave.assignment != "be confined in the arcade" && $activeSlave.assignment != "be confined in the cellblock">> + | [["Use another slave to force-feed " + $him|SlaveOnSlaveFeedingWorkAround]] + <<if $buckets == 1>> + | <<link "Make $him consume two liters of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 1>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <<if $activeSlave.pregKnown == 0>> + | <<link "Force $him to consume a gallon of slave food">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 2>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + | <<link "Force two gallons of slave food into $him">><<set $activeSlave.inflationType = "food">><<set $activeSlave.inflationMethod = 1>><<set $activeSlave.inflation = 3>><<replace "#miniscene">><<include "forceFeeding">><br><</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>> + <</if>> <</if>> <</if>> <</if>> - <</if>> <<else>> <<if (canGetPregnant($activeSlave)) && ($activeSlave.geneticQuirks.superfetation != 2 || $geneticMappingUpgrade != 0) && $seePreg != 0>> <<if canImpreg($activeSlave, $PC)>> @@ -93,7 +93,7 @@ Call as <<SlaveInteractImpreg>> <</if>> <</if>> <</if>> - <</replace>> +<</replace>> <<replace #bloating>> <<if $activeSlave.inflation > 0>> <br>