diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js index 4c53355fca5c236e1ee3f4a0f0783ec276c51d26..46c674721f230d797a8e412737c42615ff17686f 100644 --- a/src/endWeek/saBeYourHeadGirl.js +++ b/src/endWeek/saBeYourHeadGirl.js @@ -269,7 +269,7 @@ App.SlaveAssignment.beYourHeadGirl = (function() { if (V.HGTimeInGrade + ((slave.intelligence + slave.intelligenceImplant) / 10) + (slave.devotion / 10) + (slave.trust / 10) > 50) { r.push(`${slave.slaveName} has rendered such long and competent service as your Head Girl that many of your citizens have come to rely on ${his} word as an extension of yours, trusting that if ${he} does something, it's because you trust ${him} to. <span class="green">${He} has become prestigious on ${his} own merits, a remarkable achievement for a slave!</span>`); slave.prestige += 1; - slave.prestigeDesc = `Many citizens respect ${his} long and able service as your Head Girl.`; + slave.prestigeDesc = `Many citizens respect $his long and able service as your Head Girl.`; } } diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js index 0a584229d3cde97b1a575b7f6fd00cf7aeb419ba..94711f4940b5d0aa6970bb20f851fa102c515279 100644 --- a/src/endWeek/saPorn.js +++ b/src/endWeek/saPorn.js @@ -325,7 +325,7 @@ App.SlaveAssignment.porn = (function() { slave.porn.fameType = genre.fameName; slave.porn.prestige = 1; - r += `<span class="green">${He} has gained a following in ${slave.porn.fameType} pornography!</span> ${genre.prestigeDesc1}, but ${he} isn't famous enough to be called prestigious yet. `; + r += `<span class="green">${He} has gained a following in ${slave.porn.fameType} pornography!</span> ${pronounsForSlaveProp(slave, genre.prestigeDesc1)}, but ${he} isn't famous enough to be called prestigious yet. `; slave.porn.prestigeDesc = `$He has a following in slave pornography. ${genre.prestigeDesc1}.`; if (genre.type === App.Porn.GenreType.fetish && slave.fetishKnown !== 1) { slave.fetishKnown = 1; @@ -337,7 +337,7 @@ App.SlaveAssignment.porn = (function() { if (slave.porn.fame[genre.fameVar] >= 50000) { slave.porn.prestige = 2; slave.porn.prestigeDesc = `$He is well known from $his career in slave pornography. ${genre.prestigeDesc2}.`; - r += `<span class="green">${He} has gained a hold in ${slave.porn.fameType} pornography!</span> ${genre.prestigeDesc2}, so it is now prestigious to own ${him}. `; + r += `<span class="green">${He} has gained a hold in ${slave.porn.fameType} pornography!</span> ${pronounsForSlaveProp(slave, genre.prestigeDesc2)}, so it is now prestigious to own ${him}. `; } else if (slave.porn.fame[highestPorn.fameVar] >= slave.porn.fame[genre.fameVar] * swapPoint) { r += `${His} fame in ${slave.porn.fameType} pornography has been overwhelmed by ${his} surging popularity in other aspects. <span class="yellow">${He} is now better known for ${his} ${highestPorn.fameName} porn.</span> `; slave.porn.fameType = highestPorn.fameName; @@ -356,7 +356,7 @@ App.SlaveAssignment.porn = (function() { slave.porn.viewerCount = 250000; V.pornStars[genre.fameVar].p3ID = slave.ID; slave.porn.prestigeDesc = `$He is world famous for $his career in slave pornography. ${genre.prestigeDesc3}.`; - r += `<span class="green">${He} has become world famous for ${his} career in ${slave.porn.fameType} pornography!</span> ${genre.prestigeDesc3}, so it is now extremely prestigious to own ${him}. `; + r += `<span class="green">${He} has become world famous for ${his} career in ${slave.porn.fameType} pornography!</span> ${pronounsForSlaveProp(slave, genre.prestigeDesc3)}, so it is now extremely prestigious to own ${him}. `; V.trinkets.push(`a framed shot from porn starring ${slave.slaveName} ${genre.trinketShotDesc(slave)}`); r += `Further paid publicity cannot increase ${his} fame, so subsidy of porn featuring ${him} has stopped. `; diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 21a0834732bb822b227b2965885d841ff0fb8a56..94dc58a4023e72c2bafcdc5c8fc1187e1841facc 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -778,10 +778,11 @@ App.UI.SlaveSummaryRenderers = function() { * @returns {void} */ origins: function(slave, c) { - const para = helpers.makeParagraph(c); - para.classList.add("gray"); - const pronouns = getPronouns(slave); - para.textContent = `${slave.origin.replace(/\$([A-Z]?[a-z]+)/g, (match, cap1) => pronouns[cap1] || match)}`; + if (typeof slave.origin === "string") { + const para = helpers.makeParagraph(c); + para.classList.add("gray"); + para.textContent = pronounsForSlaveProp(slave, slave.origin); + } }, /** @@ -942,9 +943,7 @@ App.UI.SlaveSummary = function() { } const RABlock = helpers.makeBlock(para); delegates.rulesets(slave, RABlock); - if (slave.origin !== 0) { - delegates.origins(slave, res); - } + delegates.origins(slave, res); return res; }