From 82ef569023a1e039b1c46b128c814d9b05ba6c55 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sat, 6 Jul 2019 22:31:25 -0500 Subject: [PATCH] Spaces --- src/SecExp/propagandaHub.tw | 2 +- src/SecExp/riotControlCenter.tw | 2 +- src/SecExp/secBarracks.tw | 2 +- src/SecExp/securityHQ.tw | 2 +- src/SpecialForce/Firebase.tw | 2 +- src/SpecialForce/SpecialForce.js | 2 +- .../mod_EditArcologyCheatDatatypeCleanup.tw | 2 +- src/data/utility/pronouns.js | 2 +- .../nursery/longChildDescription.tw | 4 +- src/interaction/prostheticConfig.tw | 2 +- src/js/ageAdjustYoungRelative.js | 20 +- src/js/descriptionWidgets.js | 8 +- src/js/generateGenetics.js | 204 +++++++++--------- src/js/playerJS.js | 8 +- src/npc/databases/dSlavesDatabase.tw | 2 +- src/pregmod/killSlave.tw | 2 +- src/pregmod/seFCTVshows.tw | 24 +-- src/uncategorized/changeLanguage.tw | 2 +- src/uncategorized/dairy.tw | 2 +- src/uncategorized/neighborInteract.tw | 2 +- src/uncategorized/nextWeek.tw | 2 +- src/uncategorized/randomNonindividualEvent.tw | 2 +- src/uncategorized/saHormoneEffects.tw | 2 +- src/uncategorized/slaveInteract.tw | 6 +- src/uncategorized/universalRules.tw | 2 +- 25 files changed, 155 insertions(+), 155 deletions(-) diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw index d481853a312..2cbd7ab7aaa 100644 --- a/src/SecExp/propagandaHub.tw +++ b/src/SecExp/propagandaHub.tw @@ -10,7 +10,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> Propaganda Hub diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index ad0d2e61262..67948d1de74 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -4,7 +4,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> Riot Control Center diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 531fbd4de6c..346cfc21e63 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -4,7 +4,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> The Barracks diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index d108018f257..5cc37bdf7e1 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -10,7 +10,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> Security Headquarters diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index 388460fb062..644e70d8ee7 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -16,7 +16,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> <<if $cheatMode > 0>> [[Cheat edit|CheatEdit][]] <br> <</if>> diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index ab44f29176c..5e7b662baf9 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -2616,7 +2616,7 @@ App.SF.AAR = function(endWeekCall = 1) { r += `<br> Accountability: `; r += `<span id="accountability"> <<if $SF.Regs === "strict">>''Strict Accountability''<<elseif $SF.Regs === "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. `; - r += `<br> <<link "Strict Accountability">> <<set $SF.Regs = "strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> //Reduces force depravity.//`; + r += `<br> <<link "Strict Accountability">> <<set $SF.Regs = "strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> //Reduces force depravity.//`; r += `<br> <<link "Some Accountability">> <<set $SF.Regs = "some">> <<replace "#accountability">>''Some Accountability''<</replace>> <</link>> //Does not adjust force depravity.//`; r += `<br> <<link "No Accountability">> <<set $SF.Regs = "none">> <<replace "#accountability">>''No Accountability''<</replace>> <</link>> //Increases force depravity.//`; diff --git a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw index ae92b59b7f8..c2d33e31417 100644 --- a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw @@ -4,7 +4,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> <<if $customEvalCode>> diff --git a/src/data/utility/pronouns.js b/src/data/utility/pronouns.js index 58186a2338e..45197d0b940 100644 --- a/src/data/utility/pronouns.js +++ b/src/data/utility/pronouns.js @@ -37,7 +37,7 @@ App.Data.Pronouns.makePronounsData = function( }; App.Data.Pronouns.Std = { - 0: App.Data.Pronouns.makePronounsData("she", "her", "hers", "her", "herself", "girl"), + 0: App.Data.Pronouns.makePronounsData("she", "her", "hers", "her", "herself", "girl"), 1: App.Data.Pronouns.makePronounsData("he", "his", "his", "him", "himself", "boy"), 2: App.Data.Pronouns.makePronounsData("it", "its", "its", "it", "itself", "toy"), 3: App.Data.Pronouns.makePronounsData("they", "their", "theirs", "them", "themselves", "toys"), diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw index cb8ab14cebb..52fb7d0019b 100644 --- a/src/facilities/nursery/longChildDescription.tw +++ b/src/facilities/nursery/longChildDescription.tw @@ -1151,7 +1151,7 @@ $He is <<heelDescription>> <<if $activeChild.fuckdoll == 0>> - /* Check it's not a facial brand. (posting much later, I have basically just printed the list that was here. It might need to be longer, but it's the only way I can think of to hide cheeks and ears in multiBrand.)*/ + /* Check it's not a facial brand. (posting much later, I have basically just printed the list that was here. It might need to be longer, but it's the only way I can think of to hide cheeks and ears in multiBrand.)*/ /* Sorted top to bottom */ /* Torso */ <<= App.Desc.brand($activeChild, "chest")>> @@ -1171,7 +1171,7 @@ $He is <<= App.Desc.brand($activeChild), "foot")>> <</if>> -/* Opposite way of handling above, if that ever proves more conevient. This will print everything that's not on the face. The risk is that it may print things that are already printed elsewhere. */ +/* Opposite way of handling above, if that ever proves more convenient. This will print everything that's not on the face. The risk is that it may print things that are already printed elsewhere. */ /*<<if $activeChild.fuckdoll == 0>>*/ /* Describe any brands that aren't on the face */ /*<<for _brandName, _brand range $activeChild.brand>> diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw index f50c30ad3e1..a5d6e382e3e 100644 --- a/src/interaction/prostheticConfig.tw +++ b/src/interaction/prostheticConfig.tw @@ -268,7 +268,7 @@ Fit prosthetics to $him: <style> .container { display: grid; - grid-template-columns: 300px 200px 200px; + grid-template-columns: 300px 200px 200px; } .full { grid-column-start: 2; diff --git a/src/js/ageAdjustYoungRelative.js b/src/js/ageAdjustYoungRelative.js index 35eefdb75ec..b8d3d30dc4d 100644 --- a/src/js/ageAdjustYoungRelative.js +++ b/src/js/ageAdjustYoungRelative.js @@ -2,7 +2,7 @@ * clamp certain physical parameters of the younger relative appropriately for their physical age. * Generally these adjustments should match the age limiters found in generateNewSlave.js. */ - + window.AgeAdjustYoungRelative = function(slave) { /* breast size */ var origBoobs = slave.boobs; @@ -15,7 +15,7 @@ } else if (slave.physicalAge <= 15) { slave.boobs = Math.clamp(slave.boobs, 0, 450); } - + /* if we've reduced breast size because of age, reapply minimum weight modifiers */ if (origBoobs > slave.boobs && State.variables.weightAffectsAssets !== 0) { if (slave.weight > 190) { @@ -26,7 +26,7 @@ slave.boobs += 100; } } - + /* if we've managed to *increase* breast size, just put it back */ if (origBoobs < slave.boobs) { slave.boobs = origBoobs; @@ -45,27 +45,27 @@ if (!AllowedBoobShapes.includes(slave.boobShape)) { slave.boobShape = "normal"; } - + /* voice */ if (slave.physicalAge <= 16 && slave.voice <= 1) { slave.voice = 2; } - + /* XX genitals */ if (slave.physicalAge < 20 && slave.vagina > 1) { slave.vagina = 1; } - + if (slave.physicalAge <= 13 && slave.clit > 1) { slave.clit = 1; } - + if (slave.physicalAge <= 13 && slave.labia > 1) { slave.labia = 1; } else if (slave.physicalAge <= 15 && slave.labia > 2) { slave.labia = 2; } - + /* XY genitals */ if (slave.physicalAge <= 13) { if (slave.geneticQuirks.wellHung === 2 && slave.physicalAge >= 8 && slave.dick > 4) { @@ -88,14 +88,14 @@ slave.scrotum = slave.balls; } } - + /* teeth */ if (slave.physicalAge < 6) { slave.teeth = "baby"; } else if (slave.physicalAge < 12) { slave.teeth = "mixed"; } - + /* reset puberty status */ generatePuberty(slave); }; diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index f445f1802f6..dda317f5728 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -564,7 +564,7 @@ App.Desc.ageAndHealth = function(slave) { /** * @param {App.Entity.SlaveState} slave - * @returns {string} Slave's brand. Slave is the slave in question, but call the body part without modifiers. Rather than using "left breast" and "right breast" just use "breast". The function will then describe any brands on the breasts, if present, in natural language. + * @returns {string} Slave's brand. Slave is the slave in question, but call the body part without modifiers. Rather than using "left breast" and "right breast" just use "breast". The function will then describe any brands on the breasts, if present, in natural language. */ App.Desc.brand = function(slave, surface) { "use strict"; @@ -576,7 +576,7 @@ App.Desc.brand = function(slave, surface) { } = getPronouns(slave); /* eslint-enable */ if (State.variables.showBodyMods === 1) { - if (surface === "extra") { // Make a sentence that describes all body parts that aren't explicitly described elsewhere in longSlave. If you brand a slave on her thumb, for instance. But why. + if (surface === "extra") { // Make a sentence that describes all body parts that aren't explicitly described elsewhere in longSlave. If you brand a slave on her thumb, for instance. But why. let extraMarks = App.Desc.extraMarks(slave, "brand"); extraMarks = Object.keys(extraMarks); let length = extraMarks.length; @@ -588,7 +588,7 @@ App.Desc.brand = function(slave, surface) { r += `${He} also has several unusual brands: `; } - // If L/R parts of this object match, they will be described in the same phrase. Length is used only to calculate punctuation, so we prepare to skip. + // If L/R parts of this object match, they will be described in the same phrase. Length is used only to calculate punctuation, so we prepare to skip. for (const bodyPart of extraMarks) { if (bodyPart.startsWith("left ")) { let right = "right " + bodyPart.replace("left ", ""); @@ -612,7 +612,7 @@ App.Desc.brand = function(slave, surface) { // matching places and marks // note that the slave.brand object won't have slave.brand["upper armS"] with an S defined, just the left and right, so we just use the left since we know they match. r += `${slave.brand[surface.left]} branded into the flesh of both ${his} ${surface.both}`; - } else if (slave.brand[surface.left] && slave.brand[surface.right]) { + } else if (slave.brand[surface.left] && slave.brand[surface.right]) { // matching places but different marks r += `both ${slave.brand[surface.left]} branded into the flesh of ${his} ${surface.left}, and ${slave.brand[surface.right]} branded into ${his} ${surface.right}`; } else if (slave.brand[surface.left]) { diff --git a/src/js/generateGenetics.js b/src/js/generateGenetics.js index e5772686d4b..516bf72f95e 100644 --- a/src/js/generateGenetics.js +++ b/src/js/generateGenetics.js @@ -698,25 +698,25 @@ window.generateGenetics = (function() { let chance = 0; let fathergenes = 0; let genetarget = 0; - + // Genetics implementation - // Autosomal recessive: For each gene, add up gene level (0, 1, or 2) for both parents; if total level 1 or above, then roll a d16. + // Autosomal recessive: For each gene, add up gene level (0, 1, or 2) for both parents; if total level 1 or above, then roll a d16. // If result is less than 2^(total gene level), child manifests the quirk. // Otherwise, if result is less than 3*2^(total gene level), child is carrier of the quirk. // This precisely duplicates autosomal recessive behavior for cases where both parents manifest, one manifests and one is carrier, or where both are carriers. // If one manifests and one normal, it behaves the same as both carriers instead of having 100% carrier children; result is more interesting this way. // If one carrier and one normal, it gives 1/8th manifesting, 1/4th carrier; small overall chance, more interesting than the realistic 50% carrier. - - // Sex-linked recessive: ??? + + // Sex-linked recessive: ??? // realism would be, looking at hypothetical x-carried gene that by its nature can only affect women // Male carrier, female with condition: 100% of daughters have condition, 100% of sons carriers genetotal 3 // Normal male, female with condition: 100% of daughters are carriers, 100% of sons are carriers genetotal 2 // Carrier male, carrier female: 50% of daughters have condition, 50% carriers; 50% of sons carriers. genetotal 2 // Normal male, carrier female: 50% of daughters carriers, 50% of sons carriers genetotal 1 // Carrier male, normal female: 100% of daughters carriers, sons normal genetotal 1 - + // Sex-linked traits (fertility-affecting, well-hung) left handled by the old method; latter made mirror image to former. - + // fertility if (mother.geneticQuirks.fertility === 2) { if (sex === "XX") { @@ -833,14 +833,14 @@ window.generateGenetics = (function() { // well hung if (father !== 0) { - if (father.geneticQuirks.wellHung === 2) { - if (sex === "XY") { - quirks.wellHung = 2; - } else { - quirks.wellHung = 1; - } - } else if (father.geneticQuirks.wellHung === 1) { - chance = jsRandom(0, 1000); + if (father.geneticQuirks.wellHung === 2) { + if (sex === "XY") { + quirks.wellHung = 2; + } else { + quirks.wellHung = 1; + } + } else if (father.geneticQuirks.wellHung === 1) { + chance = jsRandom(0, 1000); if (mother.geneticQuirks.wellHung >= 1) { if (sex === "XY") { if (chance > 750) { @@ -859,198 +859,198 @@ window.generateGenetics = (function() { // perfect face - if (father !== 0) { - fathergenes = father.geneticQuirks.pFace; + if (father !== 0) { + fathergenes = father.geneticQuirks.pFace; } genetarget = Math.pow(2,mother.geneticQuirks.pFace + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.pFace = 2; - } else if (chance <= 3*genetarget) { - quirks.pFace = 1; + if (chance <= genetarget) { + quirks.pFace = 2; + } else if (chance <= 3*genetarget) { + quirks.pFace = 1; } } // ugly face - if (father !== 0) { - fathergenes = father.geneticQuirks.uFace; + if (father !== 0) { + fathergenes = father.geneticQuirks.uFace; } genetarget = Math.pow(2,mother.geneticQuirks.uFace + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.uFace = 2; - } else if (chance <= 3*genetarget) { - quirks.uFace = 1; + if (chance <= genetarget) { + quirks.uFace = 2; + } else if (chance <= 3*genetarget) { + quirks.uFace = 1; } } // gigantism - if (father !== 0) { - fathergenes = father.geneticQuirks.gigantism; + if (father !== 0) { + fathergenes = father.geneticQuirks.gigantism; } genetarget = Math.pow(2,mother.geneticQuirks.gigantism + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.gigantism = 2; - } else if (chance <= 3*genetarget) { - quirks.gigantism = 1; + if (chance <= genetarget) { + quirks.gigantism = 2; + } else if (chance <= 3*genetarget) { + quirks.gigantism = 1; } } // dwarfism - if (father !== 0) { - fathergenes = father.geneticQuirks.dwarfism; + if (father !== 0) { + fathergenes = father.geneticQuirks.dwarfism; } genetarget = Math.pow(2,mother.geneticQuirks.dwarfism + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.dwarfism = 2; - } else if (chance <= 3*genetarget) { - quirks.dwarfism = 1; + if (chance <= genetarget) { + quirks.dwarfism = 2; + } else if (chance <= 3*genetarget) { + quirks.dwarfism = 1; } } // albinism - if (father !== 0) { - fathergenes = father.geneticQuirks.albinism; + if (father !== 0) { + fathergenes = father.geneticQuirks.albinism; } genetarget = Math.pow(2,mother.geneticQuirks.albinism + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.albinism = 2; - } else if (chance <= 3*genetarget) { - quirks.albinism = 1; + if (chance <= genetarget) { + quirks.albinism = 2; + } else if (chance <= 3*genetarget) { + quirks.albinism = 1; } } // heterochromia - if (father !== 0) { - fathergenes = father.geneticQuirks.heterochromia; + if (father !== 0) { + fathergenes = father.geneticQuirks.heterochromia; } genetarget = Math.pow(2,mother.geneticQuirks.heterochromia + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.heterochromia = 2; - } else if (chance <= 3*genetarget) { - quirks.heterochromia = 1; + if (chance <= genetarget) { + quirks.heterochromia = 2; + } else if (chance <= 3*genetarget) { + quirks.heterochromia = 1; } } - + // rear lipedema - if (father !== 0) { - fathergenes = father.geneticQuirks.rearLipedema; + if (father !== 0) { + fathergenes = father.geneticQuirks.rearLipedema; } genetarget = Math.pow(2,mother.geneticQuirks.rearLipedema + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.rearLipedema = 2; - } else if (chance <= 3*genetarget) { - quirks.rearLipedema = 1; + if (chance <= genetarget) { + quirks.rearLipedema = 2; + } else if (chance <= 3*genetarget) { + quirks.rearLipedema = 1; } } - + // Gigantomastia - if (father !== 0) { - fathergenes = father.geneticQuirks.gigantomastia; + if (father !== 0) { + fathergenes = father.geneticQuirks.gigantomastia; } genetarget = Math.pow(2,mother.geneticQuirks.gigantomastia + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.gigantomastia = 2; - } else if (chance <= 3*genetarget) { - quirks.gigantomastia = 1; + if (chance <= genetarget) { + quirks.gigantomastia = 2; + } else if (chance <= 3*genetarget) { + quirks.gigantomastia = 1; } } - + // Macromastia - if (father !== 0) { - fathergenes = father.geneticQuirks.macromastia; + if (father !== 0) { + fathergenes = father.geneticQuirks.macromastia; } genetarget = Math.pow(2,mother.geneticQuirks.macromastia + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.macromastia = 2; - } else if (chance <= 3*genetarget) { - quirks.macromastia = 1; + if (chance <= genetarget) { + quirks.macromastia = 2; + } else if (chance <= 3*genetarget) { + quirks.macromastia = 1; } } - + // myotonic hypertrophy - if (father !== 0) { - fathergenes = father.geneticQuirks.mGain; + if (father !== 0) { + fathergenes = father.geneticQuirks.mGain; } genetarget = Math.pow(2,mother.geneticQuirks.mGain + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.mGain = 2; - } else if (chance <= 3*genetarget) { - quirks.mGain = 1; + if (chance <= genetarget) { + quirks.mGain = 2; + } else if (chance <= 3*genetarget) { + quirks.mGain = 1; } } // myotonic dystrophy - if (father !== 0) { - fathergenes = father.geneticQuirks.mLoss; + if (father !== 0) { + fathergenes = father.geneticQuirks.mLoss; } genetarget = Math.pow(2,mother.geneticQuirks.mLoss + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.mLoss = 2; - } else if (chance <= 3*genetarget) { - quirks.mLoss = 1; + if (chance <= genetarget) { + quirks.mLoss = 2; + } else if (chance <= 3*genetarget) { + quirks.mLoss = 1; } } // hyperleptinemia - if (father !== 0) { - fathergenes = father.geneticQuirks.wGain; + if (father !== 0) { + fathergenes = father.geneticQuirks.wGain; } genetarget = Math.pow(2,mother.geneticQuirks.wGain + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.wGain = 2; - } else if (chance <= 3*genetarget) { - quirks.wGain = 1; + if (chance <= genetarget) { + quirks.wGain = 2; + } else if (chance <= 3*genetarget) { + quirks.wGain = 1; } } // hypoleptinemia - if (father !== 0) { - fathergenes = father.geneticQuirks.wLoss; + if (father !== 0) { + fathergenes = father.geneticQuirks.wLoss; } genetarget = Math.pow(2,mother.geneticQuirks.wLoss + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.wLoss = 2; - } else if (chance <= 3*genetarget) { - quirks.wLoss = 1; + if (chance <= genetarget) { + quirks.wLoss = 2; + } else if (chance <= 3*genetarget) { + quirks.wLoss = 1; } } // androgyny - if (father !== 0) { - fathergenes = father.geneticQuirks.androgyny; + if (father !== 0) { + fathergenes = father.geneticQuirks.androgyny; } genetarget = Math.pow(2,mother.geneticQuirks.androgyny + fathergenes); if (genetarget >= 2) { chance = jsRandom(1,16); - if (chance <= genetarget) { - quirks.androgyny = 2; - } else if (chance <= 3*genetarget) { - quirks.androgyny = 1; + if (chance <= genetarget) { + quirks.androgyny = 2; + } else if (chance <= 3*genetarget) { + quirks.androgyny = 1; } } diff --git a/src/js/playerJS.js b/src/js/playerJS.js index 29f56cdcb5a..05268730a65 100644 --- a/src/js/playerJS.js +++ b/src/js/playerJS.js @@ -240,7 +240,7 @@ window.PCTitle = function PCTitle() { } else if (V.arcologies[0].FSIntellectualDependency >= V.FSLockinLevel * 0.3) { titles.push("Lover of Bimbos"); } - + if (V.arcologies[0].FSSlaveProfessionalism >= V.FSLockinLevel * 0.9) { titles.push("the Mastermind"); } else if (V.arcologies[0].FSSlaveProfessionalism >= V.FSLockinLevel * 0.6) { @@ -248,7 +248,7 @@ window.PCTitle = function PCTitle() { } else if (V.arcologies[0].FSSlaveProfessionalism >= V.FSLockinLevel * 0.3) { titles.push("the Smart"); } - + if (V.arcologies[0].FSBodyPurist >= V.FSLockinLevel * 0.9) { titles.push("the Purifier of the Breasts"); } else if (V.arcologies[0].FSBodyPurist >= V.FSLockinLevel * 0.6) { @@ -280,7 +280,7 @@ window.PCTitle = function PCTitle() { } else if (V.arcologies[0].FSStatuesqueGlorification >= V.FSLockinLevel * 0.3) { titles.push("height fetishist"); } - + if (V.arcologies[0].FSPetiteAdmiration >= V.FSLockinLevel * 0.9) { titles.push("Supporter of the Small"); } else if (V.arcologies[0].FSPetiteAdmiration >= V.FSLockinLevel * 0.6) { @@ -288,7 +288,7 @@ window.PCTitle = function PCTitle() { } else if (V.arcologies[0].FSPetiteAdmiration >= V.FSLockinLevel * 0.3) { titles.push("height fetishist"); } - + if (V.arcologies[0].FSPastoralist >= V.FSLockinLevel * 0.9) { if (V.PC.title === 1) { titles.push("the Master of Stock"); diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw index a4564a350db..1abfd03282d 100644 --- a/src/npc/databases/dSlavesDatabase.tw +++ b/src/npc/databases/dSlavesDatabase.tw @@ -289,7 +289,7 @@ /*Added origin, increased weight, pierced ears, added customdesc -BoneyM*/ <<set _HS = App.Entity.SlaveState.makeSkeleton()>> -<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "$He was forced into slavery and rather brutally broken in.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["right buttock"] = "Cum slut", _HS.custom.tattoo = "'bitch whore' is tattooed on $his inner left thigh.">> +<<set _HS.slaveName = "Klara", _HS.birthName = "Klara", _HS.origin = "$He was forced into slavery and rather brutally broken in.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.ovaryAge = 21, _HS.health = 20, _HS.devotion = -75, _HS.height = 175, _HS.race = "white", _HS.eyeColor = "blue", _HS.skin = "fair", _HS.hStyle = "long and braided", _HS.boobs = 800, _HS.butt = 4, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.anus = 2, _HS.ovaries = 1, _HS.skill.vaginal = 100, _HS.skill.oral = 100, _HS.skill.anal = 100, _HS.skill.whoring = 35, _HS.skill.entertainment = 35, _HS.intelligence = -30, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.brand["right buttock"] = "Cum slut", _HS.custom.tattoo = "'bitch whore' is tattooed on $his inner left thigh.">> <<set $heroSlaves.push(_HS)>> /*Fixed typo in customdesc, increased whore and entertainskill, changed eye color -BoneyM*/ diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw index bafcd5bb7b0..93602326e23 100644 --- a/src/pregmod/killSlave.tw +++ b/src/pregmod/killSlave.tw @@ -209,7 +209,7 @@ you <<if canHear($activeSlave)>>quietly <</if>>reach behind your desk and pull o <<set $slaves[_ss].devotion -= $slaves[_ss].relationship*10>> <<set $display = 1>> <</if>> - <<elseif $activeSlave.relationship == -3>> + <<elseif $activeSlave.relationship == -3>> Killing one of your slave wives is @@.red;socially unacceptable.@@ In addition, your other devoted slaves are @@.gold;worried@@ that you may not respect their status. <<run clearSummaryCache()>> <br><br> diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index 009fd347ba3..8e18b7d997d 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -1669,7 +1669,7 @@ <br> Frantically the girl twists to face the third woman, with a crown of red hair and freckles. "You are Kate, yes? Please, tell them I have done nothing." Kate looks up for a moment, saying nothing. "Your men, they don't even look at us. When they come to the village, they only have eyes for..." <br> In a flash, Kate is choking her. "How DARE you. How DARE you insinuate that my husband is some PERVERT. He is a doctor, and can heal man or beast. I trust you can at least respect a 'medicine man'?" <br> Annie punches one breast, while Dakota slowly twists the nipple on the other one. Cloud shrinks into silence under the assault. - + <br><br> "You know what I am thinking, girls," Dakota muses. "I am thinking this might be an honest mistake." The heads of the other two snap around. "Hear me out. I am wondering if she honestly thinks she's not a whore, simply because she doesn't look like one." <br> The others pause for a moment, then start to laugh. "Ahh, I see where this is going. We could teach her. Yes, let's 'help her out'." <br> Kate pulls out a large makeup kit. "Ordered from Sears and Roebuck by my husband, as a 'makeup' present for his dalliances. For all the times I used it I never got his attention. But you know, maybe I just never used <i>enough</i>." @@ -1689,13 +1689,13 @@ <br> The girl squirms, but Dakota and Annie dive in with big sweeping strokes and large brushes. "Leave her bush and asshole clean for customers" giggles Dakota. "As clean as a whore's holes can be," corrects Annie. <br> They step back to inspect their work. "Looks like a whore to me," Kate says. <br> The girl is clearly exhausted and struggling to stay on her feet. Sweat is rolling down her face, and her makeup is already beginning to run around her eyes. Her legs are barn red from her hips to the tip of her toes, and a small puddle of paint is forming under her feet and between her toes. Sweat is pouring off her naked body. - + <br><br> "You know." Annie frowns. "She still really doesn't look like a whore to me. Shouldn't she be showing her skills? Spreading her legs?" <br> In a moment they have a barrel set up on end, somewhat behind her and also partly under her. While it is too low for the girl to sit on, the smooth handle of a broken pitchfork is nailed to the side of the barrel and sticking up above it. "Here we go." Annie and Dakota each lift a leg, while Kate crouches down and adjusts the height of the barrel with a few shims, then guides the shaft towards the Indian's crotch. She brushes it slowly against her ass, tickling her hair. Little Cloud freezes, petrified. "Here, then?" Kate asks with a sinister smile, as she slides it forward. <br> "Please no, I'm a v-" <br> Both women drop her legs at the same time, and the girl screams as she tries to catch herself. The intruder does not make it far into her vagina as long as she stays on tiptoe, but she clearly can't lift herself high enough to get off the makeshift dildo entirely. And the noose around her neck keeps her from moving in any lateral direction. <br> "Ahhhh hahaha," the women laugh. "A virgin? YOU? After all you all did to steal our husbands, you harlot?" - <br> Annie bursts out laughing. "Sorry, she still doesn't look like a whore to me. What a failure as a woman. I can't imagine any man falling for such a sorry sight. But hearing her beg? With those red legs? She's more like one of my pathetic chickens. Cluck cluck!" She laughs hysterically. + <br> Annie bursts out laughing. "Sorry, she still doesn't look like a whore to me. What a failure as a woman. I can't imagine any man falling for such a sorry sight. But hearing her beg? With those red legs? She's more like one of my pathetic chickens. Cluck cluck!" She laughs hysterically. <br> "A chicken, hmm?" Dakota ponders for a moment. "Annie, what if we..." she whispers in her ear. <br> Another quick pass of the camera and everyone is back in the middle of town. <br> "Oh, I am going to enjoy this, bitch," Dakota says. She lifts a brush from a new bucket that seems to shimmer with a slight haze. "I fucking hate this stuff. It should be HIS job. Hurts when you get it on your skin until it cools, and it <i>never</i> comes off. Have you ever had pitch on your skin, bitch? Have you ever had it in your <i>hair</i>?" @@ -1704,7 +1704,7 @@ <br> "Let's see her steal the roosters NOW!" <br> The girl writhes in heat and discomfort and twists for some time, begging for freedom. Finally, she coughs and gasps "Please. At least, give me something to drink." <br> "Well shucks, ladies. If we haven't forgotten our hospitality. After all, we must be on our manners even if she ain't." "Who <i>hasn't</i> forgotten to water chickens?" "Can't have her messing their watering dish though." - <br> All three turn to the girl. "Well as it happens we have just the thing for you. Steerswood Tea!" Kate holds up a very large skin apparently full of liquid from the way it sloshes around. Perhaps <<if $showInches == 2>>several liters<<else>>a gallon<</if>> or more? It's an unusual shape. Then she turns it a little so everyone can see the nipple. It's a buttplug, about <<if $showInches == 2>>3 inches<<else>>7 centimeters<</if>> in diameter it seems, with a short but stiff rubber hose coming from the tip. + <br> All three turn to the girl. "Well as it happens we have just the thing for you. Steerswood Tea!" Kate holds up a very large skin apparently full of liquid from the way it sloshes around. Perhaps <<if $showInches == 2>>several liters<<else>>a gallon<</if>> or more? It's an unusual shape. Then she turns it a little so everyone can see the nipple. It's a buttplug, about <<if $showInches == 2>>3 inches<<else>>7 centimeters<</if>> in diameter it seems, with a short but stiff rubber hose coming from the tip. <br> The girl is stirred to new energy, and everyone is treated to the comical sight of the chicken choking and flopping around. In the end though, she has nowhere to go and Dakota plops the skin down on the barrel. Katie adjusts the wedges at the bottom of the barrel again, while Annie tends to the rope. <br> "Steerswood tea," Katie explains, "is a special drink we have made just for you. Plenty to drink, which you wanted, yes?" <br> "Yes, but..." @@ -1739,7 +1739,7 @@ <br> "It's fine." Kate holds up a collection of rubber tubes. "My Doc has too many of these anyway. I always did love helping him with the enemas." She soon has it attached near the base of the buttplug, and then running <<if $seePee != 0>> - a short distance before it splits. "This much fluid in her bowels, the bladder fills fast. You have to let it drain." She explains as she grabs one end. "Ahh." + a short distance before it splits. "This much fluid in her bowels, the bladder fills fast. You have to let it drain." She explains as she grabs one end. "Ahh." <br> "Normally we use a smaller one for this, but, well, whores love this sort of thing." She coats the tip in pitch as well, and then shoves the tube into the Indian's urethra. "Oh, she likes that!" Annie exclaims, as Little Cloud bounces and writhes around for just a moment before she realizes that her bladder is now caught in the same terrible tides as her ass. <<else>> about an arm's span. @@ -1748,19 +1748,19 @@ <br> "Then we just run this one up heeere" Katie waves the tip of the other tube in her face. Cloud shudders but keeps her mouth shut. "Oh, but you are so <i>thirsty</i>, right? Well, we had to do this for a man that damn near died to a mountain lion. Slept for three weeks before he started healing." Kate coats the tip in pitch again and then shoves it far up Cloud's nose. Cloud frantically dances at the discomfort as some of the pressure below is released, but freezes a moment later as an <i>extremely</i> unpleasant flavor arrives in her throat. <br>"Up to her now where she wants it," Kate explains. "It's important to give a patient choices, don't you think?" - + <br><br> At this point, her stomach is so distended that the black pitch is showing around individual feathers. Annie and Dakota lock eyes and giggle, while Kate moves to where the noose is tied. <br> "Ready?" They ask the girl. She can barely open her eyes and doesn't move her head. "Ok then, here we go!" Kate loosens the rope just as Annie and Dakota each lift a leg. With nothing else to support her, the girl's full weight comes to bear on the plug, which finally smears its tarry way home with a "pop." The Indian girl shudders with an impossible... orgasm? and screams. - + <br><br> Annie releases the noose from the scaffold and shoves her over on her back. "You LIKED that? You disgust me." She is powerless to move, and lays there groaning and drooling beneath the weight of her stomach. <br> "Better finish your drink, little chicken." Dakota wrings out the skin, and the liquid has nowhere to go but in. She neatly wraps rawhide around the bag to make sure the inflation can't reverse, and then covers the whole thing with pitch. It will not be coming undone soon. - <br> "You know, her cunt looks empty now. We should give our little hen something to bring back to her chicks." Dakota suggests. - <br> "I have just the thing!" Annie lifts up a third bucket with a trowel that appears to contain a selection of <<if $seeBestiality == 0>><i>nuts and seeds</i><<else>>nightcrawlers<</if>>. "Perfect for growing birds." + <br> "You know, her cunt looks empty now. We should give our little hen something to bring back to her chicks." Dakota suggests. + <br> "I have just the thing!" Annie lifts up a third bucket with a trowel that appears to contain a selection of <<if $seeBestiality == 0>><i>nuts and seeds</i><<else>>nightcrawlers<</if>>. "Perfect for growing birds." <br> She carefully parts the labia with the muddy trowel, then checks to see how deep it can go. "There we go!" Annie proclaims as she slides it to one side and begins tipping in <<if $seeBestiality == 0>><i>birdseed</i><<else>>worm after worm<</if>>. When she seems to run out of room, she begins to push them in by hand. After the bucket is low enough, she carefully pulls out her trowel and Dakota seals the slit shut with pitch. Katie recovers Cloud's loin cloth, which they fix as tightly as they can, and secure the knots again with pitch. There is no room at all to push anything out, and she cannot wriggle her loincloth past her hips. Her hands remain tightly bound behind her back, and her enormous stomach makes anything agility related impossible. <br> "You know, I don't think she could see us on the other side of the 'mountain'." Annie aims a kick at the stomach and then tips the rest of the bucket on Cloud's face. - <br> "<<if $seeBestiality == 0>><i>Shunflower sheedsh</i><<else>>Bugsh<</if>>! No! I hate <<if $seeBestiality == 0>><i>shunflower sheedsh</i><<else>>bugsh<</if>>!" Cloud somehow finds strength to squirm frantically and scream, rocking her arms back and forth trying to free them. She freezes again, suddenly aware of the wriggling in her vagina, then thrashes and screams even more. + <br> "<<if $seeBestiality == 0>><i>Shunflower sheedsh</i><<else>>Bugsh<</if>>! No! I hate <<if $seeBestiality == 0>><i>shunflower sheedsh</i><<else>>bugsh<</if>>!" Cloud somehow finds strength to squirm frantically and scream, rocking her arms back and forth trying to free them. She freezes again, suddenly aware of the wriggling in her vagina, then thrashes and screams even more. <br> "Shut UP already!" Annie is irate. "I am done hearing you whine about what you like and what you don't like. We gave you drink, we gave you food. Shut. Your. Beak!" Annie rams the round handle of the trowel deep into Cloud's mouth, then ties the middle of the trowel tightly with rawhide before fastening it behind her head. She bends the metal to point down a bit. "See? Silence. And a beak!" <br> "One lasssst thing, though." Kate holds up a few boards. "She doesn't quite have chicken feet!" Using the noose the three haul Cloud's bulk upright, and place her feet on the boards. Careful not to pierce the skin or smash the toes, Kate uses U-shaped nails to firmly trap the girl's toes to the board, giving her comically large "sandals." Another coat of thick red paint on the boards, nails, and legs, and her new feet are finished. @@ -1774,10 +1774,10 @@ <br> "May your bird god help you if that happens." Katie chimes in. <br> "Understand?" The three whip her taut stomach like a tom-tom. <br> "Arghhhh! Yershhhhh!" - <br> Dakota leans in. "Now cluck! Cluck like a chicken!" + <br> Dakota leans in. "Now cluck! Cluck like a chicken!" <br> Cloud groans deeply, then tries to make a clucking sound around the trowel. <br> "Louder!" Dakota beats the drum again. - <br> "Uck! Uck!" + <br> "Uck! Uck!" <br> "Now RUN, little chicken!" <br> Little Cloud frantically begins to flop and cluck her way out of town into the sunset as fast as she can, chased by the three hysterical women. <</if>> diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw index 478bb3aa6e0..6050573779d 100644 --- a/src/uncategorized/changeLanguage.tw +++ b/src/uncategorized/changeLanguage.tw @@ -4,7 +4,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> <<set $revivalistLanguage = 0>> diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw index 243dbbd5ff5..1de27cccedc 100644 --- a/src/uncategorized/dairy.tw +++ b/src/uncategorized/dairy.tw @@ -251,7 +251,7 @@ <<case "Intellectual Dependency">> is simple and fun. Getting situated for milking is easy enough for even the dumbest cow to figure out and there are all sorts of activities to keep the cows amused between milkings. <<case "Slave Professionalism">> - is functional and clean. A wide selection of informative documentaries and books are available for cows to keep their minds sharp while the milker does its business. + is functional and clean. A wide selection of informative documentaries and books are available for cows to keep their minds sharp while the milker does its business. <<case "Petite Admiration">> is comfortable and well-kept. While designed for miniature cows, accommodations for large udders allow even the lankiest of cattle to make use of the machinery. <<case "Statuesque Glorification">> diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw index 2f1c6932d9f..77005986875 100644 --- a/src/uncategorized/neighborInteract.tw +++ b/src/uncategorized/neighborInteract.tw @@ -25,7 +25,7 @@ <<if $sideBarOptions.compact > 0>> <<set $nextLink = "Manage Arcology">> <<else>> - <<set $nextLink = "Main">> + <<set $nextLink = "Main">> <</if>> <<set $nextButton = "Back">> You have <<print $arcologies.length-1>> neighbors. <br><br> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index b5670a6cb76..df94927a775 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -192,7 +192,7 @@ <<set $slaves[_i].armsTat = 0, $slaves[_i].nails = 0, $slaves[_i].armAccessory = "none">> <</if>> <<if $slaves[_i].missingLegs == 3 && $slaves[_i].amp == 1>> - <<set $slaves[_i].heels = 0, $slaves[_i].shoes = "none", $slaves[_i].legAccessory = "none", $slaves[_i].legsTat = 0, $slaves[_i].heightImplant = 0>> + <<set $slaves[_i].heels = 0, $slaves[_i].shoes = "none", $slaves[_i].legAccessory = "none", $slaves[_i].legsTat = 0, $slaves[_i].heightImplant = 0>> <</if>> /* irregular leptin production weight gain/loss setter */ <<if $slaves[_i].geneticQuirks.wGain == 2 && $slaves[_i].geneticQuirks.wLoss == 2>> diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw index 3beddb6e67c..ed840ffa9da 100644 --- a/src/uncategorized/randomNonindividualEvent.tw +++ b/src/uncategorized/randomNonindividualEvent.tw @@ -706,7 +706,7 @@ <</if>> <</if>> - + <<if $arcologyUpgrade.drones == 1>> <<set _recruitEvents.push("RE malefactor")>> <<set $malefactor = ["addict", "whore"]>> diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw index 68da75ad134..e29f67b733e 100644 --- a/src/uncategorized/saHormoneEffects.tw +++ b/src/uncategorized/saHormoneEffects.tw @@ -554,7 +554,7 @@ <<if ($slaves[$i].geneMods.NCS == 0)>> <<if $slaves[$i].faceImplant < 5>> - <<if $slaves[$i].geneticQuirks.androgyny != 2>> + <<if $slaves[$i].geneticQuirks.androgyny != 2>> <<if ($slaves[$i].faceShape == "androgynous")>> Hormonal effects cause @@.orange;$his face to harden into masculinity.@@ <<set $slaves[$i].faceShape = "masculine">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 7c06d1f96c2..29de5c7cf03 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -35,7 +35,7 @@ <<case "get treatment in the clinic" "be the Nurse">> <<set $returnTo = "Clinic">> <<case "live with your Head Girl">> - <<set $returnTo = "Head Girl Suite">> + <<set $returnTo = "Head Girl Suite">> <</switch>> <</if>> @@ -199,14 +199,14 @@ <<else>> | //$dairyNameCaps is not producing enough cum to pump through the pipes// <</if>> - <</if>> + <</if>> <<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>> + <</if>> <</if>> <<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">> diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw index 6b792b21a35..14e1f0e2339 100644 --- a/src/uncategorized/universalRules.tw +++ b/src/uncategorized/universalRules.tw @@ -70,7 +70,7 @@ Slave requests for growth hormones are ''Branding for slaves'' <br> -Choose an official brand. Any slave marked with this brand will be connected to your reputation, and will receive a beauty boost or penalty depending on how high or low that reputation is. +Choose an official brand. Any slave marked with this brand will be connected to your reputation, and will receive a beauty boost or penalty depending on how high or low that reputation is. <br> Use ''$brandDesign.official'' or choose another brand: [[Your slaving emblem|Universal Rules][$brandDesign.official = "your personal symbol"]] -- GitLab