From 2c43d45fe460950f04a024a2707e93111423c186 Mon Sep 17 00:00:00 2001
From: Anu <8636-Anu@users.noreply.gitgud.io>
Date: Thu, 4 Nov 2021 05:44:26 +0000
Subject: [PATCH] Revert format change, use correct function
---
src/events/recETS/recetsAddictMotherDaughter.js | 8 +++-----
src/events/recETS/recetsPoshMotherDaughter.js | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/events/recETS/recetsAddictMotherDaughter.js b/src/events/recETS/recetsAddictMotherDaughter.js
index fb6575c1c2f..340fc023883 100644
--- a/src/events/recETS/recetsAddictMotherDaughter.js
+++ b/src/events/recETS/recetsAddictMotherDaughter.js
@@ -15,11 +15,9 @@ App.Events.recetsAddictMotherDaughter = class recetsAddictMotherDaughter extends
const contractCost = 1000;
let pram = new GenerateNewSlavePram();
- pram.minAge = V.fertilityAge + V.minimumSlaveAge;
- pram.maxAge = 40;
- pram.ageOverridesPedoMode = 1;
- pram.disableDisability = 1;
- pram.race = "nonslave";
+ Object.assign(pram, {
+ minAge: V.fertilityAge + V.minimumSlaveAge, maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1, race: "nonslave"
+ });
const mother = GenerateNewSlave("XX", pram);
mother.origin = "$He sold $himself into slavery to escape addiction debts.";
mother.career = App.Data.Careers.General.uneducated.random();
diff --git a/src/events/recETS/recetsPoshMotherDaughter.js b/src/events/recETS/recetsPoshMotherDaughter.js
index 85e0ae99fe1..3d0339c2338 100644
--- a/src/events/recETS/recetsPoshMotherDaughter.js
+++ b/src/events/recETS/recetsPoshMotherDaughter.js
@@ -15,11 +15,9 @@ App.Events.recetsPoshMotherDaughter = class recetsPoshMotherDaughter extends App
let r = [];
let pram = new GenerateNewSlavePram();
- pram.minAge = Math.max(V.fertilityAge + V.minimumSlaveAge, 16);
- pram.maxAge = 40;
- pram.ageOverridesPedoMode = 1;
- pram.disableDisability = 1;
- pram.race = "nonslave";
+ Object.assign(pram, {
+ minAge: Math.max(V.fertilityAge + V.minimumSlaveAge, 16), maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1, race: "nonslave"
+ });
const contractCost = 1500;
const mother = GenerateNewSlave("XX", pram);
mother.origin = "$He was enslaved after you called in $his business debts.";
--
GitLab