diff --git a/src/endWeek/saRelationships.js b/src/endWeek/saRelationships.js index a1fce0220d7da002cf36f8f18d6fc884d2facf5d..c2f22e48579bd9ec18619c0789f547adf4429842 100644 --- a/src/endWeek/saRelationships.js +++ b/src/endWeek/saRelationships.js @@ -107,7 +107,7 @@ App.SlaveAssignment.relationships = (function() { } else if (slave.assignment === Job.FUCKTOY || slave.assignment === Job.MASTERSUITE) { r.push(`and spends ${his} days worshipping your`); if (V.PC.dick !== 0) { - r.push(`cock${PC.vagina !== -1 ? "and" : ","}`); + r.push(`cock${PC.vagina !== -1 ? " and" : ","}`); } if (V.PC.vagina !== -1) { r.push(`cunt,`); @@ -132,8 +132,8 @@ App.SlaveAssignment.relationships = (function() { break; } } - } else if (slave.origin === "You were acquainted with ${him} before you were an arcology owner; your rival tried to use ${him} to manipulate you, but you rescued ${him}." && V.rivalryDuration > 20 && !["Intellectual Dependency", "Paternalism", "Racial Supremacism", "Slave Professionalism"].includes(V.rivalryFS)&& slave.newGamePlus === 0) { - potentialFriend = V.slaves.find((s) => (s.prestigeDesc === "You bankrupted and enslaved ${him} in revenge for ${his} part in the attack on your arcology by the Daughters of Liberty." && s.fuckdoll === 0 && s.fetish !== "mindbroken" && s.newGamePlus === 0)); + } else if (slave.origin === "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him." && V.rivalryDuration > 20 && !["Intellectual Dependency", "Paternalism", "Racial Supremacism", "Slave Professionalism"].includes(V.rivalryFS)&& slave.newGamePlus === 0) { + potentialFriend = V.slaves.find((s) => (s.prestigeDesc === "You bankrupted and enslaved $him in revenge for $his part in the attack on your arcology by the Daughters of Liberty." && s.fuckdoll === 0 && s.fetish !== "mindbroken" && s.newGamePlus === 0)); if (potentialFriend !== undefined) { r.push(`${slave.slaveName} greets ${potentialFriend.slaveName} with joy, happy to see a familiar face again. Without any regard to you, <span class="relationship">they continue their prior relationship.</span>`); if (potentialFriend.relationship > 0) { // remove me with multi-friend system @@ -295,7 +295,7 @@ App.SlaveAssignment.relationships = (function() { } else { r.push(`children`); } - r.push(` living in your penthouse, so it's not surprising that their offspring brings them together. They have <span class="relationship">become friends</span> for their child's sake.`); + r.push(`living in your penthouse, so it's not surprising that their offspring brings them together. They have <span class="relationship">become friends</span> for their child's sake.`); startFriendship(slave, potentialFriend, 1); break; } else { @@ -959,7 +959,7 @@ App.SlaveAssignment.relationships = (function() { if (areRelated(slave, lover)) { r.push(`${slave.slaveName}`); - if (slave.origin === "${He} offered ${himself} to you for enslavement hoping you would preserve ${his} incestuous relationship with ${his} sibling." || slave.origin === "${He} offered to become your slave to protect ${his} incestuous relationship.") { + if (slave.origin === "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling." || slave.origin === "$He offered to become your slave to protect $his incestuous relationship.") { r.push(`is <span class="devotion inc">grateful</span> and <span class="trust inc">trusting</span> towards you for protecting ${him} in ${his} long-standing incestuous relationship.`); slave.devotion += 2; slave.trust += 2; @@ -986,7 +986,7 @@ App.SlaveAssignment.relationships = (function() { slave.trust -= 4; } if (slave.pregKnown === 1 && slave.pregSource === lover.ID) { - if (slave.origin === "${He} offered ${himself} to you for enslavement hoping you would preserve ${his} incestuous relationship with ${his} sibling." || slave.origin === "${He} offered to become your slave to protect ${his} incestuous relationship.") { + if (slave.origin === "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling." || slave.origin === "$He offered to become your slave to protect $his incestuous relationship.") { r.push(`${He}'s <span class="devotion inc">overjoyed</span> to be carrying ${his} ${relationType}'s child`); if (slave.pregType > 1) { r.push(`ren`); diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 57f44fb1ceec2feefd20b2ae8338835c6af03328..4ec081bb71b6a77a2ea69abfba250d0bb36d651a 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -320,7 +320,7 @@ <<include "SA long term effects">> <<run App.SlaveAssignment.drugs(_S.Milkmaid)>> <<run App.SlaveAssignment.relationships(_S.Milkmaid)>> - <<run App.SlaveAssignment.relationships(_S.Milkmaid)>> + <<run App.SlaveAssignment.rivalries(_S.Milkmaid)>> <<include "SA devotion">> <</silently>> <</if>>