From 09017bc0d120bb5be61f7834fd9bd2133e2a05fc Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 23 Dec 2019 18:02:16 +0100
Subject: [PATCH] fix scoping
---
src/npc/surgery/reproductiveOrgans.js | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/npc/surgery/reproductiveOrgans.js b/src/npc/surgery/reproductiveOrgans.js
index ae50fd7169e..d09089b7643 100644
--- a/src/npc/surgery/reproductiveOrgans.js
+++ b/src/npc/surgery/reproductiveOrgans.js
@@ -9,7 +9,7 @@ App.Medicine.OrganFarm.TesticlesImplantAction = class extends App.Medicine.Organ
* @param {function(App.Entity.SlaveState):string} implantError
* @param {function(App.Entity.SlaveState)} implant
*/
- constructor({name, tooltip = "", ballType, animal, autoImplant = true, canImplant, implantError, implant} = {}) {
+ constructor({name, tooltip = "", animal, autoImplant = true, canImplant, implantError, implant} = {}) {
super({
name: name,
tooltip: tooltip,
@@ -21,7 +21,6 @@ App.Medicine.OrganFarm.TesticlesImplantAction = class extends App.Medicine.Organ
implant: implant
});
this.animal = animal;
- this.ballType = ballType;
}
};
@@ -121,6 +120,7 @@ App.Medicine.OrganFarm.Testicles = class extends App.Medicine.OrganFarm.Organ {
]
});
this.animal = animal;
+ this.ballType = ballType;
}
};
@@ -128,15 +128,13 @@ App.Medicine.OrganFarm.OvariesImplantAction = class extends App.Medicine.OrganFa
/**
* @param {string} name
* @param {string} tooltip
- * @param {string} eggType
- * @param {string} pregData
* @param {boolean} animal
* @param {boolean} autoImplant
* @param {function(App.Entity.SlaveState):boolean} canImplant
* @param {function(App.Entity.SlaveState):string} implantError
* @param {function(App.Entity.SlaveState)} implant
*/
- constructor({name, tooltip = "", eggType, pregData, animal, autoImplant = true, canImplant, implantError, implant} = {}) {
+ constructor({name, tooltip = "", animal, autoImplant = true, canImplant, implantError, implant} = {}) {
super({
name: name, tooltip: tooltip, healthImpact: 20,
surgeryType: animal ? "addAnimalOvaries" : "addOvaries", autoImplant: autoImplant,
@@ -145,8 +143,6 @@ App.Medicine.OrganFarm.OvariesImplantAction = class extends App.Medicine.OrganFa
implant: implant
});
this.animal = animal;
- this.eggType = eggType;
- this.pregData = pregData;
}
};
@@ -165,7 +161,7 @@ App.Medicine.OrganFarm.Ovaries = class extends App.Medicine.OrganFarm.Organ {
canGrow: () => (!this.animal || V.animalTesticles > 0),
actions: [
new App.Medicine.OrganFarm.OvariesImplantAction({
- name: "Implant", eggType: eggType, pregData: pregData, animal: animal,
+ name: "Implant", animal: animal,
canImplant: s => (s.vagina >= 0 && s.ovaries <= 0 && s.mpreg === 0 && s.bellyImplant === -1),
implantError: s => {
if (s.vagina < 0) { return "This slave lacks the vagina necessary to accept ovaries."; }
@@ -209,6 +205,8 @@ App.Medicine.OrganFarm.Ovaries = class extends App.Medicine.OrganFarm.Organ {
]
});
this.animal = animal;
+ this.eggType = eggType;
+ this.pregData = pregData;
}
};
@@ -232,7 +230,7 @@ App.Medicine.OrganFarm.AnalWombImplantAction = class extends App.Medicine.OrganF
s.mpreg = 1;
s.eggType = this.eggType;
s.preg = 0;
- s.pregData = clone(setup.pregData[pregData]);
+ s.pregData = clone(setup.pregData[this.pregData]);
if (s.pubertyXX === 0 && s.physicalAge >= V.fertilityAge) {
if (V.precociousPuberty === 1) {
s.pubertyAgeXX = s.physicalAge + 1;
--
GitLab