diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index ab1f9df1a1834a655d4f10c6386964978313e166..7567a248fe8e0bf378e875e673bb34761204e9b9 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -62,7 +62,7 @@ App.Update.Slave = function(slave, genepool = false) { } } if (slave.genetics !== undefined) { delete slave.genetics; } - if (slave.geneMods === undefined) { slave.geneMods = {NCS: 0, rapidCellGrowth: 0, immortality: 0}; } + slave.geneMods = Object.assign({NCS: 0, rapidCellGrowth: 0, immortality: 0}, slave.geneMods); if (slave.inducedNCS !== undefined) { slave.geneMods.NCS = slave.inducedNCS; delete slave.inducedNCS; diff --git a/src/endWeek/saSmartPiercingEffects.js b/src/endWeek/saSmartPiercingEffects.js index 8173064c0061073d90fa0e3a02954a170a205f1d..868112969780eed2ad55e45dea7f0eb34b31e64b 100644 --- a/src/endWeek/saSmartPiercingEffects.js +++ b/src/endWeek/saSmartPiercingEffects.js @@ -217,11 +217,12 @@ App.SlaveAssignment.SmartPiercing.vanilla = class extends App.SlaveAssignment.Sm super(slave, "none"); } - effect(magnitude) { + trigger(magnitude, plural) { // Vanilla does NOT increase the strength of the "none" fetish, but otherwise behaves like any other fetishe setting if (this.slave.fetish !== "none") { - super.effect(magnitude); + return super.trigger(magnitude, plural); } + return ''; } fetishText(plural, which) {