From 8b231f64ea6dfc70b714040afdba87143d6009cd Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Fri, 7 Dec 2018 20:50:04 +0200
Subject: [PATCH] pregData.drugsEffect to profiles
---
src/init/setupVars.tw | 12 +++++++-----
src/js/pregJS.tw | 11 +++++++++++
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 862b455400f..e6eb24861ee 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -11,15 +11,17 @@
/* Any profile graph data should begin from week 0. Size can be 0 or 1, but CTR should be set to the same value as next graph point.*/
<<set setup.pregData = {
-human: {type: "human", normalOvaMin:1, normalOvaMax: 1, normalBirth: 40, minLiveBirth: 32, fetusWeek: [0, 9, 20, 20, 40, 52, 64, 80, 384, 99999], fetusSize: [1, 3, 16, 25.6, 51, 60, 67.5, 71.6, 129.5, 130], fetusRate: [1, 1, 1, 0.64, 0.6513, 0.6459, 0.644, 0.6393, 0.58, 0.51], sizeType: 0},
+human: {type: "human", normalOvaMin:1, normalOvaMax: 1, normalBirth: 40, minLiveBirth: 32, drugsEffect: 1, fetusWeek: [0, 9, 20, 20, 40, 52, 64, 80, 384, 99999], fetusSize: [1, 3, 16, 25.6, 51, 60, 67.5, 71.6, 129.5, 130], fetusRate: [1, 1, 1, 0.64, 0.6513, 0.6459, 0.644, 0.6393, 0.58, 0.51], sizeType: 0},
-humanWG: {type: "humanWG", normalOvaMin:1, normalOvaMax: 1, normalBirth: 40, minLiveBirth: 32, fetusWeek: [0, 8, 11, 15, 20, 28, 34, 38, 40, 42, 52, 64, 76, 88, 384, 99999], fetusSize: [0, 1, 7, 70, 300, 1005, 2146, 3088, 3462, 3685, 6300, 7700, 8400, 8800, 65000, 65000], fetusRate: [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4], sizeType: 1},
+humanWG: {type: "humanWG", normalOvaMin:1, normalOvaMax: 1, normalBirth: 40, minLiveBirth: 32, drugsEffect: 1, fetusWeek: [0, 8, 11, 15, 20, 28, 34, 38, 40, 42, 52, 64, 76, 88, 384, 99999], fetusSize: [0, 1, 7, 70, 300, 1005, 2146, 3088, 3462, 3685, 6300, 7700, 8400, 8800, 65000, 65000], fetusRate: [4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4], sizeType: 1},
-canineM: {type: "canineM", normalOvaMin:2, normalOvaMax: 8, normalBirth: 9, minLiveBirth: 8, fetusWeek: [0, 4, 5, 9, 9+4*4, 9+12*4, 24*4, 99999], fetusSize: [0, 1, 165, 300, 9525, 17236, 18000, 18000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1},
+canineM: {type: "canineM", normalOvaMin:4, normalOvaMax: 8, normalBirth: 9, minLiveBirth: 8, drugsEffect: 0.4, fetusWeek: [0, 4, 5, 9, 9+4*4, 9+12*4, 24*4, 99999], fetusSize: [0, 1, 165, 300, 9525, 17236, 18000, 18000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1},
-canineL: {type: "canineL", normalOvaMin:2, normalOvaMax: 8, normalBirth: 9, minLiveBirth: 8, fetusWeek: [0, 4, 5, 9, 9+4*4, 9+12*4, 24*4, 99999], fetusSize: [0, 1, 165, 453, 17236, 31751, 34000, 34000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1},
+canineL: {type: "canineL", normalOvaMin:2, normalOvaMax: 6, normalBirth: 9, minLiveBirth: 8, drugsEffect: 0.4, fetusWeek: [0, 4, 5, 9, 9+4*4, 9+12*4, 24*4, 99999], fetusSize: [0, 1, 165, 453, 17236, 31751, 34000, 34000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1},
-equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, fetusWeek: [0, 5.7, 8.5, 11.4, 14.2, 21.4, 25.7, 34.2, 38.5, 45.7, 48, 192, 99999], 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}
+pig: {type: "pig", normalOvaMin:8, normalOvaMax: 12, normalBirth: 9, minLiveBirth: 8, drugsEffect: 0.2, fetusWeek: [0, 4, 5, 9, 9+4*4, 9+12*4, 24*4, 99999], fetusSize: [0, 1, 165, 453, 17236, 31751, 34000, 34000], fetusRate: [4, 4, 4, 4, 4, 4, 4, 4], sizeType: 1},
+
+equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLiveBirth: 44, drugsEffect: 0.05, fetusWeek: [0, 5.7, 8.5, 11.4, 14.2, 21.4, 25.7, 34.2, 38.5, 45.7, 48, 192, 99999], 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}
}>> /* Source data for canine include CTR (not head to toe size), so CTR do not apply anywhere, always 1.*/
/* sizeType: control of source data type 0 - length in centimeters for fetusSize and CTR for fetusRate, 1 - weight in gramms and womb to fetus rate, 2 - direct volume in cc, fetusRate not used*/
diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw
index 8a70791af35..9ef54e18929 100644
--- a/src/js/pregJS.tw
+++ b/src/js/pregJS.tw
@@ -68,6 +68,17 @@ window.setPregType = function(actor) {
var ovum = jsRandom(actor.pregData.normalOvaMin, actor.pregData.normalOvaMax); //for default human profile it's always 1.
var fertilityStack = 0; // adds an increasing bonus roll for stacked fertility drugs
+ /* Suggestion for better animal pregnancy support - usage of another variable then ovum for fertility drugs bonus, and then adding actor.pregData.drugsEffect multiplier to it before adding to ovum. Example:
+
+ var bonus = 0;
+
+ ... (code below where ovum changed to bonus)
+
+ bonus *= actor.pregData.drugsEffect;
+ ovum += bonus;
+
+ */
+
if(actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
if(typeof actor.readyOva == "number" && actor.readyOva != 0) {
ovum = actor.readyOva; //just single override; for delayed impregnation cases
--
GitLab