From 966c83ecd66d88d02f186eb5d64167ac6ad208c1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 27 Nov 2018 20:03:54 -0500
Subject: [PATCH] gapped teeth completion
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 11 +++++++++++
devNotes/twine JS.txt | 6 +++++-
src/SecExp/secExpSmilingMan.tw | 5 ++---
src/cheats/mod_EditChildCheatNew.tw | 1 +
src/cheats/mod_EditSlaveCheat.tw | 1 +
src/cheats/mod_editSlaveCheatNew.tw | 1 +
src/gui/mainMenu/AlphaDisclaimer.tw | 2 +-
src/init/storyInit.tw | 4 ++--
src/js/generateNewSlaveJS.tw | 4 ++--
src/js/slaveCostJS.tw | 6 +++++-
src/npc/startingGirls/startingGirls.tw | 2 ++
src/pregmod/incubator.tw | 1 +
src/uncategorized/RESS.tw | 10 ++++++++++
src/uncategorized/remoteSurgery.tw | 6 ++++++
src/uncategorized/saLongTermEffects.tw | 11 +++++++++--
src/utility/descriptionWidgetsFlesh.tw | 5 +++++
src/utility/slaveCreationWidgets.tw | 1 +
17 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c37dbb159f3..281c9850b55 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 d6f3ec03533..ef41ccc177c 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -37176,7 +37176,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 e8dbcbe00b8..881644c598d 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 5eb9d5fa9a2..fcfd8526f33 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 bf0d33ac8e5..a26d979325a 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 9d660ac0d4d..95fe116efb9 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/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 42df6073ea9..7ff010c8b27 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 b31f740bfcb..ea37c0239c6 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. */
diff --git a/src/js/generateNewSlaveJS.tw b/src/js/generateNewSlaveJS.tw
index 554fa42f449..df902983bc9 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 0089e34745a..dee86baf67e 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 d97bee57344..db359a96d01 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/incubator.tw b/src/pregmod/incubator.tw
index be75a3969ee..abacfbfe92e 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/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 97a4e0f9e90..3196954d6e8 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -12686,6 +12686,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>
@@ -16328,6 +16330,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>>
@@ -19419,6 +19423,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>>
@@ -19531,6 +19537,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>>
@@ -19937,6 +19945,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/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index a867084f1cd..79d470862fd 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 a809641a977..02ade9670ec 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 48a381cc54d..8653fc15ed3 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 3a5aadde9c9..0fc7cc8fa16 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.
--
GitLab