diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9df8e1e59cff5bded3eb10fd3ad710fca03b411f..f9f93b3c723d494afa0b09625f867c1c584e21d8 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.7.x +9/07/2018 + + 20 + -fixes + -increased costs for hyper pregnant slaves + 9/06/2018 19 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 12524d14bbce300da894a7969b506a4230a4acc1..263d687197f233718597c7d467bd34074cb30839 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -2240,6 +2240,15 @@ window.getSlaveCost = function(s) { // TODO: Include them here anyway? } else { cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + if (s.pregType >= 10) { + cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 30) { + cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 50) { + cost += foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 100) { + cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } } } if(s.diet === 'XX' || s.diet === 'XY' || s.diet === 'fertility') { @@ -14363,6 +14372,7 @@ window.DefaultRules = (function() { } slave.pornFeed = rule.pornFeed; let yesno = slave.pornFeed ? "are now" : "are no longer"; + if (slave.pornFeed === 0) {slave.pornFameSpending = 0}; r += `<br>Highlights of ${slave.slaveName}'s sex life ${yesno} being released.`; } @@ -25361,7 +25371,7 @@ window.GetVignette = function GetVignette(slave) { const He = capFirstChar(he); const His = capFirstChar(his); - if (slave.assignment === "whore" || slave.assignment === "work in the brothel") { + if (slave.assignment === "whore" || slave.assignment === window.Job.BROTHEL || slave.assignment === window.Job.MADAM) { let seed = jsRandom(1, 10); switch (seed) { case 1: @@ -26937,7 +26947,7 @@ window.GetVignette = function GetVignette(slave) { type: "trust", effect: -1, }); - } else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club") { + } else if (slave.assignment === "serve the public" || slave.assignment === window.Job.CLUB || slave.assignment === window.Job.DJ) { let seed = jsRandom(1, 10); switch (seed) { case 1: diff --git a/src/art/artJS.tw b/src/art/artJS.tw index 4c3f3f3cf8cf94e8fab5b3d983a86c3f245f360a..0ee86d89b370ecc493f48bf63e562db38389b280 100644 --- a/src/art/artJS.tw +++ b/src/art/artJS.tw @@ -8,13 +8,13 @@ sizePlacement: Image size/center. */ window.assistantArt = function assistantArt(sizePlacement) { const V = State.variables; - let fileName = "'"; + let fileName = ""; if (V.imageChoice === 0 || V.imageChoice === 1) { if (V.imageChoice === 1) { - fileName += "resources/vector/avatar/"; + fileName += "'resources/vector/avatar/"; } else /* V.imageChoice === 0*/ { - fileName += "resources/renders/assistant "; + fileName += "'resources/renders/assistant "; } switch (V.assistantAppearance) { case "monstergirl": diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 553105cf70ce15856d1d40f024b4ffd3319685d3..e253596a0ae607af628ed5abce3b38e471808a7b 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -378,6 +378,15 @@ Should you be able to surgically attach a penis to your female slaves and starti [[Enable|Intro Summary][$seeHyperPreg = 1]] <</if>> +<br> +<<if ($dangerousPregancy == 0)>> + Advanced pregnancy complications such as miscarriage and premature birth are currently @@.red;DISABLED@@. + [[Enable|Intro Summary][$dangerousPregancy = 1]] +<<else>> + Advanced pregnancy complications such as miscarriage and premature birth are currently @@.cyan;ENABLED@@. + [[Disable|Intro Summary][$dangerousPregancy = 0]] +<</if>> + <br> <<if $seeExtreme == 1>> Extreme content like amputation is ''enabled''. diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 11e3db03ab513c33ec9a96425e4955a1edba1cb4..c5882adcfbe15891e3fdf8de45a33c991eb5e416 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -88,6 +88,11 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef _getFather>> <<set $slaves[_k].pregSource = 0>> <</if>> + <<for _sInit = 0; _sInit < $slaves[_k].womb.length; _sInit++>> + <<if $slaves[_k].womb[_sInit].fatherID > 0>> + <<set $slaves[_k].womb[_sInit].fatherID += 1200000>> + <</if>> + <</for>> <</if>> <</for>> <<set $genePool = ngUpdateGenePool($genePool)>> @@ -267,6 +272,7 @@ You should have received a copy of the GNU General Public License along with thi <<set $seeBestiality = 0>> <<set $seeHyperPreg = 0>> <<set $seePreg = 1>> + <<set $dangerousPregancy = 1>> <<set $seeCircumcision = 1>> <<set $seeAge = 1>> <<set $seeDicks = 25>> @@ -421,6 +427,11 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef _getFather>> <<set $PC.pregSource = 0>> <</if>> + <<for _sInit = 0; _sInit < $PC.womb.length; _sInit++>> + <<if $PC.womb[_sInit].fatherID > 0>> + <<set $PC.womb[_sInit].fatherID += 1200000>> + <</if>> + <</for>> <</if>> <<else>> <<initPC>> diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index 104b39d500fff95588899e10960e8e4728a1813b..bbb761d9ae998ae660e8b8f133416feb73040f32 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -2279,6 +2279,7 @@ window.DefaultRules = (function() { } slave.pornFeed = rule.pornFeed; let yesno = slave.pornFeed ? "are now" : "are no longer"; + if (slave.pornFeed === 0) {slave.pornFameSpending = 0}; r += `<br>Highlights of ${slave.slaveName}'s sex life ${yesno} being released.`; } diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index 76722df46894ec65dc30aea22bf9f5ceb3211b04..8e63c3806f269e40cf2f67f849c143f7fe9b858f 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -449,6 +449,15 @@ window.getSlaveCost = function(s) { // TODO: Include them here anyway? } else { cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + if (s.pregType >= 10) { + cost += foodCost * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 30) { + cost += foodCost * 2 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 50) { + cost += foodCost * 3 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } else if (s.pregType >= 100) { + cost += foodCost * 5 * s.pregType * (s.pregControl === 'speed up' ? 3 : 1); + } } } if(s.diet === 'XX' || s.diet === 'XY' || s.diet === 'fertility') { diff --git a/src/js/vignettes.tw b/src/js/vignettes.tw index 62803f4caabfa78d36aaf13ad687b6502175498d..e6d05ea7c6b18a788c857d987a2c0d692538724c 100644 --- a/src/js/vignettes.tw +++ b/src/js/vignettes.tw @@ -14,7 +14,7 @@ window.GetVignette = function GetVignette(slave) { const He = capFirstChar(he); const His = capFirstChar(his); - if (slave.assignment === "whore" || slave.assignment === "work in the brothel") { + if (slave.assignment === "whore" || slave.assignment === window.Job.BROTHEL || slave.assignment === window.Job.MADAM) { let seed = jsRandom(1, 10); switch (seed) { case 1: @@ -1590,7 +1590,7 @@ window.GetVignette = function GetVignette(slave) { type: "trust", effect: -1, }); - } else if (slave.assignment === "serve the public" || slave.assignment === "serve in the club") { + } else if (slave.assignment === "serve the public" || slave.assignment === window.Job.CLUB || slave.assignment === window.Job.DJ) { let seed = jsRandom(1, 10); switch (seed) { case 1: diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index b97b20350a2879564aad2064285490e7ea0b7531..833dba046a0830f8f458bc02963debf9eaee1b65 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -569,6 +569,9 @@ <<if ndef $seePreg>> <<set $seePreg = 1>> <</if>> +<<if ndef $dangerousPregancy>> + <<set $dangerousPregancy = 1>> +<</if>> <<if ndef $retainCareer>> <<set $retainCareer = 1>> <</if>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 6169a5ca9da7e1a14c21ee46a7955ee7feb7c57e..41d08b6107a5de1cf0d50e71d8750f0d3f597983 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -7679,7 +7679,7 @@ You tell her kindly that you understand, and that $he'll be trained to address t <<case "fearful humiliation">> -<<link "Publicly prove the depths of $gis humiliation to $him">> +<<link "Publicly prove the depths of $his humiliation to $him">> <<EventNameDelink $activeSlave>> <<replace "#result">> You drag a fearful, embarrassed<<if $activeSlave.belly >= 1500>>, <<if $activeSlave.bellyPreg >= 0>>pregnant<<else>>swollen<</if>><</if>> and totally naked $activeSlave.slaveName out into a public hall. A small knot of passersby gather around grinning, enjoying the sight of her nakedness and anticipating a show. To her surprise, you order $him to take a few minutes to recount her life story. $He's hesitant at first, but obeys, only realizing as $he nears the present day what an abject story of degradation and humiliation her life truly is. $He continues shakily, describing in brief her current life, crying a little and trembling with arousal. At a whispered command from you, $he concludes diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 7ddcdf2a4d2168002f10d2633a9f277bb954fd59..e44f1cace713a96b2949c075b00a254da256a43d 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -147,7 +147,7 @@ Shares in your corporation are trading at @@.yellowgreen;<<print cashFormat(Math <<set $oldSharePrice = Math.ceil($sharePrice)>> -You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$personalShares))>>@@ personally while <<print commaNum($publicShares)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$publicShares))>>@@ are publicly held. +You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$personalShares))>>@@ personally while, <<print commaNum($publicShares)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*$publicShares))>>@@ are publicly held. <<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/_totalShares)*100)>> <<set _PublicOwnershipPercentage = Math.trunc(($publicShares/_totalShares)*100)>> <span id="CorpAction"> @@ -162,52 +162,53 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<link "<<print commaNum(1000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@">> <<set $personalShares -= 1000>> <<set $publicShares += 1000>> - <<set $cash += 1000*$sharePrice>> + <<set $cash += Math.ceil($sharePrice*1000)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> <<replace "#CorpAction">> - <br>You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly. + <br>You sold <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price down slightly. <</replace>> <</link>> <<if $personalShares-5000 > $publicShares>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@">> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@">> <<set $personalShares -= 5000>> <<set $publicShares += 5000>> - <<set $cash += 5000*$sharePrice>> + <<set $cash += Math.ceil(($sharePrice*5000)*.95)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> <<replace "#CorpAction">> - <br>You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly. + <br>You sold <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@, driving the share price down slightly. <</replace>> <</link>> <</if>> <<if $personalShares-10000 > $publicShares>> - | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@">> <<set $personalShares -= 10000>> + | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@">> + <<set $personalShares -= 10000>> <<set $publicShares += 10000>> - <<set $cash += 10000*$sharePrice>> + <<set $cash += Math.ceil(($sharePrice*10000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> <<replace "#CorpAction">> - <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(10000*$sharePrice))>>@@" driving the share price down slightly. + <br>You sold <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@, driving the share price down slightly. <</replace>> <</link>> <</if>> <<if $personalShares-15000 > $publicShares>> - | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@">> + | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@">> <<set $personalShares -= 15000>> <<set $publicShares += 15000>> - <<set $cash += 15000*$sharePrice>> + <<set $cash += Math.ceil(($sharePrice*15000)*.85)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> <<replace "#CorpAction">> - <br>You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat. + <br>You sold <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@, driving the share price down somewhat. <</replace>> <</link>> <</if>> <<if $personalShares-20000 > $publicShares>> - | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@">> + | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@">> <<set $personalShares -= 20000>> <<set $publicShares += 20000>> - <<set $cash += 20000*$sharePrice>> + <<set $cash += Math.ceil(($sharePrice*20000)*.8)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99,$PC.trading >= 100 ? 99 : 98)))/100>> <<replace "#CorpAction">> - <br>You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly. + <br>You sold <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@, driving the share price down significantly. <</replace>> <</link>> <</if>> @@ -219,48 +220,49 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<if $personalShares-1000 > $publicShares>> <<link "<<print commaNum(1000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@">> <<set $publicShares += 1000>> - <<set $corpCash += 1000*Math.ceil($sharePrice)>> + <<set $corpCash += Math.ceil(($sharePrice*1000))>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly. + <br>The corporation issued <<print commaNum(1000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price down slightly. <</replace>> <</link>> <<if $personalShares-5000 > $publicShares>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@">> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.9))>>@@">> <<set $publicShares += 5000>> - <<set $corpCash += 5000*Math.ceil($sharePrice)>> + <<set $corpCash += Math.ceil(($sharePrice*5000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@ for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@" driving the share price down slightly. + <br>The corporation issued <<print commaNum(5000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.9))>>@@, driving the share price down slightly. <</replace>> <</link>> <</if>> <<if $personalShares-10000 > $publicShares>> - | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@">> + | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@">> <<set $publicShares += 10000>> - <<set $corpCash += 10000*Math.ceil($sharePrice)>> + <<set $corpCash += Math.ceil(($sharePrice*10000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>The corporation issued <<print commaNum(10000)>> new shares for @@.yellowgreen;<<print cashFormat(Math.ceil(1000*$sharePrice))>>@@ driving the share price down slightly. + <br>The corporation issued <<print commaNum(10000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@, driving the share price down slightly. <</replace>> <</link>> <</if>> <<if $personalShares-15000 > $publicShares>> - | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@">> + | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@">> <<set $publicShares += 15000>> - <<set $corpCash += 15000*Math.ceil($sharePrice)>> + <<set $corpCash += Math.ceil(($sharePrice*15000)*.85)>> <<set $sharePrice = (Math.trunc($sharePrice*random(96,98)))/100>> <<replace "#CorpAction">> - <br>The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@ driving the share price down somewhat. + <br>The corporation issued <<print commaNum(15000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@, driving the share price down somewhat. <</replace>> <</link>> <</if>> <<if $personalShares-20000 > $publicShares>> - | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@">> <<set $publicShares += 15000>> - <<set $corpCash += 20000*Math.ceil($sharePrice)>> + | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@">> + <<set $publicShares += 20000>> + <<set $corpCash += Math.ceil(($sharePrice*20000)*.8)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@ driving the share price down significantly. + <br>The corporation issued <<print commaNum(20000)>> new shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@ driving the share price down significantly. <</replace>> <</link>> <</if>> @@ -273,57 +275,57 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <<if _PublicOwnershipPercentage <= 5>><br>//You cannot make the corporation privately held.// <<else>> /* actions that reduce public ownership percentage */ <br>Purchase shares from corporation: - <<if $cash > 1000*$sharePrice>> + <<if $cash > $sharePrice*1000>> <<link "<<print commaNum(1000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@">> <<set $personalShares += 1000>> - <<set $cash -= 1000*$sharePrice>> - <<set $corpCash += 1000*Math.floor($sharePrice)>> + <<set $cash -= Math.ceil($sharePrice*1000)>> + <<set $corpCash += Math.ceil($sharePrice*1000)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> <br>You purchased <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, from the corporation driving the share price down slightly. <</replace>> <</link>> - <<if $cash > 5000*$sharePrice>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@">> + <<if $cash > $sharePrice*5000>> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@">> <<set $personalShares += 5000>> - <<set $cash -= 5000*$sharePrice>> - <<set $corpCash += 5000*Math.floor($sharePrice)>> + <<set $cash -= Math.ceil(($sharePrice*5000)*.95)>> + <<set $corpCash += Math.ceil(($sharePrice*5000)*.95)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, from the corporation driving the share price down slightly. + <br>You purchased <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@, from the corporation driving the share price down slightly. <</replace>> <</link>> <</if>> - <<if $cash > 10000*$sharePrice>> - | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@">> + <<if $cash > $sharePrice*10000>> + | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@">> <<set $personalShares += 10000>> - <<set $cash -= 10000*$sharePrice>> - <<set $corpCash += 10000*Math.floor($sharePrice)>> + <<set $cash -= Math.ceil(($sharePrice*10000)*.9)>> + <<set $corpCash += Math.ceil(($sharePrice*10000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, from the corporation driving the share price down slightly. + <br>You purchased <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@, from the corporation driving the share price down slightly. <</replace>> <</link>> <</if>> - <<if $cash > 15000*$sharePrice>> - | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@">> + <<if $cash > $sharePrice*15000>> + | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@">> <<set $personalShares += 15000>> - <<set $cash -= 15000*$sharePrice>> - <<set $corpCash += 15000*Math.floor($sharePrice)>> + <<set $cash -= Math.ceil(($sharePrice*15000)*.85)>> + <<set $corpCash += Math.ceil(($sharePrice*15000)*.85)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, from the corporation driving the share price down somewhat. + <br>You purchased <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@, from the corporation driving the share price down somewhat. <</replace>> <</link>> <</if>> - <<if $cash > 20000*$sharePrice>> - | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@">> + <<if $cash > $sharePrice*20000>> + | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@">> <<set $personalShares += 20000>> - <<set $cash -= 20000*$sharePrice>> - <<set $corpCash += 20000*Math.floor($sharePrice)>> + <<set $cash -= Math.ceil(($sharePrice*20000)*.8)>> + <<set $corpCash += Math.ceil(($sharePrice*20000)*.8)>> <<set $sharePrice = (Math.trunc($sharePrice*either(98,99)))/100>> <<replace "#CorpAction">> - <br>You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, from the corporation driving the share price down significantly. + <br>You purchased <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@, from the corporation driving the share price down significantly. <</replace>> <</link>> <</if>> @@ -332,53 +334,53 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</if>> <br>Buy publicly held shares: - <<if $cash > 1000*$sharePrice && $publicShares > 1000>> + <<if $publicShares > 1000 && $cash > $sharePrice*1000>> <<link "<<print commaNum(1000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@">> <<set $personalShares += 1000>> <<set $publicShares -= 1000>> - <<set $cash -= 1000*$sharePrice>> + <<set $cash -= Math.ceil($sharePrice*1000)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> <<replace "#CorpAction">> <br>You bought <<print commaNum(1000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly. <</replace>> <</link>> - <<if $publicShares > 5000 && $cash >= 5000*$sharePrice>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@">> <<set $personalShares += 1000>> + <<if $publicShares > 5000 && $cash >= $sharePrice*5000>> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@">> <<set $personalShares += 1000>> <<set $publicShares -= 5000>> - <<set $cash -= 5000*$sharePrice>> + <<set $cash -= Math.ceil(($sharePrice*5000)*.95)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> <<replace "#CorpAction">> - <br>You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly. + <br>You bought <<print commaNum(5000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@, driving the share price up slightly. <</replace>> <</link>> <</if>> - <<if $publicShares > 10000 && $cash >= 10000*$sharePrice>> - | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@">> <<set $personalShares += 10000>> + <<if $publicShares > 10000 && $cash >= $sharePrice*10000>> + | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@">> <<set $personalShares += 10000>> <<set $publicShares -= 10000>> - <<set $cash -= 10000*$sharePrice>> + <<set $cash -= Math.ceil(($sharePrice*10000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> <<replace "#CorpAction">> - <br>You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly. + <br>You bought <<print commaNum(10000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@, driving the share price up slightly. <</replace>> <</link>> <</if>> - <<if $publicShares > 15000 && $cash >= 15000*$sharePrice>> - | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@">> <<set $personalShares += 15000>> + <<if $publicShares > 15000 && $cash >= $sharePrice*15000>> + | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@">> <<set $personalShares += 15000>> <<set $publicShares -= 15000>> - <<set $cash -= 15000*$sharePrice>> + <<set $cash -= Math.ceil(($sharePrice*15000)*.85)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> <<replace "#CorpAction">> - <br>You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat. + <br>You bought <<print commaNum(15000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@, driving the share price up somewhat. <</replace>> <</link>> <</if>> - <<if $publicShares > 20000 && $cash >= 20000*$sharePrice>> - | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@">> <<set $personalShares += 20000>> + <<if $publicShares > 20000 && $cash >= $sharePrice*20000>> + | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@">> <<set $personalShares += 20000>> <<set $publicShares -= 20000>> - <<set $cash -= 20000*$sharePrice>> + <<set $cash -= Math.ceil(($sharePrice*20000)*.8)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102,$PC.trading >= 100 ? 101 : 102)))/100>> <<replace "#CorpAction">> - <br>You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly. + <br>You bought <<print commaNum(20000)>> shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@, driving the share price up significantly. <</replace>> <</link>> <</if>> @@ -389,7 +391,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</if>> <br>Direct the corporation to buy back publicly held shares: - <<if $corpCash > 1000*$sharePrice && $publicShares > 1000>> + <<if $publicShares > 1000 && $corpCash > $sharePrice*1000>> <<link "<<print commaNum(1000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@">> <<set $publicShares -= 1000>> <<set $corpCash -= 1000*Math.ceil($sharePrice)>> @@ -398,43 +400,43 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <br>The corporation bought back <<print commaNum(1000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*1000))>>@@, driving the share price up slightly. <</replace>> <</link>> - <<if $publicShares > 5000 && $corpCash >= 5000*$sharePrice>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@">> + <<if $publicShares > 5000 && $corpCash >= $sharePrice*5000>> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95)>>@@">> <<set $publicShares -= 5000>> - <<set $corpCash -= 5000*Math.ceil($sharePrice)>> + <<set $corpCash -= Math.ceil(($sharePrice*5000)*.95)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> <<replace "#CorpAction">> - <br>The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*5000))>>@@, driving the share price up slightly. + <br>The corporation bought back <<print commaNum(5000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil((($sharePrice*5000)*.95)))>>@@, driving the share price up slightly. <</replace>> <</link>> <</if>> - <<if $publicShares > 10000 && $corpCash >= 10000*$sharePrice>> - | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@">> + <<if $publicShares > 10000 && $corpCash >= $sharePrice*10000>> + | <<link "<<print commaNum(10000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@">> <<set $publicShares -= 10000>> - <<set $corpCash -= 10000*Math.ceil($sharePrice)>> + <<set $corpCash -= Math.ceil(($sharePrice*10000)*.9)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> <<replace "#CorpAction">> - <br>The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*10000))>>@@, driving the share price up slightly. + <br>The corporation bought back <<print commaNum(10000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*10000)*.9))>>@@, driving the share price up slightly. <</replace>> <</link>> <</if>> - <<if $publicShares > 15000 && $corpCash >= 15000*$sharePrice>> - | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@">> + <<if $publicShares > 15000 && $corpCash >= $sharePrice*15000>> + | <<link "<<print commaNum(15000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@">> <<set $publicShares -= 15000>> - <<set $corpCash -= 15000*Math.ceil($sharePrice)>> + <<set $corpCash -= Math.ceil(($sharePrice*15000)*.85)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> <<replace "#CorpAction">> - <br>The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*15000))>>@@, driving the share price up somewhat. + <br>The corporation bought back <<print commaNum(15000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*15000)*.85))>>@@, driving the share price up somewhat. <</replace>> <</link>> <</if>> - <<if $publicShares > 20000 && $corpCash >= 20000*$sharePrice>> - | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@">> + <<if $publicShares > 20000 && $corpCash >= $sharePrice*20000>> + | <<link "<<print commaNum(20000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@">> <<set $publicShares -= 20000>> - <<set $corpCash -= 20000*Math.ceil($sharePrice)>> + <<set $corpCash -= Math.ceil(($sharePrice*20000)*.8)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> <<replace "#CorpAction">> - <br>The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil($sharePrice*20000))>>@@, driving the share price up significantly. + <br>The corporation bought back <<print commaNum(20000)>> public shares valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*20000)*.8))>>@@, driving the share price up significantly. <</replace>> <</link>> <</if>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 53be85c10fac664f77888a60f7fe956d1994788a..cad3c54ed3caf1e1387e5dfdee2a137662c0b945 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -356,6 +356,19 @@ your __personal living expenses__ are <<print cashFormat(($girls*(250+($economy* <<set _pAccMult = 1>> <br> Extra feeding to support <<if $slaves[$i].pregControl == "speed up">>accelerated <<set _pAccMult = 3>><</if>>pregnancy: <<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>> <<set $individualCosts += $foodCost*$slaves[$i].pregType*_pAccMult>> + <<if $slaves[$i].pregType >= 10>> + <br> Specialized food blend to support multiples: <<print cashFormat($foodCost*$slaves[$i].pregType*2*_pAccMult)>> + <<set $individualCosts += $foodCost*$slaves[$i].pregType*_pAccMult>> + <<elseif $slaves[$i].pregType >= 30>> + <br> Concentrated, quick to digest food blend to support extreme multiples: <<print cashFormat($foodCost*$slaves[$i].pregType*_pAccMult)>> + <<set $individualCosts += $foodCost*2*$slaves[$i].pregType*_pAccMult>> + <<elseif $slaves[$i].pregType >= 50>> + <br> Specialized dietary adjustments and concentrated, quick to digest food required to support absurd multiples: <<print cashFormat($foodCost*$slaves[$i].pregType*3*_pAccMult)>> + <<set $individualCosts += $foodCost*$slaves[$i].pregType*3*_pAccMult>> + <<elseif $slaves[$i].pregType >= 100>> + <br> Specialized dietary requirements and feeding methods to support absurd multiples: <<print cashFormat($foodCost*$slaves[$i].pregType*5*_pAccMult)>> + <<set $individualCosts += $foodCost*$slaves[$i].pregType*5*_pAccMult>> + <</if>> <</if>> <</if>> <<switch $slaves[$i].diet>> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index b3786783bae8b2ba29368462baf6d67c4e4d3c2c..227201a2c28c9c56929c6065771976e32b9c9dfc 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -358,6 +358,14 @@ Extreme pregnancy content like broodmothers is currently @@.red;DISABLED@@. [[En <<else>> Extreme pregnancy content like broodmothers is currently @@.cyan;ENABLED@@. [[Disable|Options][$seeHyperPreg = 0]] <</if>> //Will not affect existing hyperpregnancies already in-game.// + +<br> +<<if ($dangerousPregancy == 0)>> +Pregnancy complications due to multiples and body size are currently @@.red;DISABLED@@. [[Enable|Options][$dangerousPregancy = 1]] +<<else>> +Pregnancy complications due to multiples and body size are currently @@.cyan;ENABLED@@. [[Disable|Options][$dangerousPregancy = 0]] +<</if>> + <br> <<if $precociousPuberty == 0>> Girls ''will not'' experience precocious puberty. (Not able to become pregnant younger than normal age - $fertilityAge). @@ -391,9 +399,9 @@ Experimental male pronouns are currently @@.red;DISABLED@@. [[Enable|Options][$d <br> <<if $allowMaleSlaveNames>> -Male slave names are currently @@.cyan;Permitted@@. [[Deny|Options][$allowMaleSlaveNames = false]] +Male slave names are currently @@.cyan;PERMITTED@@. [[Deny|Options][$allowMaleSlaveNames = false]] <<else>> -Male slave names are currently @@.red;Forbidden@@. [[Allow|Options][$allowMaleSlaveNames = true]] +Male slave names are currently @@.red;FORBIDDEN@@. [[Allow|Options][$allowMaleSlaveNames = true]] <</if>> //This only affects slave generation and not your ability to name your slaves.// diff --git a/src/uncategorized/reHGReplacement.tw b/src/uncategorized/reHGReplacement.tw index a038a7d208a1878f725a4fc38b95885db7e15f94..a6cc9935d87c48a18a9d316cfb2bcc7c1467e98f 100644 --- a/src/uncategorized/reHGReplacement.tw +++ b/src/uncategorized/reHGReplacement.tw @@ -8,13 +8,13 @@ There's a constant traffic of slaves in and out of your office as girls come in for instructions, inspections, and sex. Your Head Girl $HeadGirl.slaveName is one of the most frequent visitors, since although you trust _him2, _he2's still a slave and has to check with you before acting on some matters.<<if $HeadGirl.relationship == -3>> (_He2's also your wife, making _his2 visits a pleasant diversion.)<<elseif $arcologies[0].FSEgyptianRevivalistLaw == 1>> (_He2's also your Consort, making _his2 visits a pleasant diversion.)<</if>> During one of _his2 visits, <<EventNameLink $activeSlave>> happens to come in for $his scheduled inspection. $He perches politely on the couch, waiting $his turn like a good $girl. $His $activeSlave.eyeColor eyes are watchful, however, and $he seems to be paying very close attention to your conversation with your Head Girl. -When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>. +When $HeadGirl.slaveName leaves, $he clears $his throat nervously. $He gathers $his courage, and <<say>>s, "<<Master>>, I think I would make a better Head Girl than $him." $He takes a deep breath and plunges on. "I'm ju<<s>>t a<<s>> <<s>>mart a<<s>> <<he 2>> i<<s>>. And, <<Master>>, I'm <<s>>ure you've noti<<c>>ed <<he 2>> i<<s>>n't very good at teaching other girl<<s>> vaginal <<s>>kill<<s>>. <<if $HeadGirl.vagina > 0>> - I could do it much better than <<he>> doe<<s>>, + I could do it much better than <<he 2>> doe<<s>>, <<elseif $HeadGirl.vagina == 0>> - How could <<he>> be? <<He>>'<<s>> a virgin! I can manage it, + How could <<he 2>> be? <<He 2>>'<<s>> a virgin! I can manage it, <<else>> - How could <<he>> be? <<He>> doe<<s>>n't have a pu<<ss>>y! I can manage it, + How could <<he 2>> be? <<He 2>> doe<<s>>n't have a pu<<ss>>y! I can manage it, <</if>> <<Master>>. Plea<<s>>e, give me a try." $He goes on like this for a while, slowly degenerating into repetition of $his points as your failure to give $him an immediate positive or negative response starts to worry $him. diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index e3dac1d0b99cb365d461265fbe53e0ce8f29955a..9e29d2504e1b26317503a327ae74c49f48b08585 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -304,7 +304,7 @@ $He has <<if $seeExtreme == 1>> | [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $activeSlave.voiceImplant = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]] <</if>> - <<elseif $cyberMod == 1 && $activeSlave.electrolarynx == 0 && $stockpile.electrolarynx > 0>> + <<elseif $activeSlave.voice == 0 && $cyberMod == 1 && $activeSlave.electrolarynx == 0 && $stockpile.electrolarynx > 0>> [["Give " + $him + " an electrolarynx"|Surgery Degradation][$activeSlave.electrolarynx = 1, $activeSlave.voice = 2, $stockpile.electrolarynx--, $cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "electrolarynx"]] <</if>> <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index a50759cd15a5c20cb67a8a65902bc749cae81bd1..5991d2b5697c72c3dbfacb7644ec6e419bd7e5d0 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -4616,6 +4616,10 @@ $His <</if>> <<if $activeSlave.buttplugAttachment == "tail">> A tail protrudes from the back of the plug and dangles from $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + A bushy $activeSlave.hColor tail with a white tip protrudes from the back of the plug and dangles from $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + A tail protrudes from the back of the plug and springs upwards from $his rear. <</if>> <<case "long plug">> It's filled by a standard sized, overly long @@ -4627,6 +4631,10 @@ $His It causes a noticeable bulge in $his belly. <<if $activeSlave.buttplugAttachment == "tail">> A tail protrudes from the back of the plug and dangles from $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + A bushy $activeSlave.hColor tail with a white tip protrudes from the back of the plug and dangles from $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + A tail protrudes from the back of the plug and springs upwards from $his rear. <</if>> <<case "large plug">> It's @@ -4640,6 +4648,10 @@ $His by a large buttplug. <<if $activeSlave.buttplugAttachment == "tail">> $He swings the tail from side to side with every shift of $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + $He swings the bushy $activeSlave.hColor tail from side to side with every shift of $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + $He bounces the tail from side to side with every shift of $his rear. <</if>> <<case "long, large plug">> It's @@ -4653,6 +4665,10 @@ $His by a large and long buttplug. It causes a noticeable bulge in $his belly. <<if $activeSlave.buttplugAttachment == "tail">> $He swings the tail from side to side with every shift of $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + $He swings the bushy $activeSlave.hColor tail from side to side with every shift of $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + $He bounces the tail from side to side with every shift of $his rear. <</if>> <<case "huge plug">> <<if $activeSlave.anus < 4>> @@ -4669,6 +4685,10 @@ $His <</if>> <<if $activeSlave.buttplugAttachment == "tail">> $He sways the tail back and forth with every ginger movement of $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + $He sways the bushy $activeSlave.hColor tail back and forth with every ginger movement of $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + $He jiggles the tail back and forth with every ginger movement of $his rear. <</if>> <<case "long, huge plug">> <<if $activeSlave.anus < 4>> @@ -4685,6 +4705,10 @@ $His <</if>> <<if $activeSlave.buttplugAttachment == "tail">> $He sways the tail back and forth with every ginger movement of $his rear. + <<elseif $activeSlave.buttplugAttachment == "fox tail">> + $He sways the bushy $activeSlave.hColor tail back and forth with every ginger movement of $his rear. + <<elseif $activeSlave.buttplugAttachment == "cat tail">> + $He jiggles the tail back and forth with every ginger movement of $his rear. <</if>> <</switch>> <</widget>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 3e7ad543b3ee0742f0257b442e2153a53fd904cf..c0ffc48d7b1690fee8e60974f4665a5d50214171 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -670,17 +670,18 @@ <<widget "x">>$xEnunciate<</widget>> /* - If $args[0] is defined, it is assumed the secondary slave is speaking about primary slave. Else, the primary slave is speaking about secondary slave. + If $args[0] is defined, it is assumed the primary slave is speaking about secondary slave. Else, the secondary slave is speaking about primary slave. + This means that <<he>> will print _heLisp or $he, and <<he 2>> will print _he2Lisp or _he2. Pronouns must be set for both slaves, and <<setSpokenLocalPronouns primarySlave secondarySlave>> must be previously called. */ -<<widget "he">><<if def $args[0]>><<if _secondarySlaveLisp>>_heLisp<<else>>$he<</if>><<else>><<if _primarySlaveLisp>>_he2Lisp<<else>>_he2<</if>><</if>><</widget>> -<<widget "his">><<if def $args[0]>><<if _secondarySlaveLisp>>_hisLisp<<else>>$his<</if>><<else>><<if _primarySlaveLisp>>_his2Lisp<<else>>_his2<</if>><</if>><</widget>> -<<widget "hers">><<if def $args[0]>><<if _secondarySlaveLisp>>_hersLisp<<else>>$hers<</if>><<else>><<if _primarySlaveLisp>>_hers2Lisp<<else>>_hers2<</if>><</if>><</widget>> -<<widget "himself">><<if def $args[0]>><<if _secondarySlaveLisp>>_himselfLisp<<else>>$himselfLisp<</if>><<else>><<if _primarySlaveLisp>>_himself2Lisp<<else>>_himself2<</if>><</if>><</widget>> -<<widget "He">><<if def $args[0]>><<if _secondarySlaveLisp>>_HeLisp<<else>>$He<</if>><<else>><<if _primarySlaveLisp>>_He2Lisp<<else>>_He2<</if>><</if>><</widget>> -<<widget "His">><<if def $args[0]>><<if _secondarySlaveLisp>>_HisLisp<<else>>$His<</if>><<else>><<if _primarySlaveLisp>>_His2Lisp<<else>>_His2<</if>><</if>><</widget>> -<<widget "Hers">><<if def $args[0]>><<if _secondarySlaveLisp>>_HersLisp<<else>>$Hers<</if>><<else>><<if _primarySlaveLisp>>_Hers2Lisp<<else>>_Hers2<</if>><</if>><</widget>> -<<widget "Himself">><<if def $args[0]>><<if _secondarySlaveLisp>>_HimselfLisp<<else>>$HimselfLisp<</if>><<else>><<if _primarySlaveLisp>>_Himself2Lisp<<else>>_Himself2<</if>><</if>><</widget>> +<<widget "he">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_heLisp<<else>>$he<</if>><<else>><<if _primarySlaveLisp>>_he2Lisp<<else>>_he2<</if>><</if>><</widget>> +<<widget "his">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_hisLisp<<else>>$his<</if>><<else>><<if _primarySlaveLisp>>_his2Lisp<<else>>_his2<</if>><</if>><</widget>> +<<widget "hers">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_hersLisp<<else>>$hers<</if>><<else>><<if _primarySlaveLisp>>_hers2Lisp<<else>>_hers2<</if>><</if>><</widget>> +<<widget "himself">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_himselfLisp<<else>>$himselfLisp<</if>><<else>><<if _primarySlaveLisp>>_himself2Lisp<<else>>_himself2<</if>><</if>><</widget>> +<<widget "He">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HeLisp<<else>>$He<</if>><<else>><<if _primarySlaveLisp>>_He2Lisp<<else>>_He2<</if>><</if>><</widget>> +<<widget "His">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HisLisp<<else>>$His<</if>><<else>><<if _primarySlaveLisp>>_His2Lisp<<else>>_His2<</if>><</if>><</widget>> +<<widget "Hers">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HersLisp<<else>>$Hers<</if>><<else>><<if _primarySlaveLisp>>_Hers2Lisp<<else>>_Hers2<</if>><</if>><</widget>> +<<widget "Himself">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HimselfLisp<<else>>$Himself<</if>><<else>><<if _primarySlaveLisp>>_Himself2Lisp<<else>>_Himself2<</if>><</if>><</widget>> /% Call as <<EventFetish>>