From 48f3341ea96c943b149679c488c9a2450bd550d2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 13 May 2020 17:38:50 -0400
Subject: [PATCH] Resync
---
Changelog.txt | 5 +++++
js/003-data/miscData.js | 14 ++++++++++++++
src/uncategorized/RESS.tw | 17 ++++++++++-------
src/uncategorized/slaveAssignmentsReport.tw | 2 +-
4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 16559771788..15156b24a78 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,11 @@ Pregmod
0.10.7.1-3.5.x
+ 1
+ -split neck accessories into face and neck slots
+ -added neckties
+ -added tracking for abortions, miscarriages, pit wins and pit losses
+
5/03/2020
0
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 78fc7a72990..5463e2ddacd 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -223,6 +223,20 @@ App.Data.misc = {
fetusSize: [0, 14.1, 28.3, 56.7, 453, 2721, 11339, 20411, 34019, 54431, 57000, 600000, 600000],
fetusRate: [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4],
sizeType: 1
+ },
+
+ // fantasy stuff for those feeling adventurous with variables
+ tentacle: {
+ type: "tentacle",
+ normalOvaMin: 1,
+ normalOvaMax: 1,
+ normalBirth: 4,
+ minLiveBirth: 4,
+ drugsEffect: 2,
+ fetusWeek: [0, 1, 2, 3, 4, 5, 6, 99999],
+ fetusSize: [5000, 11000, 19000, 30000, 45000, 60000, 60000],
+ fetusRate: [4, 4, 4, 4, 4, 4, 4, 4],
+ sizeType: 2
}
},
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index fa3e61a47de..e61ffa4aa03 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -329,15 +329,18 @@ hips innocently and moves up to $his lower legs. But then, as $he slowly massage
<</if>>
With $his back arched and $his thighs together $his <<if $activeSlave.butt > 5>>massive buttocks part a little, showing a hint of<<elseif $activeSlave.butt > 2>>big buttocks part, revealing<<else>>cute buttocks are spread wide apart, displaying<</if>> $his <<if $activeSlave.anus > 2>>lewd anal slit<<elseif $activeSlave.anus == 2>>big butthole<<else>>tight anus<</if>>.
<<if canSee($activeSlave)>>
- <<if $activeSlave.belly >= 50000>>$His _belly stomach is far too large to see around, but given $his held pose, $he's waiting to see what you do
- <<elseif $activeSlave.belly >= 5000>>$He peeks around the edge of $his belly, checking your crotch to see if you are watching
- <<else>>$He peeks between $his legs again, checking to see if you're watching
+ <<if $activeSlave.belly >= 50000>>
+ $His _belly stomach is far too large to see around, but given $his held pose, $he's waiting to see what you do.
+ <<elseif $activeSlave.belly >= 5000>>
+ $He peeks around the edge of $his belly, checking your crotch to see if you are watching.
+ <<else>>
+ $He peeks between $his legs again, checking to see if you're watching.
<</if>>
<<elseif canHear($activeSlave)>>
- $His ears perk up, listening to see if you are still there
+ $His ears perk up, listening to see if you are still there.
<<else>>
- $He stays as still as $he can, clearly waiting for you to make a move
-<</if>>.
+ $He stays as still as $he can, clearly waiting for you to make a move.
+<</if>>
<<case "sore shoulders">>
@@ -4201,7 +4204,7 @@ You pass through your slaves' living area as some of them are starting their day
<<if $slaves[_ress].belly >= 120000>>_belly belly is
<<elseif $slaves[_ress].boobs > 25000>>immense <<if ($slaves[_ress].boobsImplant/$slaves[_ress].boobs) >= .60>>fake <</if>> breasts are
<<elseif $slaves[_ress].dick > 10>>monster dick is
- <<elseif $slaves[_ress].balls > 8>>immense testicles are
+ <<elseif $slaves[_ress].balls > 50>>immense testicles are
<<elseif $slaves[_ress].weight > 130>>gigantic body is
<<elseif $slaves[_ress].butt > 12>>inhuman ass is
<<elseif $slaves[_ress].weight > 130>>fat form is
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index dc673d304ae..103c5fabf0a 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -820,7 +820,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
<<if $StudID == 0>>
<<set $slaves[$i].subTarget = 0>>
<<else>>
- <<set $StudCum = 2+Math.trunc((_Stud.balls/5)+(_Stud.energy/95)+(_Stud.health.condition/95)+(_Stud.devotion/95)+($reproductionFormula*5)-(_Stud.health.tired/25))>>
+ <<set $StudCum = 2+Math.trunc(((_Stud.balls/5)+(_Stud.energy/95)+(_Stud.health.condition/95)+(_Stud.devotion/95)+($reproductionFormula*5)-(_Stud.health.tired/25))*healthPenalty(_Stud))>>
<<if _Stud.drugs == "hyper testicle enhancement">>
<<set $StudCum += 3>>
<<elseif _Stud.drugs == "testicle enhancement">>
--
GitLab