From 6579e8ea4ce9dc8f236b0a43affba8885e5f9626 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 12 Jan 2020 19:49:10 -0500
Subject: [PATCH] fixes
---
src/endWeek/saRules_old.js | 4 ++--
src/facilities/nursery/scenes/fChildWidgets.js | 6 +++---
src/js/datatypeCleanupJS.js | 6 ------
src/js/sexActsJS.js | 10 +++++-----
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 5d0801b2f14..536d9b761d1 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -1075,7 +1075,7 @@
rival.rivalryTarget = slave.ID;
SimpleSexAct.Slave(rival, 4);
if (canPenetrate(rival)) {
- actX(slave, "penetrative", jsRandom(1, 3));
+ actX(rival, "penetrative", jsRandom(1, 3));
}
if (!App.Utils.sexAllowed(slave, rival)) {
@@ -1147,7 +1147,7 @@
rival.rivalryTarget = slave.ID;
SimpleSexAct.Slave(rival, 4);
if (canPenetrate(rival)) {
- actX(slave, "penetrative", jsRandom(1, 3));
+ actX(rival, "penetrative", jsRandom(1, 3));
}
if (!App.Utils.sexAllowed(slave, rival)) {
r += `As the rules do not permit ${slave.slaveName} and ${rival.slaveName} to have sex, ${he} is <span class="yellow">severely punished.</span> `;
diff --git a/src/facilities/nursery/scenes/fChildWidgets.js b/src/facilities/nursery/scenes/fChildWidgets.js
index bfee9fac579..bbe8d32a23a 100644
--- a/src/facilities/nursery/scenes/fChildWidgets.js
+++ b/src/facilities/nursery/scenes/fChildWidgets.js
@@ -4,7 +4,7 @@ App.Facilities.Nursery.fChildOral = function fChildOral(child) {
let
r = ``;
- actX(child, "oral");// TODO: will this counts towards the total count?
+ actX(child, "oral");// TODO: will this counts towards the total count?
clearSummaryCache(child);
// TODO: all of this
@@ -50,9 +50,9 @@ App.Facilities.Nursery.fChildImpreg = function fChildImpreg(child) {
clearSummaryCache(child);
if (child.mpreg) {
- actX(slave, "anal", (bonus + 1));
+ actX(child, "anal", (bonus + 1));
} else {
- actX(slave, "vaginal", (bonus + 1));
+ actX(child, "vaginal", (bonus + 1));
}
// TODO: all of this
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 66048482cea..d5a218fd570 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -2223,12 +2223,6 @@ window.FacilityDatatypeCleanup = (function() {
}
})();
-window.CounterDatatypeCleanup = function COunterDatatypeCleanup() {
- V.arcologies[0].ownership = Math.clamp(+V.arcologies[0].ownership, 0, 100) || 0;
- V.arcologies[0].minority = Math.clamp(+V.arcologies[0].minority, 0, 100) || 0;
-
-};
-
/**
* Cleans up a slave record assuming it is used for the gene pool.
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 165533e3a5c..f2d4dc643be 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -274,13 +274,13 @@ window.VCheck = (function() {
}
if (canDoAnal(partner)) {
- actX(slave, "vaginal", bothTimes);
- actX(slave, "anal", bothTimes);
+ actX(partner, "vaginal", bothTimes);
+ actX(partner, "anal", bothTimes);
if (canImpreg(partner, V.PC)) {
r += knockMeUp(partner, 10, 2, -1);
}
} else {
- actX(slave, "vaginal", bothTimes);
+ actX(partner, "vaginal", bothTimes);
if (canImpreg(partner, V.PC)) {
r += knockMeUp(partner, 10, 0, -1);
}
@@ -418,8 +418,8 @@ window.SimpleSexAct = (function() {
}
if (passage() === "SA serve your other slaves") {
if (subslave.ID === V.slaves[V.i].ID) {
- actX(slave, "anal");
- actX(slave, "penetrative");
+ actX(V.slaves[V.i], "anal");
+ actX(domslave, "penetrative");
} else {
actX(subslave, "anal");
actX(slave[V.i], "penetrative");
--
GitLab