diff --git a/js/artInfrastructure.js b/js/artInfrastructure.js index b9d973164398cf69a43072c40f6f23ff6eb50a37..c709c72c0349619ae38fe5af057bf1af9e8c43b4 100644 --- a/js/artInfrastructure.js +++ b/js/artInfrastructure.js @@ -60,6 +60,10 @@ App.Art.SvgQueue = class { add(id) { const res = this._cache.get(id); let clones = []; + if (!res) { + console.error(`Missing art resource: ${id}`); + return; + } for (const srcNode of res.children) { /** @type {Element} */ const node = srcNode.cloneNode(true); diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js index 403740eb7320d895652ce361f835730d8044a7d0..e9f4d4f7b597ab16239f8d51448585ea0ecd576b 100644 --- a/src/gui/quicklinks.js +++ b/src/gui/quicklinks.js @@ -177,7 +177,7 @@ App.UI.quickMenu = (function() { }); // setup hotkeys list, upper/lower case is important! - // Due to limitation to the key capture library keys can not be used when they are already used in + // Due to limitation to the key capture library keys cannot be used when they are already used in // src/002-config/mousetrapConfig.js const hotkeys = cleanPassageMapping({ "BG Select": "b", diff --git a/src/js/slaveSummaryHelpers.js b/src/js/slaveSummaryHelpers.js index 9cf5433d3d6e0da4564cba348d6ac72c80528d86..eb8067abc0754dcbd8525c979eb2f035ee14f6af 100644 --- a/src/js/slaveSummaryHelpers.js +++ b/src/js/slaveSummaryHelpers.js @@ -490,7 +490,7 @@ App.UI.SlaveSummaryImpl = function() { */ function long_face(slave, c) { const r = helpers.getNumericRating(data.long.body.face, slave.face + 100); - makeSpan(c, `${r.desc} ${slave.faceShape} face`, r.style, true, slave.face); + makeSpan(c, ` ${r.desc} ${slave.faceShape} face`, r.style, true, slave.face); } /** diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw index 82433127ed2e342cb12c5086aefde2a13c287887..ebb7ec3198702510af01eb6f78bb89c73570b508 100644 --- a/src/npc/acquisition.tw +++ b/src/npc/acquisition.tw @@ -616,7 +616,7 @@ The previous owner seems to have left in something of a hurry. <<set $activeSlave.accent = 0>> <<run SoftenBehavioralFlaw($activeSlave)>> <<run SoftenSexualFlaw($activeSlave)>> - <<set $activeSlave.clothes = "a maid outfit", $activeSlave.collar = "pretty jewelry">> + <<set $activeSlave.clothes = "a nice maid outfit", $activeSlave.collar = "pretty jewelry">> <<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>> <<case "PetiteAdmiration">> <<set $activeSlaveOneTimeMinAge = 14>> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 2bd868154ebf5a215c6cdb158e79b5afa6c94c40..615e7cd7d0e58636430e7d75d5ec1489528ab276 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -255,7 +255,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(_prosperity)>><<if $sh Its leadership sells off some of its ownership to stay afloat. <<set $arcologies[$i].ownership -= 1>> <<set $arcologies[$i].prosperity += 5>> - This leaves its government in control of approximately @@.orange;<<print Math.trunc($arcologies[$i].ownership*_economicUncertainty)>>%@@ of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a @@.tan;<<print Math.trunc($arcologies[$i].minority*_economicUncertainty>>%@@ share<</if>>. + This leaves its government in control of approximately @@.orange;<<print Math.trunc($arcologies[$i].ownership*_economicUncertainty)>>%@@ of the arcology<<if $arcologies[$i].minority > 0>>, against its most prominent competition, with a @@.tan;<<print Math.trunc($arcologies[$i].minority*_economicUncertainty)>>%@@ share<</if>>. <</if>> <</if>> <</if>> diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw index 84029a4857225775fff5959924a99289ceb67169..780e49081c67ccab87e0aa0d91da8e9db09a8102 100644 --- a/src/utility/birthWidgets.tw +++ b/src/utility/birthWidgets.tw @@ -142,7 +142,7 @@ <<if $slaves[$i].fetish == "mindbroken">> <<if $farmyardShows && $seeBestiality>> <<set _roll = random(0, _animals.length)>> - $He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if _S.Farmer>> 0>>_S.Farmer.slaveName<<else>>another slave<</if>> has to pull the animal off of $him and drag $him into the nearest birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName. + $He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if _S.Farmer > 0>>_S.Farmer.slaveName<<else>>another slave<</if>> has to pull the animal off of $him and drag $him into the nearest birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName. <<else>> $He shows no interest in $his coming birth as $he continues <<print either("loading hay bales", "milking a cow", "pulling weeds")>>, until $his contractions become so strong that $he collapses to $his knees. <<if $Farmer > 0>>$Farmer.name<<else>>Another slave<</if>> is at $his side in an instant, pulling $him to $his feet and into a birthing stall. $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName. <</if>> @@ -357,7 +357,7 @@ $He returns to $his bed and strips before slipping into it. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $He is quite experienced in delivering $his cows' children, but $he finds it much more difficult to apply $his knowledge to $himself. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, after a short rest, $he returns to caring for your cows. <<case "be the Farmer">> - $He heads to $his private room before stripping and calling in a couple of nearby slaves to aid $him. Though $he has delivered more than a few of $his livestocks' offspring, delivering $his own proves to be a slightly more difficult ordeal. $He manages, though, and after $his child<<if $slaves[$i].pregType > 1>>ren<</if>>ren are<</else>> is<</if>> taken from $him and $he's had a shower and a short rest, $he returns to looking after $farmyardName. + $He heads to $his private room before stripping and calling in a couple of nearby slaves to aid $him. Though $he has delivered more than a few of $his livestocks' offspring, delivering $his own proves to be a slightly more difficult ordeal. $He manages, though, and after $his child<<if $slaves[$i].pregType > 1>>ren are<</else>> is<</if>> taken from $him and $he's had a shower and a short rest, $he returns to looking after $farmyardName. <<case "be the Wardeness">> <<if $slaves[$i].fetish == "mindbroken">> /* FIXME: can Wardens be mindbroken? */ @@ -1017,6 +1017,7 @@ <</if>> <</if>> +<<case "work as a nanny">> In the middle of <<if $nurseryBabies>>changing a baby's diaper<<else>>cleaning $nurseryName<</if>>, $slaves[$i].slaveName's water breaks. $He hurries into a changing room and assumes a birthing position. <<ClothingBirth>> Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>>. <<if _S.Matron>>_S.Matron.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into a shower to clean up and relax<</if>>.