Skip to content
Snippets Groups Projects
Commit 37654d15 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Fix elite breeder check

Closes #3123

See merge request pregmodfan/fc-pregmod!9517
parents ee3accb9 44d91056
No related branches found
No related tags found
No related merge requests found
......@@ -264,7 +264,7 @@ App.Interact.fPCImpreg = function(slave) {
text.push(`is <span class="pregnant">carrying your child.</span>`);
}
if (V.arcologies[0].FSRestart !== 'unset' && (!slave.breedingMark || !V.propOutcome) && V.eugenicsFullControl) {
if (V.arcologies[0].FSRestart !== 'unset' && (!slave.breedingMark || V.propOutcome === 0) && V.eugenicsFullControl !== 1) {
text.push(`Rumors spread about you fucking your slaves pregnant; the Societal Elite are <span class="reputation dec">very displeased</span> by these rumors.`);
V.failedElite += 5;
......@@ -273,24 +273,18 @@ App.Interact.fPCImpreg = function(slave) {
if (V.arcologies[0].FSGenderRadicalist !== 'unset' && slave.mpreg) {
text.push(`Society <span class="reputation inc">approves</span> of your fucking your slaves' asses pregnant; this advances the ideal all a slave needs is ${his} rear.`);
// FIXME: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
repX(V.FSSingleSlaveRep * (V.arcologies[0].FSGenderRadicalist / V.FSLockinLevel), 'futureSocieties', slave);
// FIXME: Operator '+=' cannot be applied to types 'string | number' and 'number'.
V.arcologies[0].FSGenderRadicalist += 0.05 * V.FSSingleSlaveRep;
} else if (V.arcologies[0].FSGenderFundamentalist !== 'unset') {
if (slave.mpreg) {
text.push(`Society <span class="reputation inc">approves</span> of your putting a new slave in ${him}; this advances the idea that all slaves should bear their masters' babies.`);
// FIXME: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
repX(forceNeg(V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel)), 'futureSocieties', slave);
// FIXME: Operator '+=' cannot be applied to types 'string | number' and 'number'.
V.arcologies[0].FSGenderFundamentalist -= 0.05 * V.FSSingleSlaveRep;
} else {
text.push(`Society <span class="reputation dec">is disgusted</span> by this degenerate form of reproduction.`);
// FIXME: The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
repX(V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel), 'futureSocieties', slave);
// FIXME: Operator '+=' cannot be applied to types 'string | number' and 'number'.
V.arcologies[0].FSGenderFundamentalist += 0.05 * V.FSSingleSlaveRep;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment