From 09c9a12554948dfa5d27e7460d5672a1c8893dd3 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 18 Sep 2018 18:37:17 -0400
Subject: [PATCH] fixes and tweaks
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++
devNotes/twine JS.txt | 8 ++++
src/uncategorized/PESS.tw | 6 +--
src/uncategorized/reRelativeRecruiter.tw | 7 +++
src/uncategorized/recETSWorkaround.tw | 50 ++++++++++++++++++++
src/uncategorized/saLongTermEffects.tw | 36 ++++++--------
6 files changed, 89 insertions(+), 25 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d71ec6259ce..ef25ba69678 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.7.x
+9/18/2018
+
+ 34
+ -fixed filter by race
+ -young slaves now generate with baby teeth and lose them as they age
+ -fixes
+
9/17/2018
33
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 5bee46b4d81..09d5808448a 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -21172,6 +21172,10 @@ window.SlaveSummaryUncached = (function(){
r += `Rem Teeth`;
} else if (slave.teeth === "pointy") {
r += `Fangs`;
+ } else if (slave.teeth === "baby") {
+ r += `Baby`;
+ } else if (slave.teeth === "mixed") {
+ r += `Mixed`;
}
r += " ";
}
@@ -21486,6 +21490,10 @@ window.SlaveSummaryUncached = (function(){
r += `Removable teeth.`;
} else if (slave.teeth === "pointy") {
r += `Sharp fangs.`;
+ } else if (slave.teeth === "baby") {
+ r += `Baby teeth.`;
+ } else if (slave.teeth === "mixed") {
+ r += `Mixed teeth.`;
}
r += " ";
}
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 0a363fb9c31..bc28997c824 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -501,8 +501,8 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<set $activeSlave.oralCount += 1>>
<<set $oralTotal += 1>>
<<= AnalVCheck()>>
- <</replace>>
-<</link>> <<if $slaves[$j].anus == 0>>//This will take anal virginity//<</if>>
+ <</replace>><<if $activeSlave.anus == 0>>//This will take anal virginity//<</if>>
+<</link>>
<<if $j >= 0 && canDoAnal($slaves[$j])>> /* $j will be -1 if no eligible victim was found */
<br><<link "Victimize something together">>
<<replace "#result">>
@@ -515,7 +515,7 @@ $He sees you examining at $him, and looks back at you submissively, too tired to
<<set $slaves[$i].devotion += 4, $slaves[$i].trust -= 4>>
<</for>>
<</replace>>
- <</link>>
+ <</link>><<if $slaves[$j].anus == 0>>//This will take anal virginity//<</if>>
<</if>>
<<case "headgirl dickgirl">>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 9fe7aced3c6..3b2c6f63c3c 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -563,6 +563,13 @@ She waits anxiously for your decision.
<<set $activeSlave.pregControl = "none">>
<<set $activeSlave.buttplugAttachment = "none">>
<<run SetBellySize($activeSlave)>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<<elseif ($activeSlave.teeth == "mixed" || $activeSlave.teeth == "baby") && $activeSlave.physicalAge >= 12>>
+ <<set $activeSlave.teeth = "normal">>
+<</if>>
<<slaveCost $activeSlave>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index a32934104d3..0429b07c218 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -33,6 +33,11 @@ Unsurprisingly the daughter is an addict too, and before long she's given her si
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "posh mother daughter">>
@@ -67,6 +72,11 @@ Her daughter walks in angrily demanding to know why you called her here. She see
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "mismatched pair">>
@@ -169,6 +179,11 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "incest father daughter">>
@@ -218,6 +233,11 @@ The daughter cheers happily and hugs her relieved father. He leans in and kisses
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "incest brother sister">>
@@ -264,6 +284,11 @@ They cheer happily and hug each other tightly. They ought to be an interesting a
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "incest sister sister">>
@@ -310,6 +335,11 @@ They hug each other tightly as the older brother slips a hand down his younger's
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "incest twin sister">>
@@ -415,6 +445,11 @@ The daughter cheers happily and hugs her relieved mother. She leans in and kisse
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "incest father son">>
@@ -450,6 +485,11 @@ The father hugs his son tight and slips a hand down his pants. They ought to be
<</if>>
<<set $activeSlave.relationship = 3>>
<<set $activeSlave.relationshipTarget = $activeSlave.ID - 1000>>
+<<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+<<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+<</if>>
<<case "matched pair">>
@@ -574,6 +614,11 @@ You turn to the child clutching her mother's grotesque belly.
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
+ <<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+ <<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+ <</if>>
<<else>> /*girl*/
She is in better shape than her mother and tries to hide behind her belly when you look at her. She'll be broken into a good little girl for you soon enough.
<<set $activeSlave.origin = "Her mother offered her to you as an incentive to take her in.">>
@@ -637,6 +682,11 @@ You turn to the child clutching her mother's grotesque belly.
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.ovaryAge = $activeSlave.actualAge>>
+ <<if $activeSlave.physicalAge < 6>>
+ <<set $activeSlave.teeth = "baby">>
+ <<elseif $activeSlave.physicalAge < 12>>
+ <<set $activeSlave.teeth = "mixed">>
+ <</if>>
<</if>>
<<default>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 698ece389b9..66a66e5fd26 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6021,28 +6021,20 @@
$His braces @@.lime;straighten $his teeth.@@ They can now be removed to leave $him with a beautiful smile, or left on.
<<set $slaves[$i].teeth = "cosmetic braces">>
<</if>>
-<</if>>
-
-<<if $slaves[$i].birthWeek >= 52>>
- <<if $seeAge == 1>>
- <<if $slaves[$i].physicalAge >= 6 && $slaves[_i].teeth == "baby">>
- <<set $slaves[$i].teeth = "mixed">>
- $He lost $his first baby tooth this week.
- <<elseif $slaves[$i].physicalAge >= 12 && $slaves[$i].teeth == "mixed">>
- <<set _crookedTeethGen = 4+$slaves[$i].intelligence+$slaves[$i].intelligenceImplant>>
- <<if "American" == $slaves[$i].nationality>>
- <<set _crookedTeethGen += 2>>
- <<elseif ["Andorran", "Antiguan", "Argentinian", "Aruban", "Australian", "Austrian", "Bahamian", "Bahraini", "Barbadian", "Belarusian", "Belgian", "Bermudian", "Brazilian", "British", "Bruneian", "Bulgarian", "Canadian", "Catalan", "Chilean", "a Cook Islander", "Croatian", "Czech", "Cypriot", "Danish", "Dutch", "Emirati", "Estonian", "Finnish", "French", "German", "Greek", "Greenlandic", "Guamanian", "Hungarian", "Icelandic", "Irish", "Israeli", "Italian", "Japanese", "Kazakh", "Korean", "Kuwaiti", "Latvian", "a Liechtensteiner", "Lithuanian", "Luxembourgian", "Malaysian", "Maltese", "Mauritian", "Monégasque", "Montenegrin", "New Caledonian", "a New Zealander", "Niuean", "Norwegian", "Omani", "Palauan", "Panamanian", "Polish", "Portuguese", "Puerto Rican", "Qatari", "Romanian", "Russian", "Sammarinese", "Saudi", "Seychellois", "Singaporean", "Slovak", "Slovene", "Spanish", "Swedish", "Swiss", "Taiwanese", "Trinidadian", "Uruguayan", "Vatican"].includes($slaves[$i].nationality)>>
- <<else>>
- <<set _crookedTeethGen -= 2>>
- <</if>>
- $He lost the last of $his baby teeth this week.
- <<if random(1,_crookedTeethGen) == 1>>
- <<set $slaves[$i].teeth = "crooked">>
- $His teeth ended up @@.yellow;crooked@@, detracting from $his beauty whenever $he opens $his mouth.
- <<else>>
- <<set $slaves[$i].teeth = "normal">>
- <</if>>
+<<elseif $slaves[_i].teeth == "baby">>
+ <<if $seeAge == 1 && $slaves[$i].physicalAge >= 6 && random(0,($slaves[$i].birthWeek*2))>>
+ <<set $slaves[$i].teeth = "mixed">>
+ $He lost $his first baby tooth this week.
+ <</if>>
+<<elseif $slaves[_i].teeth == "mixed">>
+ <<if $seeAge == 1 && $slaves[$i].physicalAge >= 12 && random(0,($slaves[$i].birthWeek*2))>>
+ $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.
+ <<else>>
+ <<set $slaves[$i].teeth = "normal">>
<</if>>
<</if>>
<</if>>
--
GitLab