From 8f9d87d190d9534d8d70a8808da0096d23e6a152 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Thu, 15 Aug 2019 21:14:14 -0500 Subject: [PATCH] Misc --- FCHost/fchost/fchost_handler_win.cc | 2 +- src/facilities/nursery/nurseryWidgets.js | 2 +- src/npc/fDance.tw | 4 ++-- src/pregmod/beastFuck.tw | 6 +++--- src/pregmod/rePregInventor.tw | 2 +- src/uncategorized/walkPastList.tw | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FCHost/fchost/fchost_handler_win.cc b/FCHost/fchost/fchost_handler_win.cc index 6089e0bbf04..106787eb5f8 100644 --- a/FCHost/fchost/fchost_handler_win.cc +++ b/FCHost/fchost/fchost_handler_win.cc @@ -13,7 +13,7 @@ void FCHostHandler::PlatformTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title) { CefWindowHandle hwnd = browser->GetHost()->GetWindowHandle(); - + static bool haveSetIcon = false; if (!haveSetIcon) { diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js index c3b3148fafc..4305ef8ed45 100644 --- a/src/facilities/nursery/nurseryWidgets.js +++ b/src/facilities/nursery/nurseryWidgets.js @@ -15548,7 +15548,7 @@ App.Facilities.Nursery.childList = function() { r += App.UI.passageLink(`${child.targetLocation === "slavery" ? `"Introduce ${him} to life as a slave"` : `"Set ${him} free"`}`, "Nursery Retrieval Workaround", V.readySlave = cribs.pluck([i], [i])); } else { r += `<br>`; - r += `${He} is to continue staying in ${V.nurseryName} for another ${years(weeksLeft)}. + r += `${He} is to continue staying in ${V.nurseryName} for another ${years(weeksLeft)}. ${He} is destined for ${child.targetLocation} once ${he} is of age. `; } } diff --git a/src/npc/fDance.tw b/src/npc/fDance.tw index 4117c499c4e..a5b11dbd83d 100644 --- a/src/npc/fDance.tw +++ b/src/npc/fDance.tw @@ -1577,9 +1577,9 @@ End clothing-specific stripping */ Once the last piece of clothing has hit the floor you let your little slut dance naked a little while longer while you finish your last report. Once you have gotten enough of $his dancing you snap your fingers to call your slave over. <<if ($activeSlave.devotion > 80)>> - Your slave hurries to your side and drops to $his knees. $He gladly kneels at your feet, looking up at $his <<= WrittenMaster()>> in adoration. + Your slave hurries to your side and drops to $his knee<<if hasBothLegs($activeSlave)>>s<</if>>. $He gladly kneels at your feet, looking up at $his <<= WrittenMaster()>> in adoration. <<elseif ($activeSlave.devotion > 20)>> - Your slave hurries to your side and drops to $his knees. $He obediently kneels at your feet. + Your slave hurries to your side and drops to $his knee<<if hasBothLegs($activeSlave)>>s<</if>>. $He obediently kneels at your feet. <<elseif ($activeSlave.devotion < -50)>> <<if ($activeSlave.trust < -50)>> $He hurries frantically to your side, and drops quivering to the floor at your feet hoping $he was quick enough to avoid diff --git a/src/pregmod/beastFuck.tw b/src/pregmod/beastFuck.tw index 88b0d98b1a7..bdb2958396d 100644 --- a/src/pregmod/beastFuck.tw +++ b/src/pregmod/beastFuck.tw @@ -113,10 +113,10 @@ <<if canWalk($activeSlave)>> <<if $activeSlave.devotion > -20>> - <<if ($activeSlave.devotion <= 20) && ($activeSlave.fetish != "mindbroken") && ($activeSlave.fetish != "masochistic") && ($activeSlave.fetish != "humiliation") && ($activeSlave.sexualQuirk != "perverted") && ($activeSlave.behavioralQuirk != "sinful")>>and only the threat of worse punishment prevents $him from running out of the room.<</if>> You have $him <<if ($activeSlave.clothes != "no clothing")>>take off $his clothing and <</if>>kneel down on the floor with $his ass in the air, + <<if ($activeSlave.devotion <= 20) && ($activeSlave.fetish != "mindbroken") && ($activeSlave.fetish != "masochistic") && ($activeSlave.fetish != "humiliation") && ($activeSlave.sexualQuirk != "perverted") && ($activeSlave.behavioralQuirk != "sinful")>>and only the threat of worse punishment prevents $him from <<if canWalk($activeSlave)>>running<<else>>trying to run<</if>> out of the room.<</if>> You have $him <<if ($activeSlave.clothes != "no clothing")>>take off $his clothing and <</if>>kneel down on the floor with $his ass in the air, <<else>> - and you have to physically prevent $him from running out of the room. You <<if ($activeSlave.clothes != "no clothing")>>force $him to take off $his $activeSlave.clothes and <</if>>restrain $him on the floor with $his ass in the air — all the while ignoring $his screams and pleas for mercy - -<</if>> + and you have to physically prevent $him from <<if canWalk($activeSlave)>>running<<else>>trying to run<</if>> out of the room. You <<if ($activeSlave.clothes != "no clothing")>>force $him to take off $his $activeSlave.clothes and <</if>>restrain $him on the floor with $his ass in the air — all the while ignoring $his screams and pleas for mercy — + <</if>> <<else>> You <<if ($activeSlave.clothes != "no clothing")>>take off $his $activeSlave.clothes and <</if>>place $him on the ground with a cushion under $his hips, $his ass in the air, <</if>> diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw index 557aa9850e4..a8f762dcf02 100644 --- a/src/pregmod/rePregInventor.tw +++ b/src/pregmod/rePregInventor.tw @@ -416,7 +416,7 @@ <<elseif $arcologies[0].FSAztecRevivalist > 60>> clad only in exotic feathers, <<elseif $arcologies[0].FSEgyptianRevivalist > 60>> - dressed in ankle length tarkhans made of brass and turquoise colored beads, + dressed in <<if hasAnyLegs($activeSlave)>>ankle-length<<else>>long<</if>> tarkhans made of brass and turquoise colored beads, <<elseif $arcologies[0].FSEdoRevivalist > 60>> dressed in skimpy noh theatre costumes, <<elseif $arcologies[0].FSArabianRevivalist > 60>> diff --git a/src/uncategorized/walkPastList.tw b/src/uncategorized/walkPastList.tw index aa8203b3411..f0a82dee941 100644 --- a/src/uncategorized/walkPastList.tw +++ b/src/uncategorized/walkPastList.tw @@ -20,11 +20,11 @@ Target: <span id="target">$target</span><br> <<link "Butt">> <<set $target = "FButt">> <<goto "Walk Past List">> -<</link>> | +<</link>> | <<link "Anus">> <<set $target = "FAnus">> <<goto "Walk Past List">> -<</link>> | +<</link>> | <<link "Vagina">> <<set $target = "FVagina">> <<goto "Walk Past List">> -- GitLab