diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index c37dbb159f37bedf8819f6da8b92fd9ed31fa8c7..281c9850b559d5744c074836f018ac4a2829e045 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -1,5 +1,16 @@ Pregmod +0.10.7.1-1.1.x + +11/27/2018 + + 0 + -fixes + -more SF tweaking + -major changes to population tracking + tourism + -chaste release rule added + -added gapped teeth + 0.10.7.1-1.0.x 11/26/2018 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 61837192bef950741d8580c07e66c1d9c572ee02..a1c79b17d2c3bef791752da502d2a203a98b1208 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -37178,7 +37178,11 @@ window.Beauty = (function() { beauty -= 3; break; case "gapped": - beauty -= 1; + if (slave.faceShape == "cute") { + beauty += 1; + } else { + beauty -= 1; + } break; case "braces": case "cosmetic braces": diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw index e8dbcbe00b86fff78913432be58769b9aeeafe7d..881644c598df9fb64b02b81efceeec0ea5ba47d4 100644 --- a/src/SecExp/secExpSmilingMan.tw +++ b/src/SecExp/secExpSmilingMan.tw @@ -249,10 +249,12 @@ <<set $activeSlave.faceShape = "cute">> <<set $activeSlave.boobShape = "perky">> <<set $activeSlave.nipples = "cute">> + <<set $activeSlave.boobs = 450>> <<set $activeSlave.vagina = 0>> <<set $activeSlave.ovaries = 1>> <<else>> <<include "Generate XY Slave">> + <<set $activeSlave.boobs = 250>> <<set $activeSlave.faceShape = "androgynous">> <<set $activeSlave.boobShape = "perky">> <</if>> @@ -268,9 +270,6 @@ <<set $activeSlave.face = random(10,50)>> <<set $activeSlave.health = 70>> <<set $activeSlave.teeth = "normal">> - <<set $activeSlave.faceShape = "cute">> - <<set $activeSlave.boobShape = "perky">> - <<set $activeSlave.boobs = 450>> <<set $activeSlave.nipples = "cute">> <<set $activeSlave.areolae = 0>> <<set $activeSlave.anus = 0>> diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw index 5eb9d5fa9a20b456575071b9543d2fe4ef5904a1..fcfd8526f33ff436135bd429c02e1526e38bfbc3 100644 --- a/src/cheats/mod_EditChildCheatNew.tw +++ b/src/cheats/mod_EditChildCheatNew.tw @@ -1335,6 +1335,7 @@ <</if>> <<radiobutton "$tempSlave.teeth" "pointy">> Pointy <<radiobutton "$tempSlave.teeth" "crooked">> Crooked + <<radiobutton "$tempSlave.teeth" "gapped">> Gapped <<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces <<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces <<radiobutton "$tempSlave.teeth" "removable">> Removable diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index bf0d33ac8e559a90f5eda0231809cab153d34b9a..a26d979325a4d913990dd8e7fab7a8fca076e006 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -492,6 +492,7 @@ Unskilled. <</if>> <<radiobutton "$tempSlave.teeth" "pointy">> Pointy <<radiobutton "$tempSlave.teeth" "crooked">> Crooked +<<radiobutton "$tempSlave.teeth" "gapped">> Gapped <<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces <<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces <<radiobutton "$tempSlave.teeth" "removable">> Removable diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 9d660ac0d4db9461692b4116785f3731c1b3e30a..95fe116efb9828d5c6491ea30803f0a42b3f5cd1 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -1928,6 +1928,7 @@ <</if>> <<radiobutton "$tempSlave.teeth" "pointy">> Pointy <<radiobutton "$tempSlave.teeth" "crooked">> Crooked + <<radiobutton "$tempSlave.teeth" "gapped">> Gapped <<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces <<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces <<radiobutton "$tempSlave.teeth" "removable">> Removable diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index cf139d5d63b1420c15e730beb591d81fc38499ca..664a7bb55e73121f6a146bc4159e28c52a58d7ab 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -27,6 +27,7 @@ You may review your settings before clicking "Continue" to begin. __''World Settings''__ <br>Economic climate: +<<set $localEcon = $economy>> <<if $economy > 125>> ''not truly dire. Not yet.'' //Very Easy// <br>[[Harder|Intro Summary][$economy = 125]] @@ -43,7 +44,7 @@ __''World Settings''__ ''this is the last dance.'' //Very Hard// <br>[[Easier|Intro Summary][$economy = 80]] <</if>> -<<if $difficultySwitch == 1>><<set $econAdvantage = -2, $localEcon = $economy>><</if>> +<<if $difficultySwitch == 1>><<set $econAdvantage = -2>><</if>> <br>Economic forecast: <<if $difficultySwitch == 0>> ''no change.'' //Vanilla// diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw index 42df6073ea9d380b99241aca1c7a28205ad085ad..7ff010c8b27fbfa770446baeceafd4efeca36c20 100644 --- a/src/gui/mainMenu/AlphaDisclaimer.tw +++ b/src/gui/mainMenu/AlphaDisclaimer.tw @@ -1,7 +1,7 @@ :: Alpha disclaimer <<set $ui = "start">>\ -//version $ver build $releaseID// +//version $ver mod version $pmodVer build $releaseID// @@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@ @@.green;//Mod: extra preg content and other crap//@@ diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index b31f740bfcb4ccbcbb249d0063935e45035bb4c9..36a1cc9ab68dc0d8a00cf185d2b794c975514aa5 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with thi <<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">> <<unset $releaseID>> -<<set $ver = "0.10.7", $releaseID = 1032>> -<<if ndef $releaseID>><<set $releaseID = 1032>><</if>> +<<set $ver = "0.10.7", $pmodVer = "1.1.X", $releaseID = 1033>> +<<if ndef $pmodVer>><<set $pmodVer = "1.1.X">><</if>> /* This needs to be broken down into individual files that can be added to StoryInit instead. */ @@ -306,7 +306,6 @@ You should have received a copy of the GNU General Public License along with thi /* Pregmod specific */ <<set $economy = 100>> - <<set $econRate = 2>> <<set $antiWeatherFreeze = 0>> <<set $difficultySwitch = 0>> <<set $econWeatherDamage = 0>> diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw index 554fa42f449715da965a66529db29b2d6af6d825..df902983bc928aa3c9837b45f13c3c5dc603eeb0 100644 --- a/src/js/generateNewSlaveJS.tw +++ b/src/js/generateNewSlaveJS.tw @@ -925,7 +925,7 @@ window.GenerateNewSlave = (function(){ } if (jsRandom(0, femaleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) { - slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped" + slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]); } if (slave.physicalAge < 6) { @@ -946,7 +946,7 @@ window.GenerateNewSlave = (function(){ } if (jsRandom(0, maleCrookedTeethGen) <= 15 && slave.physicalAge >= 12) { - slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked"]); // , "gapped" + slave.teeth = jsEither(["crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "crooked", "gapped"]); } if (slave.physicalAge < 6) { diff --git a/src/js/slaveCostJS.tw b/src/js/slaveCostJS.tw index 0089e34745a4ecba2a63b3336d0fc4d4ed82d80e..dee86baf67e76a848fb2bf70ff86084038799e7f 100644 --- a/src/js/slaveCostJS.tw +++ b/src/js/slaveCostJS.tw @@ -119,7 +119,11 @@ window.Beauty = (function() { beauty -= 3; break; case "gapped": - beauty -= 1; + if (slave.faceShape == "cute") { + beauty += 1; + } else { + beauty -= 1; + } break; case "braces": case "cosmetic braces": diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index d97bee573442fe7190bf3fa1c4e5396413ca33b2..db359a96d01eb6323b305326f3f47b7c149dea44 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -771,6 +771,7 @@ Her nationality is $activeSlave.nationality. ''Teeth:'' <span id="teeth"> <<if $activeSlave.teeth == "crooked">>Crooked. +<<elseif $activeSlave.teeth == "gapped">>Gapped. <<elseif $activeSlave.teeth == "straightening braces">>Braces. <<elseif $activeSlave.teeth == "baby">>Baby. <<elseif $activeSlave.teeth == "mixed">>Mixed. @@ -786,6 +787,7 @@ Her nationality is $activeSlave.nationality. <<link "Baby">><<set $activeSlave.teeth = "baby">><<replace "#teeth">>Baby.<</replace>><<StartingGirlsCost>><</link>> | <</if>> <<link "Crooked">><<set $activeSlave.teeth = "crooked">><<replace "#teeth">>Crooked.<</replace>><<StartingGirlsCost>><</link>> | +<<link "Gapped">><<set $activeSlave.teeth = "gapped">><<replace "#teeth">>Gapped.<</replace>><<StartingGirlsCost>><</link>> | <<link "Braces">><<set $activeSlave.teeth = "straightening braces">><<replace "#teeth">>Braces.<</replace>><<StartingGirlsCost>><</link>> <br>''Vision:'' diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 158e5492f5bcaf50c38e87c85b367bcd7b81c776..a51f5d76ba6b411b10c24dbab00d7a8077daae65 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -63,7 +63,7 @@ <</for>> <</if>> <<set _adjust = _babyDaddy.slavesFathered++>> - <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>> + <<set adjustFatherProperty(_babyDaddy, "slavesFathered", _adjust)>> <<else>> <<set _others++>> <<set _fathers.push("some man's")>> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index be75a3969eec4491a842010d148263c83f7b6892..abacfbfe92e9beac87df175a741aa00c5773645e 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -444,6 +444,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu Reproduction management systems are offline; $he will undergo normal puberty. <</if>> <</if>> + <br>Rename $him: <<textbox "_tempName" _tempName >> [[Apply | incubator][$tanks[$i].slaveName = _tempName]] // Given name only // <<if $cheatMode == 1>> <br>''Cheatmode:'' <<link "Retrieve immediately">> diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw index 2b223974a781e7d9857894056d224b2728863a49..28186b76929fddeec391cdddd0c641c38618689d 100644 --- a/src/pregmod/manageEconomy.tw +++ b/src/pregmod/manageEconomy.tw @@ -8,9 +8,9 @@ __Economy__<br> </span> <<if ($cheatMode) && ($cheatModeM)>> <<set _Teconomy = $economy>> - <<textbox "$economy" $economy>> + <<textbox "_Teconomy" _Teconomy>> <<link "Apply">> - <<set $economy = Math.trunc(Number($economy)) || _Teconomy, $cheater = 1>> + <<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>> <<replace "#economy">> @@.yellowgreen;Global Economy@@ | <<print $economy>> @@ -25,9 +25,9 @@ __Economy__<br> </span> <<if ($cheatMode) && ($cheatModeM)>> <<set _TlocalEcon = $localEcon>> - <<textbox "$localEcon" $localEcon>> + <<textbox "_TlocalEcon" _TlocalEcon>> <<link "Apply">> - <<set $localEcon = Math.trunc(Number($localEcon)) || _TlocalEcon, $cheater = 1>> + <<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>> <<replace "#localEcon">> @@.yellowgreen;Local Economy@@ | <<print $localEcon>> @@ -91,9 +91,9 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> <<elseif $MCRent > 25>> //Average// | [[Increase|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]] | [[Decrease|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]] <<elseif $MCRent > 0>> - //Low// | [[Increase|Manage Economy][$MCRent = 20, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]] + //Low// | [[Increase|Manage Economy][$MCRent = 50, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]] <<else>> - //Free// | [[Increase|Manage Economy][$LCRent = 10, $rentEffectL = 1.04]] + //Free// | [[Increase|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]] <</if>> <br>Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent)>>@@ <<if $UCRent > 270>> @@ -167,9 +167,9 @@ Slave demand is | <<print $menialDemandFactor>> </span> <<set _TmenialDemandFactor = $menialDemandFactor>> - <<textbox "$menialDemandFactor" $menialDemandFactor>> + <<textbox "_TmenialDemandFactor" _TmenialDemandFactor>> <<link "Apply">> - <<set $menialDemandFactor = Math.clamp(Math.trunc(Number($menialDemandFactor)),-50000,50000) || _TmenialDemandFactor, $cheater = 1>> + <<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>> <<replace "#menialDemandFactor">> @@.yellowgreen; Slave Demand@@ | <<print $menialDemandFactor>> @@ -207,9 +207,9 @@ Slave supply is | <<print $menialSupplyFactor>> </span> <<set _TmenialSupplyFactor = $menialSupplyFactor>> - <<textbox "$menialSupplyFactor" $menialSupplyFactor>> + <<textbox "_TmenialSupplyFactor" _TmenialSupplyFactor>> <<link "Apply">> - <<set $menialSupplyFactor = Math.clamp(Math.trunc(Number($menialSupplyFactor)),-50000,50000) || _TmenialSupplyFactor, $cheater = 1>> + <<set $menialSupplyFactor = Math.clamp(Math.trunc(Number(_TmenialSupplyFactor)),-50000,50000) || $menialSupplyFactor, $cheater = 1>> <<replace "#menialSupplyFactor">> @@.yellowgreen; Slave Supply@@ | <<print $menialSupplyFactor>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 3dcea780f014834686fefbf4dcfd51e6f8a9f484..de2bec8f2ed23898707212fee2f6dc45c87a13b3 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -317,7 +317,7 @@ <<set _babyDaddy = findFather($slaves[$i].curBabies[_cb].fatherID)>> <<if def _babyDaddy>> <<set _adjust = _babyDaddy.slavesFathered++>> - <<set adjustFatherProperty(_babyDaddy, slavesFathered, _adjust)>> + <<set adjustFatherProperty(_babyDaddy, "slavesFathered", _adjust)>> <</if>> <</if>> <</for>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 0f3ef4793e017efb58670e7d45986d150c86c4a2..419bac198a9ab159a9bc4ed6c5aa5d78d57d9131 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -12691,6 +12691,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t $He runs $his tongue over her frightening teeth carefully, and then opens her jaws wide, getting ready to keep her fangs well clear of your shaft. <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> $He runs $his tongue over her braces, and then opens wide, mindful of keeping her orthodontia clear of your shaft. + <<elseif ($activeSlave.teeth == "gapped")>> + $He runs $his tongue across the gap in $his front teeth and opens wide. <</if>> $He takes you into $his mouth without hesitation, and keeps $his eyes closed. $He visibly concentrates all her attention on your dick, ignoring the breasts that are starting to bounce right over her head as you begin rocking your hips with enjoyment. <br><br> @@ -16334,6 +16336,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t You can feel the extreme care $he has to take to keep her sharklike teeth clear of you. <<elseif $activeSlave.lips > 40>> $His huge lips are soft and pillowy against you. + <<elseif $activeSlave.teeth == "gapped">> + You can feel the slight hesitations as $he takes care to not pinch you between $his front teeth. <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> You can feel the slight hesitations as $he takes care to keep her braces off you. <</if>> @@ -19429,6 +19433,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you still feel the extreme care $he has to take to keep her sharklike teeth clear of you. <<elseif $activeSlave.lips > 40>> $His huge lips are soft and pillowy against you. + <<elseif $activeSlave.teeth == "gapped">> + Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as $he takes care to not pinch you between $his front teeth. <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> Although most of your attention is focused on the intriguing drama unfolding on your wallscreen, you can feel the slight hesitations as $he takes care to keep her braces off you. <</if>> @@ -19541,6 +19547,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t $He quickly pulls her removable teeth out, setting them aside as $he looks up at your <<if $PC.dick == 0>>phallus<<else>>cock<</if>>. <<elseif ($activeSlave.teeth == "pointy")>> $He opens $his mouth wide, revealing her sharp fangs even as $he reminds $himself diligently to not let her sharp teeth scrape against your shaft. + <<elseif $activeSlave.teeth == "gapped">> + $He opens $his mouth wide, revealing the gap between $his front teeth. <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> $He opens $his mouth wide, revealing a mouthful of braces even as $he reminds $himself diligently to not let her orthodontia scrape against your shaft. <</if>> @@ -19947,6 +19955,8 @@ You tell her kindly that you understand, and that $he'll be trained to address t Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care not to rake you with her sharklike teeth. <<elseif $activeSlave.lips > 40>> Though your attention is largely sapped by her tender oral ministrations, you note that her huge lips are soft and pillowy against you. + <<elseif $activeSlave.teeth == "gapped">> + Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care to let you get snagged between $his front teeth. <<elseif ($activeSlave.teeth == "straightening braces") || ($activeSlave.teeth == "cosmetic braces")>> Though your attention is largely sapped by her tender oral ministrations, you note that $he takes care to keep her braces off you. <</if>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index ab2983e786b526d4f2da5b611445b6080ee47b31..4d74b8f8857a880d032a48ab2c2b85365c75beb7 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -724,9 +724,9 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <<set _enslavedPC = Math.trunc(_enslaved / 4), _enslavedNPC = _enslaved - _enslavedPC>> <</if>> + <<set $helots += _enslavedPC, + $NPCSlaves += _enslavedNPC>> <</if>> -<<set $helots += _enslavedPC, -$NPCSlaves += _enslavedNPC>> <<if _enslaved > 1>> <br>In total @@.green;<<print _enslaved>> Lower class citizens@@ were enslaved for failing to pay their debts. <br> @@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>. diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 7d97a9c8807e9f36ddcdb81cf111ea02b0b26fa1..c196de514a02444a3ee5a7ccf44e041136bf8496 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -376,8 +376,8 @@ <<set $slaves[$i].livingRules = "normal">> <</switch>> <<if $dairyPregSetting > 0>> - <<set WombCleanGenericReserve($slaves[_i], "incubator", 9999)>> - <<set WombCleanGenericReserve($slaves[_i], "nursery", 9999)>> + <<set WombCleanGenericReserve($slaves[$i], "incubator", 9999)>> + <<set WombCleanGenericReserve($slaves[$i], "nursery", 9999)>> <</if>> /* General End of Week effects */ diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index a867084f1cd8c5dcbab4a250ec7aea1094cbab7f..79d470862fd1873bf1a178fbeab3c690a8876ec5 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -241,6 +241,12 @@ $He has <<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>> | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "sharp"]] <</if>> +<<case "gapped">> + $He has a noticeable gap in $his front teeth. + [[Apply braces|Surgery Degradation][$activeSlave.teeth = "straightening braces",$cash -= $surgeryCost,$surgeryType = "braces"]] + <<if ($seeExtreme == 1) && ($activeSlave.indentureRestrictions < 1)>> + | [[Replace them with removable prosthetics|Surgery Degradation][$activeSlave.teeth = "removable",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "teeth"]] | [[Replace them with sharp teeth|Surgery Degradation][$activeSlave.teeth = "pointy",$cash -= $surgeryCost, $activeSlave.health -= 20,$surgeryType = "sharp"]] + <</if>> <<case "straightening braces">> $His crooked teeth are in braces. [[Remove braces|Remote Surgery][$activeSlave.teeth = "crooked",$surgeryType = "removeBraces"]] diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a809641a9778ff80abd51bc7815e9cad94915d63..02ade9670ece794ff66c28147cc708f80542faa4 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -5146,8 +5146,15 @@ $He lost the last of $his baby teeth this week. <<set _crookedTeethGen = ((($slaves[$i].face-$slaves[$i].faceImplant)+100)/10)>> <<if random(0,_crookedTeethGen) < 5>> - <<set $slaves[$i].teeth = "crooked">> - Unfortunately, $his teeth ended up @@.yellow;crooked@@ and will require braces to correct. + Unfortunately, + <<if random(0,5) < 1>> + <<set $slaves[$i].teeth = "gapped">> + $he has a large @@.yellow;gap@@ between $his front teeth that + <<else>> + <<set $slaves[$i].teeth = "crooked">> + $his teeth ended up @@.yellow;crooked@@ and + <</if>> + will require braces to correct. <<else>> <<set $slaves[$i].teeth = "normal">> <</if>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 48a381cc54d0167a992adec9103c1a34df4fad1e..8653fc15ed31d2c135feb64eb256946f14f4002d 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -5563,6 +5563,11 @@ $He has <<else>> just for appearances. <</if>> + <<elseif $activeSlave.teeth == "gapped">> + $He has a prominent gap between $his front teeth<<if $activeSlave.faceShape == "cute">> that suits $his cute face surprisingly well<</if>>. + <<if canTalk($activeSlave)>> + It also leaves $him with a slight lisp. + <</if>> <<elseif $activeSlave.teeth == "removable">> $His teeth have been removed and replaced with high-quality dentures. It's difficult to tell anything's unusual until you take them out for gummy oral sex. <<elseif $activeSlave.teeth == "pointy">> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index 3a5aadde9c917a28b7b75f9a4fc32281f342e58d..0fc7cc8fa1620468f10cfd50a757cc1834db24cf 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -164,6 +164,7 @@ <<replace "#teeth">> <<if $activeSlave.teeth == "crooked">>Crooked. + <<elseif $activeSlave.teeth == "gapped">>Gapped. <<elseif $activeSlave.teeth == "straightening braces">>Braces. <<elseif $activeSlave.teeth == "baby">>Baby. <<elseif $activeSlave.teeth == "mixed">>Mixed.