diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 2939bb60e1b0f26d28ddb2529f83f1d08c9c8956..b0296d9bcb580bab8b04554dc646b37a10ffa8fb 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,9 +2,14 @@ 0.10.7.1-1.5.x +01/11/2019 + + 6 + -now with even more fixes and cleaning + 01/09/2019 - 4 + 5 -more fixes and cleaning 01/08/2019 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 5f20f3ef7dd20ebd0a9ef26a469f71ef40ea8163..b6929a48cc16b4b0bc2c088238635c1c2fe70faf 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -4450,20 +4450,24 @@ window.originPronounReplace = function(slave) { case "She was the private slave of a con artist cult leader before he had to abandon her and flee.": case "You helped her give birth, leaving her deeply indebted to you.": case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.": + /* r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object); r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object)); + */ return r; default: + /* r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive); r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive)); + */ return r; } }; @@ -15151,7 +15155,7 @@ window.DefaultRules = (function() { if ((rule.collar !== undefined) && (rule.collar != "no default setting")) { if ((slave.collar !== rule.collar)) { r += '<br>'; - if ((rule.collar == "preg biometrics" && slave.preg <= -1)) { + if (rule.collar == "preg biometrics" && slave.preg <= -1 && slave.ovaries === 0 && slave.mpreg === 0) { slave.collar = "none"; r += `${slave.slaveName} cannot utilize preg biometrics. `; } else if ((rule.collar == "massive dildo gag" && slave.oralSkill <= 50)) { @@ -18511,6 +18515,7 @@ window.rulesAssistantOptions = (function() { const hcollars = []; setup.harshCollars.forEach(item => { if (item.fs === "seeage" && V.seeAge === 0) return; + else if (item.fs === "seePreg" && V.seePreg === 0) return; else if (item.rs === "buyGag" && V.toysBoughtGags !== 1) return; else hcollars.push([item.name, item.value]); }); diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index c0129c3c92ad6c01e4f3793c9ac617c47012c600..24934d79dc667f2682a9eec9b06fb4d03e8cbe01 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -2036,7 +2036,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do {name: "Tight steel", value: "tight steel"}, {name: "Cruel retirement counter", value: "cruel retirement counter", fs: "seeage"}, {name: "Uncomfortable leather", value: "uncomfortable leather"}, - {name: "Pregnancy biometrics", value: "preg biometrics"}, + {name: "Pregnancy biometrics", value: "preg biometrics", fs: "seePreg"}, {name: "Shock punishment", value: "shock punishment"}, {name: "Dildo gag", value: "dildo gag"}, {name: "Massive dildo gag", value: "massive dildo gag", rs: "buyGag"}, diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index 3baf4a4b50e69a4af0df9df89f643ad1d805065e..af07393eebbf579a80216f577d9178842e6d427f 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -358,7 +358,7 @@ window.DefaultRules = (function() { if ((rule.collar !== undefined) && (rule.collar != "no default setting")) { if ((slave.collar !== rule.collar)) { r += '<br>'; - if ((rule.collar == "preg biometrics" && slave.preg <= -1)) { + if (rule.collar == "preg biometrics" && slave.preg <= -1 && slave.ovaries === 0 && slave.mpreg === 0) { slave.collar = "none"; r += `${slave.slaveName} cannot utilize preg biometrics. `; } else if ((rule.collar == "massive dildo gag" && slave.oralSkill <= 50)) { diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw index cdac390187a1f2bc127b30a8dd963bed99f287eb..f47aba1563b6d3a640732a4ac469f0a4833368ed 100644 --- a/src/js/rulesAssistantOptions.tw +++ b/src/js/rulesAssistantOptions.tw @@ -1239,6 +1239,7 @@ window.rulesAssistantOptions = (function() { const hcollars = []; setup.harshCollars.forEach(item => { if (item.fs === "seeage" && V.seeAge === 0) return; + else if (item.fs === "seePreg" && V.seePreg === 0) return; else if (item.rs === "buyGag" && V.toysBoughtGags !== 1) return; else hcollars.push([item.name, item.value]); }); diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index 982e9bf3f96e157390e09ea2bb58b6ae0ae31ffa..a8f4d647cc0faf766f4550fac3d6dea94235df25 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -1219,20 +1219,24 @@ window.originPronounReplace = function(slave) { case "She was the private slave of a con artist cult leader before he had to abandon her and flee.": case "You helped her give birth, leaving her deeply indebted to you.": case "You purchased her from a King after she expressed knowledge of the prince's affair with another servant.": + /* r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.object); r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.object)); + */ return r; default: + /* r = r.replace(/(?<=\s)herself(?=\s|,|\.|;|\?|!)/g, slave.objectReflexive); r = r.replace(/(?<=\s|^)Herself(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.objectReflexive)); r = r.replace(/(?<=\s)she(?=\s|,|\.|;|\?|!)/g, slave.pronoun); r = r.replace(/(?<=\s|^)She(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.pronoun)); r = r.replace(/(?<=\s)her(?=\s|,|\.|;|\?|!)/g, slave.possessive); r = r.replace(/(?<=\s|^)Her(?=\s|,|\.|;|\?|!)/g, capFirstChar(slave.possessive)); + */ return r; } }; diff --git a/src/pregmod/seDeath.tw b/src/pregmod/seDeath.tw index 861e0dd7d4889a11322cb71458ead8dd8c96bafe..1d4d3e82cb37cd64444017d8c6b7799f5b51c67c 100644 --- a/src/pregmod/seDeath.tw +++ b/src/pregmod/seDeath.tw @@ -1,4 +1,4 @@ -:: SE Death [nobr] +:: SE Death [nobr] <<set $nextButton = "Continue", $nextLink = "Scheduled Event">> @@ -23,6 +23,11 @@ <<set _killedSlaves.push(_slave)>> <</switch>> <</foreach>> +<<if _killedSlaves.length == 0>> + /* if something beats this to the slaves, this should kick the player along instead of leaving them at a blank screen */ + <<set $slaveDeath = 0>> + <<goto "Scheduled Event">> +<</if>> <<foreach _slave of _killedSlaves>> <<set $activeSlave = _slave>> <<include "Remove activeSlave">> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index dfbb6af83bf4cb5d5d7c682e674e9bb235dfaa11..b34f0a06bc6b3e8d42db0721149211e5beb58026 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -954,7 +954,7 @@ | <<link "Cruel retirement counter">><<set $activeSlave.collar = "cruel retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>> <</if>> | <<link "Uncomfortable leather">><<set $activeSlave.collar = "uncomfortable leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>> - <<if $activeSlave.preg > -1 && $seePreg != 0>> + <<if $activeSlave.preg > -1 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $seePreg != 0>> | <<link "Pregnancy biometrics">><<set $activeSlave.collar = "preg biometrics">><<replace "#collar">>$activeSlave.collar<</replace>><</link>> <</if>> | <<link "Shock punishment">><<set $activeSlave.collar = "shock punishment">><<replace "#collar">>$activeSlave.collar<</replace>><</link>> diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw index dbc25bd77563bd71cec9aa4a9106df655bfb8abf..93cc0311d09dd7889dd09e1ee4eecd254504da87 100644 --- a/src/uncategorized/wardrobeUse.tw +++ b/src/uncategorized/wardrobeUse.tw @@ -847,7 +847,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.'' <<replace "#collar">>$activeSlave.collar<</replace>> <<replace "#collarDescription">><br>//<<collarDescription>>//<</replace>> <</link>> -<<if $activeSlave.preg > -1>> +<<if $activeSlave.preg > -1 && ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && $seePreg != 0>> | <<link "Pregnancy biometrics">> <<set $activeSlave.collar = "preg biometrics">> <<replace "#collar">>$activeSlave.collar<</replace>>