From 36ec1f2e649994fb64bfea648224564f18b7a4a8 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 25 Aug 2018 00:48:33 -0400
Subject: [PATCH] Fixes
---
src/pregmod/killedSlave.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 7 +++++--
src/uncategorized/RESS.tw | 2 +-
src/utility/descriptionWidgetsFlesh.tw | 6 +++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index 1a1d0f952a2..e8f79a32193 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -77,6 +77,6 @@ rings through the room. You have another servant clean up the mess as you contin
$He nods $his head and straightens up, as though preparing $himself for the fight for $his life.
<</if>>
- /*TODO: Connect this to the Pit, have a end-of-week event between the Bodyguard and the slave*/
+ /*TODO: Connect this to the Pit, have an end-of-week event between the Bodyguard and the slave*/
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index f73479dba5a..24e67ac880a 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3148,8 +3148,6 @@ Setting missing slave variables:
<<for _bci = 0; _bci < $genePool.length; _bci++>>
<<set _Slave = $genePool[_bci]>>
- <<if ndef _Slave.origSkin>><<set _Slave.origSkin = _Slave.skin>><</if>>
- <<if ndef _Slave.origRace>><<set _Slave.origRace = _Slave.race>><</if>>
<<if $genePool.map(function(s) { return s.ID; }).count(_Slave.ID) > 1>> /* first check for duplicate IDs, keep the first entry and delete the others */
<<for _bci2 = _bci + 1; _bci2 < $genePool.length; _bci2++>>
@@ -3182,7 +3180,12 @@ Setting missing slave variables:
<</if>>
<<if _dontDeleteMe == 0>>
<<set $genePool.deleteAt(_bci), _bci-->>
+ <<continue>>
<</if>>
+
+ <<if ndef _Slave.origSkin>><<set _Slave.origSkin = _Slave.skin>><</if>>
+ <<if ndef _Slave.origRace>><<set _Slave.origRace = _Slave.race>><</if>>
+
<<set $genePool[_bci] = _Slave>>
<</for>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index a4a490858d4..2af50b50238 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1506,7 +1506,7 @@ You come face to face with <<EventNameLink $activeSlave>> in a hallway of your p
<<if !canTalk($activeSlave)>>
$He uses gestures to apologize for her rudeness, and then gets to $his knees so $he can use $his hands to gesture more clearly. $His hands are shaky as $he begs, making two false starts before unmistakably gesturing to ask you to cut $his balls off. Once $he sees that you understand, $he begins to cry openly. $He gestures that $he can barely get off wearing her chastity cage, that it hurts when $he does, and that $he's constantly oppressed by the need for release. $He thinks that it would be easier to be soft all the time, so $he could climax without discomfort. $He begs hard, and promises to be a good little bitch.
<<else>>
- "Plea<<s>>e, <<Master>>," the prostrate slave <<say>>s shakily, sounding like $he's on the verge of tears. "P-plea<<s>>e cut my ball<<s>> off." <<if canHear($activeSlave)Hearing $himself <<say>> it, $he<<else>>$He<</if>> begins to cry openly. "I c-can't t-take it anymore. I can b-barely get off wearing thi<<s>> cage on my dick, and when I d-do, it h-hurt<<s>>," $he sobs. "I need to g-g-get off <<s>>-<<s>>o bad. Plea<<s>>e, plea<<s>>e, if I were <<s>>oft all the time, I wouldn't get hard, <<s>>o I could come wh-whenever." $He looks up at you in supplication, tears streaking her face. "Plea<<s>>e, <<Master>>! I'll be <<s>>-<<s>>uch a good little bitch, I promi<<s>>e!"
+ "Plea<<s>>e, <<Master>>," the prostrate slave <<say>>s shakily, sounding like $he's on the verge of tears. "P-plea<<s>>e cut my ball<<s>> off." <<if canHear($activeSlave)>>Hearing $himself <<say>> it, $he<<else>>$He<</if>> begins to cry openly. "I c-can't t-take it anymore. I can b-barely get off wearing thi<<s>> cage on my dick, and when I d-do, it h-hurt<<s>>," $he sobs. "I need to g-g-get off <<s>>-<<s>>o bad. Plea<<s>>e, plea<<s>>e, if I were <<s>>oft all the time, I wouldn't get hard, <<s>>o I could come wh-whenever." $He looks up at you in supplication, tears streaking her face. "Plea<<s>>e, <<Master>>! I'll be <<s>>-<<s>>uch a good little bitch, I promi<<s>>e!"
<</if>>
<<case "used whore">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 0e465b57bd9..5e4e45c18c6 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -14151,9 +14151,9 @@ $He has
<<if ($seeRace == 1)>>
<<if $activeSlave.race != $activeSlave.origRace>>
<<if $PC.slaving >= 50>>
- Thanks to your experience in buying and selling slaves, you can easily tell that $he has recieved plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
+ Thanks to your experience in buying and selling slaves, you can easily tell that $he has received plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
<<elseif $PC.medicine >= 50>>
- Thanks to your medical experience, you can easily tell that $he has recieved plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
+ Thanks to your medical experience, you can easily tell that $he has received plastic surgery to appear <<print $activeSlave.race>>; $his original race is currently unknown to you.
<<elseif $PC.medicine >= 30 || $PC.slaving >= 30>>
Something about some of $his more obviously <<print $activeSlave.race>> features strikes you as odd.
<</if>>
@@ -14171,7 +14171,7 @@ $He has
<<else>>
<<if ($seeRace == 1)>>
<<if $activeSlave.race != $activeSlave.origRace>>
- $He has recieved plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
+ $He has received plastic surgery to appear <<print $activeSlave.race>>; $he is originally <<print $activeSlave.origRace>>.
<</if>>
<</if>>
<<if $activeSlave.skin != $activeSlave.origSkin>>
--
GitLab