From d2e7c39c60d747e26f9ae9ea815d38c411c7c9ac Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Tue, 23 Mar 2021 01:06:21 -0400
Subject: [PATCH] More minor fixes and tweaks

---
 src/events/scheduled/sePCBirthday.desc.js | 12 ++-----
 src/interaction/siFinancial.js            |  3 +-
 src/js/slaveExpenses.js                   |  6 ++--
 src/npc/interaction/fAnimal.js            | 44 ++++++++++-------------
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/src/events/scheduled/sePCBirthday.desc.js b/src/events/scheduled/sePCBirthday.desc.js
index 2193a9ffb4e..22f4aa6efb5 100644
--- a/src/events/scheduled/sePCBirthday.desc.js
+++ b/src/events/scheduled/sePCBirthday.desc.js
@@ -89,9 +89,9 @@ App.Events.pcBirthday.Desc = (function(bday) {
 					body, `;
 
 				if (data.planner.slave.boobs > 100) {
-					html += `${data.planner.pn.his} exposed nipples gliding delicately over your chest.`;
+					html += `${data.planner.pn.his} exposed nipples gliding delicately over your chest. `;
 				} else if (data.planner.can.pen()) {
-					html += `${data.planner.pn.his} engorged dick coming to a rest on your crotch.`;
+					html += `${data.planner.pn.his} engorged dick coming to a rest on your crotch. `;
 				}
 
 				html += `${data.planner.pn.She} brings ${data.planner.pn.his} mouth to your ear and whispers a soft and sensual <em>"Happy birthday, ${data.planner.slave.custom.title}"</em>
@@ -378,14 +378,12 @@ App.Events.pcBirthday.Desc = (function(bday) {
 				${V.assistant.personality ? `"Aye aye, cap'n!"` : `"As you wish."`}
 				Your assistant knows plenty about what you consider a successful ${V.arcologies[0].name} party. You leave the details up to ${data.assistPN.her}.
 			</p>
-			<hr>
 			<p>
 				It wasn't long before ${V.assistant.name} shot you a message with the details. All you have to do was be there, ${data.assistPN.she} said. You stand within your
 				closet deciding what to wear.
 			</p>`;
 
 			const after = `
-			<hr>
 			<p>
 				That night, you tell yourself to do something special for ${V.assistant.name}, just before you drift off to sleep from exhaustion in a pile of assorted
 				slaves.
@@ -434,7 +432,6 @@ App.Events.pcBirthday.Desc = (function(bday) {
 			</p>`;
 
 			const after = `
-			<hr>
 			<p>
 				That night, you tell yourself to do something special for ${data.planner.slave.slaveName}, and stroke ${data.planner.pn.his} hair just before the two of
 				you drift off to sleep from exhaustion in a pile of assorted slaves.
@@ -798,8 +795,7 @@ App.Events.pcBirthday.Desc = (function(bday) {
 			}
 
 			html += `
-			</p>
-			<hr>`;
+			</p>`;
 
 			if (V.PC.dick) {
 				html += this.renderPartyScene_PCBones(data);
@@ -1067,7 +1063,6 @@ App.Events.pcBirthday.Desc = (function(bday) {
 		 */
 		renderStrangerScene_PCBones: function(data) {
 			let html = `
-			<hr>
 			<p>
 				Her wrists bound in straps behind her back, her mouth now knows exactly how big your dong is. You sit at the edge of your bed, where she
 				kneels on the floor before you, her head bobbing in your lap. Your fingers splay through her soft, black hair as you hold her head. She
@@ -1143,7 +1138,6 @@ App.Events.pcBirthday.Desc = (function(bday) {
 		 */
 		renderStrangerScene_PCGetsBoned: function(data) {
 			let html = `
-			<hr>
 			<p>
 				Her wrists bound in straps behind her back, she is helpless to do more than watch you engulf her cock in your mouth. Your hands explore her
 				torso and fondle her tits, which fit comfortably in the squeeze of your palms. It wasn't long into your flirting session that you noticed a
diff --git a/src/interaction/siFinancial.js b/src/interaction/siFinancial.js
index eb574783a42..9042bc26b3c 100644
--- a/src/interaction/siFinancial.js
+++ b/src/interaction/siFinancial.js
@@ -1,4 +1,5 @@
-App.UI.SlaveInteract.financial = function(slave) {
+
+App.UI.SlaveInteract.financial = function (slave) {
 	const el = new DocumentFragment();
 	let r;
 	let linkArray;
diff --git a/src/js/slaveExpenses.js b/src/js/slaveExpenses.js
index 8119ae130c1..08b42f93fee 100644
--- a/src/js/slaveExpenses.js
+++ b/src/js/slaveExpenses.js
@@ -112,7 +112,7 @@ globalThis.slaveImpactLongTerm = function(slave) {
 			text += ` with you, ${he} has cost `;
 			div.append(text);
 			div.append(App.UI.DOM.cashFormat(slave.lifetimeCashExpenses));
-			div.append(`.`);
+			App.UI.DOM.appendNewElement("span", div, `.`, "red");
 			_Expense = slave.lifetimeCashExpenses;
 		} else {
 			div.append(`You have no record of ${him} costing you any ¤.`);
@@ -138,7 +138,7 @@ globalThis.slaveImpactLongTerm = function(slave) {
 			text += ` with you, ${he} has earned `;
 			div.append(text);
 			div.append(App.UI.DOM.cashFormat(slave.lifetimeCashIncome));
-			div.append(`.`);
+			App.UI.DOM.appendNewElement("span", div, `.`, "cash");
 			_Income = slave.lifetimeCashIncome;
 		} else {
 			div.append(`You have no record of ${him} making you any ¤.`);
@@ -159,7 +159,7 @@ globalThis.slaveImpactLongTerm = function(slave) {
 		} else {
 			div.append(`${he} has cost you `);
 			div.append(App.UI.DOM.cashFormat(_Income + _Cost + _Expense));
-			div.append(`.`);
+			App.UI.DOM.appendNewElement("span", div, `.`, "red");
 		}
 		frag.append(div);
 
diff --git a/src/npc/interaction/fAnimal.js b/src/npc/interaction/fAnimal.js
index 8461297298e..0ac3524eef1 100644
--- a/src/npc/interaction/fAnimal.js
+++ b/src/npc/interaction/fAnimal.js
@@ -257,9 +257,8 @@ App.Interact.fAnimal = function(slave, type) {
 		}
 
 		function consummationDevoted() {
-			const
-				mainSpan = document.createElement("span"),
-				r = [];
+			const mainSpan = document.createElement("span");
+			const r = [];
 
 			if (act === Acts.ORAL) {
 				r.push(`You have ${him} kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock and begins to give it a few tentative licks before finally putting it in ${his} mouth. `);
@@ -333,9 +332,8 @@ App.Interact.fAnimal = function(slave, type) {
 		}
 
 		function consummationNondevoted() {
-			const
-				mainSpan = document.createElement("span"),
-				r = [];
+			const mainSpan = document.createElement("span");
+			const r = [];
 
 			if (act === Acts.ORAL) {
 				r.push(`You tell ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave hesitantly reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock, and, after taking a moment to steel ${his} resolve, begins to give it a few reluctant licks before putting it in ${his} mouth. `);
@@ -409,9 +407,8 @@ App.Interact.fAnimal = function(slave, type) {
 		}
 
 		function consummationNonresistant() {
-			const
-				mainSpan = document.createElement("span"),
-				r = [];
+			const mainSpan = document.createElement("span");
+			const r = [];
 
 			if (act === Acts.ORAL) {
 				r.push(`You force ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} waits, showing little concern when the slave reluctantly reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, ${slave.slaveName} takes its cock and begins to give it a few tentative licks before finally putting it in ${his} mouth. `);
@@ -485,9 +482,8 @@ App.Interact.fAnimal = function(slave, type) {
 		}
 
 		function consummationResistant() {
-			const
-				mainSpan = document.createElement("span"),
-				r = [];
+			const mainSpan = document.createElement("span");
+			const r = [];
 
 			if (act === Acts.ORAL) {
 				r.push(`You have to physically force ${him} to kneel on the floor before calling in the ${animal.name}. The beast slowly saunters up to the slave where ${he} is restrained, showing little concern when another slave reaches out and begins masturbating it to begin the process of getting the animal hard. Once the ${animal.name} is hard enough, the slave takes its cock and lines it up with ${slave.slaveName}'s mouth. The animal needs no prompting, and thrusts itself into ${his} ring-gagged mouth. `);
@@ -587,9 +583,8 @@ App.Interact.fAnimal = function(slave, type) {
 	// MARK: Completion Function
 
 	function completion() {
-		const
-			mainSpan = document.createElement("span"),
-			r = [];
+		const mainSpan = document.createElement("span");
+		const r = [];
 
 		switch (animal) {
 			case V.active.canine:
@@ -729,9 +724,8 @@ App.Interact.fAnimal = function(slave, type) {
 	}
 
 	function cleanUp() {
-		const
-			mainSpan = document.createElement("span"),
-			r = [];
+		const mainSpan = document.createElement("span");
+		const r = [];
 
 		if (act !== Acts.ORAL) {
 			if (act === Acts.VAGINAL) {
@@ -824,9 +818,8 @@ App.Interact.fAnimal = function(slave, type) {
 	// MARK: Virginity Check Functions
 
 	function virginityCheck(type) {
-		const
-			mainSpan = document.createElement("span"),
-			virginityLossSpan = App.UI.DOM.makeElement("span", '', ["virginity", "loss"]);
+		const mainSpan = document.createElement("span");
+		const virginityLossSpan = App.UI.DOM.makeElement("span", '', ["virginity", "loss"]);
 
 		switch (type) {
 			case Acts.VAGINAL:
@@ -853,11 +846,10 @@ App.Interact.fAnimal = function(slave, type) {
 	}
 
 	function virginityEffects(type) {
-		const
-			mainSpan = document.createElement("span"),
-			devotionSpan = document.createElement("span"),
-			trustSpan = document.createElement("span"),
-			healthSpan = App.UI.DOM.makeElement("span", '', ["health", "dec"]);
+		const mainSpan = document.createElement("span");
+		const devotionSpan = document.createElement("span");
+		const trustSpan = document.createElement("span");
+		const healthSpan = App.UI.DOM.makeElement("span", '', ["health", "dec"]);
 
 		switch (type) {
 			case Acts.VAGINAL:
-- 
GitLab