diff --git a/src/arcologyBuilding/penthouse.js b/src/arcologyBuilding/penthouse.js
index 9f810a8cf8f9f996dcc9ccfb2f191d3fb2727cc5..3b151dcd3dd38985e94453f51195dc9d6f5cdf56 100644
--- a/src/arcologyBuilding/penthouse.js
+++ b/src/arcologyBuilding/penthouse.js
@@ -67,7 +67,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
const desc = `(${numberWithPluralOne(inc.capacity - V.tanks.length, "empty tank")})`;
if (V.readySlaves > 0) {
- wrapper.append(createFacilityDiv(link, desc, App.UI.DOM.makeElement("span", "[!]", "noteworthy")));
+ wrapper.append(createFacilityDiv(link, App.UI.DOM.combineNodes(desc, App.UI.DOM.makeElement("span", "[!]", "noteworthy"))));
} else {
wrapper.append(createFacilityDiv(link, desc));
}
diff --git a/src/descriptions/familySummaries.js b/src/descriptions/familySummaries.js
index 9097ecfa48686fc3b93d292474ecd7e54d240fe6..b23198a38f2ba063cc7912d232f75d57ee26d489 100644
--- a/src/descriptions/familySummaries.js
+++ b/src/descriptions/familySummaries.js
@@ -527,7 +527,7 @@ App.Desc.family = (function() {
parents.push(V.missingTable[V.PC.father]);
}
}
- parents.concat(V.slaves.filter((s) => isParentP(V.PC, s)));
+ parents = parents.concat(V.slaves.filter((s) => isParentP(V.PC, s)));
if (parents.length > 1) {
r.push(`<br>Your parents are <span class="lightgreen">${knownSlave(parents[0].ID)} and ${knownSlave(parents[1].ID)}.</span>`);
diff --git a/src/events/scheduled/pitFight.js b/src/events/scheduled/pitFight.js
index c2beeb04f384f153ea884c08f5c8372863c4af37..9735e8a1ade4661c564c877ab0a79e827a13041a 100644
--- a/src/events/scheduled/pitFight.js
+++ b/src/events/scheduled/pitFight.js
@@ -16,19 +16,18 @@ App.Facilities.Pit.fight = function(lethal) {
fighters.push(S.Bodyguard.ID, V.pit.slaveFightingBodyguard);
} else {
if (available.length > 0) {
- if (S.Bodyguard) {
- available.filter(id => id !== S.Bodyguard.ID);
-
- if (V.pit.bodyguardFights) {
- fighters.push(S.Bodyguard.ID);
- }
+ // first fighter
+ if (S.Bodyguard && V.pit.bodyguardFights) {
+ available.delete(S.Bodyguard.ID);
+ fighters.push(S.Bodyguard.ID);
+ } else {
+ fighters.push(available.pluck());
}
+ // second fighter
if (available.length > 1 && !V.pit.animal) {
fighters.push(available.pluck());
}
-
- fighters.push(available.pluck());
} else {
throw new Error(`Pit fight triggered with ${V.pit.fighterIDs.length} fighters.`); // should technically never be triggered
}
diff --git a/src/events/scheduled/sePCBirthday.desc.js b/src/events/scheduled/sePCBirthday.desc.js
index b08fe9d143fe8834df06727bcd7c942af4a300a0..126f0956f6492b9f1c331c9c8d7c8c30ae09d7ed 100644
--- a/src/events/scheduled/sePCBirthday.desc.js
+++ b/src/events/scheduled/sePCBirthday.desc.js
@@ -754,7 +754,6 @@ App.Events.pcBirthday.Desc = (function(bday) {
* @param {App.Events.pcBirthday.EventData} data
*/
renderPartyScene_Arrival: function(data) {
-
let html = `
<p>
Approaching the multi-purpose conference room, you can hear `;
@@ -1040,7 +1039,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
html += `Jury's still out on whether you're missing a dong. But I'm hoping you are.`;
}
- `"
+ html += `"
She grazes a palm toward your inner thigh.
</p>`;
diff --git a/src/facilities/ads.js b/src/facilities/ads.js
index 8494ed0c014a0ca0c1886618efb15300bc44a70f..3bdf35f2471472058f5a769152574aec937ee927 100644
--- a/src/facilities/ads.js
+++ b/src/facilities/ads.js
@@ -356,19 +356,7 @@ App.Ads.report = function(building, preview = false) {
return t;
}
- function payVarietyBonus() {
- if (!preview) {
- if (building === "brothel") {
- const adsIncome = DL*random(20, 30);
- V.facility[building].adsIncome += adsIncome;
- cashX(adsIncome, (building + "Ads"));
- } else if (building === "club") {
- repX(DL*random(5, 10), (building + "Ads"));
- }
- }
- }
-
- function payAdBonus() {
+ function payBonus() {
if (!preview) {
if (building === "brothel") {
const adsIncome = DL*random(20, 30);
@@ -407,7 +395,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.assetSize);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers a `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -432,7 +420,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.stacked === pref) && (girls === adCampaign.stacked)) {
- payAdBonus();
+ payBonus();
t += `Its advertising for `;
if (adCampaign.stacked === 1) {
t += `stacked `;
@@ -544,7 +532,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.preg);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers a `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -569,7 +557,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.preg === pref) && (girls === adCampaign.preg)) {
- payAdBonus();
+ payBonus();
t += `Its advertising for `;
if (adCampaign.preg === 1) {
t += `pregnant `;
@@ -682,7 +670,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.mods);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -707,7 +695,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.modded === pref) && (girls === adCampaign.modded)) {
- payAdBonus();
+ payBonus();
t += `Its advertising for `;
if (adCampaign.modded === 1) {
t += `heavily modified `;
@@ -819,7 +807,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.assetOrigin);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -844,7 +832,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.implanted === pref) && (girls === adCampaign.implanted)) {
- payAdBonus();
+ payBonus();
t += `Its advertising for `;
if (adCampaign.implanted === 1) {
t += `implanted or surgically improved `;
@@ -956,7 +944,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.genitalia);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers a `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -987,7 +975,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.XX === pref) && (girls === adCampaign.XX)) {
- payAdBonus();
+ payBonus();
t += `Its advertising for girls `;
if (adCampaign.XX === 1) {
t += `with pussies `;
@@ -1104,7 +1092,7 @@ App.Ads.report = function(building, preview = false) {
} else {
let variety = adMgr.varietyBonus(App.Ads.Categories.age);
if (variety === 1) {
- payVarietyBonus();
+ payBonus();
t += `The ${building} offers girls `;
if (building === "brothel") {
t+= `<span class="yellowgreen">`;
@@ -1129,7 +1117,7 @@ App.Ads.report = function(building, preview = false) {
if (pref === 0) { /* customers don't care*/
} else if (adCampaign.spending > 0) {
if ((adCampaign.age === pref) && (girls === adCampaign.age)) {
- payAdBonus();
+ payBonus();
t += `Its advertising matches most customers' age preferences and the girls in the ${building} match the ages as advertised. `;
t += reputation(building, 1, preview);
} else if ((adCampaign.age === pref) && (girls !== adCampaign.age)) {