From 7010ccfdff404e5d6a40308de9349a97aa77dbc7 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Thu, 11 Oct 2018 21:02:50 -0400
Subject: [PATCH] Clean up and partial revert
---
src/uncategorized/BackwardsCompatibility.tw | 6 ++++++
src/utility/assayWidgets.tw | 4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 20935542250..a677cece8a7 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -202,6 +202,9 @@
<<if def $space>>
<<unset $space>>
<</if>>
+<<if def $vaginaTotal>>
+ <<unset $vaginaTotal>>
+<</if>>
/* pregmod stuff */
@@ -2996,6 +2999,9 @@ Setting missing slave variables:
<<if def _Slave.oralTotal>>
<<run delete _Slave.oralTotal>>
<</if>>
+<<if def _Slave.vaginaCount>>
+ <<run delete _Slave.vaginaCount>>
+<</if>>
<<if (($ver.startsWith("0.6") && !$ver.startsWith("10.6")) || ($ver.startsWith("0.7")) || ($ver.startsWith("0.8"))) && (!$ver.startsWith("0.8.9")) && (!$ver.startsWith("0.8.10")) && (!$ver.startsWith("0.8.11")) && (!$ver.startsWith("0.8.12"))>>
<<if _Slave.attrXX == 2>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 5e16b12d97f..33e23757b90 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1339,10 +1339,8 @@
<<set _slaveMultiplier += -0.2>>
<<elseif _int >= -95>>
<<set _slaveMultiplier += -0.4>>
-<<elseif _int >= -129>>
+<<elseif _int >= -100>>
<<set _slaveMultiplier += -0.8>>
-<<elseif _int == -130>>
- <<set _slaveMultiplier += -1.6>>
<</if>>
<<if $args[0].vagina > -1 && $arcologies[0].FSRestartSMR == 1>>
--
GitLab