diff --git a/src/SpecialForce/WeeklyChoices.tw b/src/SpecialForce/WeeklyChoices.tw index f9d0acf686b568ae3c8634ebe81f43b58489cf6b..145a1303228fd6fc338af933fb7b4afd9cda6636 100644 --- a/src/SpecialForce/WeeklyChoices.tw +++ b/src/SpecialForce/WeeklyChoices.tw @@ -7,64 +7,72 @@ <<if $SF.Gift === 0 && $SF.MercCon.CanAttend === -1 && ($SF.Colonel.Talk + $SF.Colonel.Fun !== 1)>> The Colonel looks down a list on her tablet. "There's some things we can do to help you out, boss. - <br>We've had some good prizes turn up, that's made us some extra money we could turn over. | <<link "Request cash""Firebase">> - /*<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SF.Size))))*($arcologies[0].prosperity/100))*_Env>> OLD*/ - <<set $CashGift = Math.ceil(25000*($SF.Size/10)*_Env),$SF.Gift = 1,$choice = 1>> - <<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000)>> - <<run cashX($CashGift, "specialForces")>> + <br>We've had some good prizes turn up, that's made us some extra money we could turn over. | <<link "Request cash" "Firebase">> + /*<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SF.Size))))*($arcologies[0].prosperity/100))*_Env>> OLD*/ + <<set $CashGift = Math.ceil(25000*($SF.Size/10)*_Env),$SF.Gift = 1,$choice = 1>> + <<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000)>> + <<run cashX($CashGift, "specialForces")>> <</link>> <<if $rep < 20000>> - <br>If you want we could throw a quick military parade, get the people feeling extra patriotic. | <<link "Request military parade""Firebase">> - <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>> - <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>> - <<set $choice = 2>> - <<run repX($GoodWords1, "specialForces")>> + <br>If you want we could throw a quick military parade, get the people feeling extra patriotic. | <<link "Request military parade" "Firebase">> + <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>> + <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>> + <<set $choice = 2>> + <<run repX($GoodWords1, "specialForces")>> <</link>> <</if>> <<if $arcologies[0].prosperity < $AProsperityCap>> - <br>Or we could hit some businesses that rival the ones in $arcologies[0].name with some sabotage. | <<link "Request sabotage""Firebase">> - <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>> - <<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>> - <<set $arcologies[0].prosperity = $AProsperityCap>> - <<else>> <<set $arcologies[0].prosperity += $GoodWords2>> <</if>> <</link>> + <br>Or we could hit some businesses that rival the ones in $arcologies[0].name with some sabotage. | <<link "Request sabotage" "Firebase">> + <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>> + <<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>> + <<set $arcologies[0].prosperity = $AProsperityCap>> + <<else>> + <<set $arcologies[0].prosperity += $GoodWords2>> + <</if>> + <</link>> <</if>> <<elseif $SF.Gift == 0 && ($SF.MercCon.CanAttend > -1 || ($SF.Colonel.Talk + $SF.Colonel.Fun > 0))>> <br>He looks down a list on his tablet. "<<= properTitle()>>, how can $SF.Lower help you this week? - <br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash""Firebase">> - <<set $CashGift = 25000*($SF.Size/10)*_Env,$SF.Gift = 1,$choice = 1>> - <<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000)>> - <<run cashX(Math.ceil($CashGift * 0.8), "specialForces")>> - + <br>$SF.Caps can spare some profits from our recent operations. | <<link "Request cash" "Firebase">> + <<set $CashGift = 25000*($SF.Size/10)*_Env,$SF.Gift = 1,$choice = 1>> + <<set $CashGift = ($CashGift > 5000 ? $CashGift : 5000)>> + <<run cashX(Math.ceil($CashGift * 0.8), "specialForces")>> <</link>> <<if $rep < 20000>> - <br>We can set some units aside for a ceremonial march through the arcology. | <<link "Request a parade""Firebase">> - <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>> - <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>> - <<set $choice = 2>> - <<run repX(Math.ceil($GoodWords1*0.8), "specialForces")>> + <br>We can set some units aside for a ceremonial march through the arcology. | <<link "Request a parade" "Firebase">> + <<set $GoodWords1 += 50*(Math.ceil($SF.Size*0.03*_Env))>> + <<set $GoodWords1 = (Number($GoodWords1) ? $GoodWords1 : 500),$SF.Gift = 1>> + <<set $choice = 2>> + <<run repX(Math.ceil($GoodWords1*0.8), "specialForces")>> <</link>> <</if>> <<if $arcologies[0].prosperity < $AProsperityCap>> - <br>Or we can target rival businesses for sabotage. | <<link "Request sabotage""Firebase">> - <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>> - <<if $arcologies[0].prosperity + $GoodWords2 * 0.8 > $AProsperityCap>> - <<set $arcologies[0].prosperity = $AProsperityCap>> - <<else>> <<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>> <</if>> <</link>> + <br>Or we can target rival businesses for sabotage. | <<link "Request sabotage" "Firebase">> + <<set $GoodWords2 = _EnvProsp+(Math.ceil($SF.Size/100*_Env)),$SF.Gift = 1,$choice = 3>> + <<if $arcologies[0].prosperity + $GoodWords2 * 0.8 > $AProsperityCap>> + <<set $arcologies[0].prosperity = $AProsperityCap>> + <<else>> + <<set $arcologies[0].prosperity += Math.ceil($GoodWords2*0.8)>> + <</if>> + <</link>> <</if>> <</if>> <<if $SF.Colonel.Talk === 0 && $SF.Colonel.Fun === 0 && $SF.MercCon.CanAttend === -1>> <span id="result0"> -<br>"If you need me for anything else, let me know." + <br>"If you need me for anything else, let me know." <<= App.SF.fsIntegration()>> <<if $SF.MercCon.History >= 1>> <br> - <<link "Merc meetup report.">> <<replace "#result0">> + <<link "Merc meetup report.">> + <<replace "#result0">> <br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.Mercs)>> mercenaries were persuaded to join $SF.Lower. <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.TotalMercs)>> mercenaries joined across $SF.MercCon.History meetups. - <</replace>> <</link>> + <</replace>> + <</link>> <</if>> - <<if $SF.Colonel.Status >= 25>> <br> - <<link "Walk with the Colonel on the surface.">> <<replace "#result0">> + <<if $SF.Colonel.Status >= 25>> + <br><<link "Walk with the Colonel on the surface.">> + <<replace "#result0">> <<set $SF.Colonel.Talk = 1, $SF.Colonel.Status += 2, $SF.FS.Tension -= _colonelTalkTensionRuction>> <br><br>You ask the Colonel if she would like to stretch her legs up on the surface. It doesn't take much effort for her to agree. <<if $PC.warfare >= 100 && $PC.career == "mercenary">> @@ -87,7 +95,7 @@ <br>As you make your way through the arcology you stop at a <<if $arcologies[0].FSPaternalist != "unset">> - paternalist shop, <<if $SF.Colonel.Core == "cruel">>earning a sneer from the Colonel.<<else>>helping the Colonel select some luxurious and relaxing slave treatments.<</if>> + paternalist shop, <<if $SF.Colonel.Core == "cruel">>earning a sneer from the Colonel<<else>>helping the Colonel select some luxurious and relaxing slave treatments<</if>>. <<elseif $arcologies[0].FSPastoralist != "unset">> pastoralist shop, helping the Colonel select a more comfortable breast pump. <<else>> @@ -95,22 +103,27 @@ <</if>> <<if $PC.slaving >= 100 && $PC.career == "slaver">> Your mastery and extensive history of slaving allows you to assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers. - <<if $arcologies[0].prosperity < $AProsperityCap>> <<set $arcologies[0].prosperity++>> <</if>> + <<if $arcologies[0].prosperity < $AProsperityCap>> + <<set $arcologies[0].prosperity++>> + <</if>> <<elseif $PC.slaving >= 100>> Your mastery and extensive history of slaving allows you to assist the Colonel greatly. The shop owner is so impressed by your understanding of slavery that she asks you for some advice. Before you leave, you manage to pass on a few tips, helping the business with future customers. - <<if $arcologies[0].prosperity < $AProsperityCap>> <<set $arcologies[0].prosperity++>> <</if>> - <<elseif $PC.slaving >= 60>> - Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave. - <<elseif $PC.slaving >= 30>> - Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave. - <<elseif $PC.slaving >= 10>> - Your basic skill level of slavery doesn't allow you to help the Colonel at all. - <<elseif $PC.slaving < 10>> - Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins. - <<run repX(-20, "PCactions")>> + <<if $arcologies[0].prosperity < $AProsperityCap>> + <<set $arcologies[0].prosperity++>> <</if>> + <<elseif $PC.slaving >= 60>> + Your expertise in slavery allows you to help the Colonel decide what to buy for her main slave. + <<elseif $PC.slaving >= 30>> + Your moderate skill in slavery makes you somewhat helpful to the Colonel in deciding what to buy for her main slave. + <<elseif $PC.slaving >= 10>> + Your basic skill level of slavery doesn't allow you to help the Colonel at all. + <<elseif $PC.slaving < 10>> + Your total lack of slavery skill (which is very unusual and very concerning for an arcology owner) means that you are of little to no help or even a hindrance. The shopkeeper notices your complete ineptitude, and as soon as you've left the rumor mill begins. + <<run repX(-20, "PCactions")>> + <</if>> <br>Soon the entourage heads back to the HQ of $SF.Lower. - <<if random(1,100) > 50>>Along the route you see a homeless citizen with a serious injury begging for help. + <<if random(1,100) > 50>> + Along the route you see a homeless citizen with a serious injury begging for help. <<if $PC.medicine >= 100 && $PC.career == "medicine">> Your expertise in surgery ensures that the citizen receives the best care they'll ever experience in their life. They are so grateful that they are more than happy to try and compensate your time. Word quickly spreads of the kindly medically trained arcology owner who took the time to heal a citizen, providing confidence to the rest of the citizens. <<run repX(10, "specialForces")>> @@ -129,98 +142,156 @@ <<set $arcologies[0].prosperity -= .25>> <</if>> <</if>> - <</replace>> <</link>> + <</replace>> + <</link>> <</if>> - <br> <<link "Talk in $SF.Lower's HQ.">> <<replace "#result0">> <span id="result1"> - <br><br>What do you want to do with the Colonel in the HQ? - <br> <<link "Talk">><<replace "#result1">> <<set $SF.Colonel.Talk = 1, $SF.Colonel.Status += 3, $SF.FS.Tension -= _colonelTalkTensionRuction>> - <br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her. - <<switch random(1,6)>> - <<case 1>> - <<= IncreasePCSkills('medicine', 1)>> <<= IncreasePCSkills('trading', 1)>> <<= IncreasePCSkills('slaving', 1)>> - <<case 2>> - <<= IncreasePCSkills('trading', 1)>> <<= IncreasePCSkills('slaving', 1)>> <<= IncreasePCSkills('engineering', 1)>> - <<case 3>> - <<= IncreasePCSkills('slaving', 1)>> <<= IncreasePCSkills('engineering', 1)>> <<= IncreasePCSkills('hacking', 1)>> - <<case 4>> - <<= IncreasePCSkills('engineering', 1)>> <<= IncreasePCSkills('hacking', 1)>> <<= IncreasePCSkills('warfare', 1)>> - <<case 5>> - <<= IncreasePCSkills('hacking', 1)>> <<= IncreasePCSkills('warfare', 1)>> <<= IncreasePCSkills('medicine', 1)>> - <<case 6>> - <<= IncreasePCSkills('warfare', 1)>> <<= IncreasePCSkills('medicine', 1)>> <<= IncreasePCSkills('trading', 1)>> - <</switch>> - <</replace>><</link>> - - <br> <<link "Learn">> <<replace "#result1">> - <<set $SF.Colonel.Talk = 1,$SF.Colonel.Status += 1, $SF.FS.Tension -= _colonelTalkTensionRuction>> - <br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she - <<switch random(1,6)>> - <<case 1>> - used field medicine to save another merc's life, teaching you some medical procedures in the process. - <<= IncreasePCSkills('medicine', 5)>> - <<case 2>> - haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders. - <<= IncreasePCSkills('trading', 5)>> - <<case 3>> - found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves. - <<= IncreasePCSkills('slaving', 5)>> - <<case 4>> - was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology. - <<= IncreasePCSkills('engineering', 5)>> - <<case 5>> - was forced to hack her way out of a trap, teaching you how to better penetrate digital security. - <<= IncreasePCSkills('hacking', 5)>> - <<case 6>> - fought off an entire battalion with only a small squad, teaching you how to think tactically in battle. - <<= IncreasePCSkills('warfare', 5)>> - <</switch>> - <</replace>> <</link>> + <br><<link "Talk in $SF.Lower's HQ.">> + <<replace "#result0">> + <span id="result1"> + <br><br>What do you want to do with the Colonel in the HQ? + <br><<link "Talk">> + <<replace "#result1">> + <<set $SF.Colonel.Talk = 1, $SF.Colonel.Status += 3, $SF.FS.Tension -= _colonelTalkTensionRuction>> + <br><br>You and the Colonel talk over some $PC.refreshment, where she ends up talking about her past. You learn a little more about her. + <<switch random(1,6)>> + <<case 1>> + <<= IncreasePCSkills('medicine', 1)>> <<= IncreasePCSkills('trading', 1)>> <<= IncreasePCSkills('slaving', 1)>> + <<case 2>> + <<= IncreasePCSkills('trading', 1)>> <<= IncreasePCSkills('slaving', 1)>> <<= IncreasePCSkills('engineering', 1)>> + <<case 3>> + <<= IncreasePCSkills('slaving', 1)>> <<= IncreasePCSkills('engineering', 1)>> <<= IncreasePCSkills('hacking', 1)>> + <<case 4>> + <<= IncreasePCSkills('engineering', 1)>> <<= IncreasePCSkills('hacking', 1)>> <<= IncreasePCSkills('warfare', 1)>> + <<case 5>> + <<= IncreasePCSkills('hacking', 1)>> <<= IncreasePCSkills('warfare', 1)>> <<= IncreasePCSkills('medicine', 1)>> + <<case 6>> + <<= IncreasePCSkills('warfare', 1)>> <<= IncreasePCSkills('medicine', 1)>> <<= IncreasePCSkills('trading', 1)>> + <</switch>> + <</replace>> + <</link>> - <<if $SF.Colonel.Status >= 45>> <br> <<link "Have some fun.">> <<replace "#result1">> <span id="result4"> - <<set $SF.Colonel.Fun = 1,$SF.Colonel.Talk = 1,$SF.Colonel.Status += 3, $SF.FS.Tension -= _colonelTalkTensionRuction>> - <br>Where should this fun take place? <<link "Go back""Firebase">> - <<set $SF.Colonel.Fun = 0, $SF.Colonel.Talk = 0,$SF.Colonel.Status -= , $SF.FS.Tension += _colonelTalkTensionRuction3>> + <br><<link "Learn">> + <<replace "#result1">> + <<set $SF.Colonel.Talk = 1,$SF.Colonel.Status += 1, $SF.FS.Tension -= _colonelTalkTensionRuction>> + <br><br>"Sure boss, I can use a break from all of this," she laughs. The Colonel tells a story about one time when she + <<switch random(1,6)>> + <<case 1>> + used field medicine to save another merc's life, teaching you some medical procedures in the process. + <<= IncreasePCSkills('medicine', 5)>> + <<case 2>> + haggled for necessary gear with a stingy quartermaster, teaching you how to get what you want from traders. + <<= IncreasePCSkills('trading', 5)>> + <<case 3>> + found a load of human chattel in a raid and had to manage them before they could later be unloaded, teaching you how to better care for your slaves. + <<= IncreasePCSkills('slaving', 5)>> + <<case 4>> + was responsible for rebuilding a fort she had seized, teaching you how to better manage construction in your arcology. + <<= IncreasePCSkills('engineering', 5)>> + <<case 5>> + was forced to hack her way out of a trap, teaching you how to better penetrate digital security. + <<= IncreasePCSkills('hacking', 5)>> + <<case 6>> + fought off an entire battalion with only a small squad, teaching you how to think tactically in battle. + <<= IncreasePCSkills('warfare', 5)>> + <</switch>> + <</replace>> <</link>> - <br> <<link "In private">> <<replace "#result4">> <span id="result6"> - <br>Which orifice do you wish to target? - <<link "Go back""Firebase">> <</link>> - <br> <<link "Pussy">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "Ass">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "Both pussy and ass">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 2>> <</link>> - <br> <<link "Mouth">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "All three holes">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 3>> <</link>> - </span> <</replace>> <</link>> - <br> <<link "On The Colonel's throne.">> <<replace "#result4">> <span id="result6"> - <br>Which orifice do you wish to target? - <<link "Go back""Firebase">> <</link>> - <br> <<link "Pussy">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "Ass">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "Both pussy and ass">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 2>> <</link>> - <br> <<link "Mouth">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 1>> <</link>> - <br> <<link "All three holes">> <<replace "#result6">> - <<include "SFColonelSexDec">> - <</replace>> <<set $SF.Colonel.Fun += 3>> <</link>> - </span> <</replace>> <</link>> - </span> <</replace>> <</link>> <</if>> /*Closes fun*/ - </span> <</replace>> <</link>> /*Closes talk*/ -</span> <</if>> /*Closes spend time with The Colonel*/ + <<if $SF.Colonel.Status >= 45>> + <br><<link "Have some fun.">> + <<replace "#result1">> + <span id="result4"> + <<set $SF.Colonel.Fun = 1,$SF.Colonel.Talk = 1,$SF.Colonel.Status += 3, $SF.FS.Tension -= _colonelTalkTensionRuction>> + <br>Where should this fun take place? + <<link "Go back" "Firebase">> + <<set $SF.Colonel.Fun = 0, $SF.Colonel.Talk = 0,$SF.Colonel.Status -= , $SF.FS.Tension += _colonelTalkTensionRuction3>> + <</link>> + <br><<link "In private">> + <<replace "#result4">> + <span id="result6"> + <br>Which orifice do you wish to target? + <<link "Go back" "Firebase">> + <</link>> + <br><<link "Pussy">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "Ass">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "Both pussy and ass">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 2>> + <</link>> + <br><<link "Mouth">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "All three holes">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 3>> + <</link>> + </span> + <</replace>> + <</link>> + + <br><<link "On The Colonel's throne.">> + <<replace "#result4">> + <span id="result6"> + <br>Which orifice do you wish to target? + <<link "Go back" "Firebase">> + <</link>> + <br><<link "Pussy">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "Ass">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "Both pussy and ass">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 2>> + <</link>> + <br><<link "Mouth">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 1>> + <</link>> + <br><<link "All three holes">> + <<replace "#result6">> + <<include "SFColonelSexDec">> + <</replace>> + <<set $SF.Colonel.Fun += 3>> + <</link>> + </span> + <</replace>> + <</link>> + </span> + <</replace>> + <</link>> + <</if>> /*Closes fun*/ + </span> + <</replace>> + <</link>> /*Closes talk*/ + </span> +<</if>> /*Closes spend time with The Colonel*/ diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw index 95a14e714eee8c03b6b087d03b46f0cb1e1325ae..3da7bebec80f4d6bc004c6ab96331b3507f0bf77 100644 --- a/src/pregmod/widgets/playerDescriptionWidgets.tw +++ b/src/pregmod/widgets/playerDescriptionWidgets.tw @@ -369,7 +369,7 @@ <</if>> <<if def $slaveIndices[$PC.pregSource]>> <<setLocalPronouns _babyDaddy>> - Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>. + Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch use it to remain defiant<</if>>. <</if>> <</if>> <</if>> @@ -452,7 +452,7 @@ <</if>> <<if def $slaveIndices[$PC.pregSource]>> <<setLocalPronouns _babyDaddy>> - Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>. + Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch use it to remain defiant<</if>>. <</if>> <</if>> <</if>> @@ -517,7 +517,7 @@ <</if>> <<if def $slaveIndices[$PC.pregSource]>> <<setLocalPronouns _babyDaddy>> - Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch uses it to remain defiant<</if>>. + Rumors spread among your slaves that your middle is swollen with _babyDaddy.slaveName's child. They're not wrong, though <<if _babyDaddy.devotion > 20>>_babyDaddy.slaveName is broken enough to not try and use it against you. In fact, it might even draw $him closer to you<<else>>you'd have liked it to have kept that from _babyDaddy.slaveName, lest the rebellious bitch use it to remain defiant<</if>>. <</if>> <</if>> <</if>> diff --git a/src/uncategorized/#README-includes.txt b/src/uncategorized/#README-includes.txt index 4d84afaa1630a07d10134f15f291e40d86e0a2ee..d3b954e945e58395b94074da5488f11565827fc1 100644 --- a/src/uncategorized/#README-includes.txt +++ b/src/uncategorized/#README-includes.txt @@ -7,7 +7,6 @@ when passages are included by other passages, any variables that they set will o all sa... passages arcologyDescription -arcologyOpinion neighborDescription officeDescription @@ -17,7 +16,6 @@ weekly persBusiness rulesAssistantReport - securityForceEOWReport penthouse @@ -51,26 +49,12 @@ economics npc - degradingName - fAbuse - fFeelings - fKiss - fPCImpreg - fRelation - fRival - fSlaveImpreg - fSlaveImpregConsummate - generateNewSlave - generateXXSlave - generateXYSlave hgApplication lawCompliance longSlaveDescription newSlaveIntro - removeActiveSlave - slaveSummary init initRules - backwardsCompatibility + BackwardsCompatibility diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw index 78975625b88e0094c6f454744d71baaa10b3f5ad..44fb36d7b2156beb479818fd1d414f9f230dd8cf 100644 --- a/src/uncategorized/REFI.tw +++ b/src/uncategorized/REFI.tw @@ -186,7 +186,7 @@ a few rubs before unceremoniously stuffing it into _his2 victim's asshole. You c <<else>> <<if $activeSlave.nipples != "fuckable">>$his nipples are hard and <</if>>there is a clear scent of lust around $him. <</if>> -It seems $he passed by while $subSlave.slaveName was beating the girl and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now. +It seems $he passed by while $subSlave.slaveName was beating the _girlU and found the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sounds<<else>>sensations<</if>> rather compelling. It should be possible to either encourage this fascination or steer $him away from it for now. <<case "masochist">> @@ -1138,17 +1138,17 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<< <</if>> <<if $activeSlave.mpreg == 1>> <<if canDoAnal($activeSlave) && $activeSlave.anus > 0>> - slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his rear. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood $his rectum with your cum<<else>>repeatedly pump bursts of cum out of your toy into $his bowels<</if>>. + slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his rear. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood $his rectum with your cum<<else>>repeatedly pump bursts of cum out of your toy into $his bowels<</if>>. <<= VCheck.Anal()>> <<else>> - you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending $him over the edge. + you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending $him over the edge. <</if>> <<else>> <<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>> - slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his pussy. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood $his cunt with your cum<<else>>repeatedly pump bursts of cum into $him until it flows out around your toy<</if>>. + slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his pussy. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick == 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick == 1>>flood $his cunt with your cum<<else>>repeatedly pump bursts of cum into $him until it flows out around your toy<</if>>. <<= VCheck.Vaginal()>> <<else>> - you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending $him over the edge. + you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly; pantomiming it swelling to an obscene size with children and sending $him over the edge. <</if>> <</if>> @@.hotpink;$He has become more devoted to you,@@ and @@.lightcoral;$he is desperately eager to get pregnant.@@ diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw index fbbe27505e9d8538692027bf80d2d2e724296bf4..156e1d75748b0e8f8c7811a930e1be3b0967b7fa 100644 --- a/src/uncategorized/RETS.tw +++ b/src/uncategorized/RETS.tw @@ -929,7 +929,7 @@ $subSlave.slaveName <<if _lewd>>blushes at the lewd<<else>>smiles at the<</if>> <<if $activeSlave.releaseRules == "permissive">> "Why don't you ju<<s>>t jerk off," _he2 asks dismissively. "<<S>>eriou<<s>>ly, you're allowed to." <<else>> - "Go find <<s>>omeone el<<s>>e," _he2 <<say>>s dismissively. "<<if _vaginal>>There are plenty of other pu<<ss>>ie<<s>> around for you to play with.<<else>>I'm <<s>>ure you can find <<s>>ome other girl who wouldn't mind late night anal.<</if>>" + "Go find <<s>>omeone el<<s>>e," _he2 <<say>>s dismissively. "<<if _vaginal>>There are plenty of other pu<<ss>>ie<<s>> around for you to play with.<<else>>I'm <<s>>ure you can find <<s>>ome other _girl2 who wouldn't mind late night anal.<</if>>" <</if>> _He2 turns away. <br><br> diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw index bab37e15ab452be7ca3ecf9f70669e18095c2607..086b17f7008beeb8ab60988cf45fc41b1bad6157 100644 --- a/src/uncategorized/barracks.tw +++ b/src/uncategorized/barracks.tw @@ -67,7 +67,7 @@ As you enter the main bay of the armory, lined with modern arms and armor and a Their sleek prototype armor is equipped with advanced restraining weapons. <<case "Rangers">> Their gear has a heavy Western influence; everyone carries heavy revolvers everywhere, and the armor sports rope lariats for lassoing 'cattle.' - <<case "Shepards">> + <<case "Shepherds">> Their gear has a rather gaudy appearance; it makes it easier to attract wayward bimbos that way when they wander off and get lost. <<case "Geniuses">> Their prototype armor is extremely complex to control, but those who can reap the benefits. diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw index 1e816f2706568a6c20fff8e8be21abb046c1b0ac..704755c93c4a711676bfd36e8dc71192aa5c0590 100644 --- a/src/uncategorized/headGirlSuite.tw +++ b/src/uncategorized/headGirlSuite.tw @@ -27,7 +27,7 @@ <<if $HGSuiteEquality == 1>> The two slaves living in $HGSuiteName are ''equals,'' and will alternate weeks as Head Girl and Head Girl's bitch. [[Stop|Head Girl Suite][$HGSuiteEquality = 0]] <<else>> - The current Head Girl will ''remain Head Girl.'' [[Have them alternate|Head Girl Suite][$HGSuiteEquality = 1,$HGSuiteSurgery = 0,$HGSuiteDrugs = 0,$HGSuiteHormones = 0]] //This will only take effect if the other girl is an appropriate candidate// + The current Head Girl will ''remain Head Girl.'' [[Have them alternate|Head Girl Suite][$HGSuiteEquality = 1,$HGSuiteSurgery = 0,$HGSuiteDrugs = 0,$HGSuiteHormones = 0]] //This will only take effect if the other slave is an appropriate candidate// <br> <<if $HGSuiteSurgery == 1>> $He is ''allowed'' to use surgical modification on $his slave. [[Disallow|Head Girl Suite][$HGSuiteSurgery = 0]] diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw index 768d733da0b1eba98a90acfe20852f9c95b4967a..09517ea8312064e07bc58a98d2a375bcdb8777ed 100644 --- a/src/uncategorized/jeSlaveDispute.tw +++ b/src/uncategorized/jeSlaveDispute.tw @@ -201,7 +201,7 @@ <br><br> The school's representative is apologetic, but firm. The school readily admits an error, but he protests that they weren't aware of the confusion, either. They've offered to buy $him back, with interest, but reject what they call an exorbitant demand for compensation. They produce the original pedigree, protesting that it shows that they were lied to, too. The slave does resemble the supposed parents closely; only an unusually invasive check would have disclosed the fraud. <<case "indenture deal">> - A slutty-looking $girl appears, bearing a split lip and a black eye, accusing a slave trader of tricking $him. $He sends you a lengthy contract of indentured servitude. Nothing seems out of order, though indentured servants are becoming less common, since slave labor is usually cheaper and less limited. The angry accuser claims that the trader told $him that $he wouldn't be required to have sex while indentured. The promise doesn't seem to be in writing, but the girl bitterly insists that it was made. "And now," $he almost shrieks, "he's making me be a whore. I got assfucked five times yesterday. Five!" + A slutty-looking $girl appears, bearing a split lip and a black eye, accusing a slave trader of tricking $him. $He sends you a lengthy contract of indentured servitude. Nothing seems out of order, though indentured servants are becoming less common, since slave labor is usually cheaper and less limited. The angry accuser claims that the trader told $him that $he wouldn't be required to have sex while indentured. The promise doesn't seem to be in writing, but the $girl bitterly insists that it was made. "And now," $he almost shrieks, "he's making me be a whore. I got assfucked five times yesterday. Five!" <br><br> The trader indignantly denies ever making any such commitment, and points out, correctly, that $he has no proof. He protests that he only made the indentured servitude deal as a favor to $him, and is angry that $he's repaying his courtesy in not insisting on enslavement by this ingratitude. "I see here in the record that $he was indeed used anally five times yesterday," he observes acidly. "But that's $his job." <<default>> diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw index 2db8ae499a1015f59d641cd49485a7a2f68e35dc..7d75648c0647991c5dbc3b61255a0263367f970f 100644 --- a/src/uncategorized/pCitizensAndCivilians.tw +++ b/src/uncategorized/pCitizensAndCivilians.tw @@ -283,13 +283,13 @@ <</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> <<if $arcologies[0].FSIntellectualDependency >= 10>> -<br><<link "They shall be the Shepards">> +<br><<link "They shall be the Shepherds">> <<replace "#result">> - You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how needed this was. Just the other day I saw a half dozen bimbos waiting for a broken elevator. When I walked past an hour later, they were still waiting." He rises and gives you a short bow. "Shepard of the slow reporting for duty, <<= properTitle()>>." The mercenaries — no, the Shepards — are well looked after. They are each assigned a nice apartment, a very horny servant to stake their lust, and a suit of prototype armor equipped with the latest of weapons and a bevy of toys to lure wayward slaves with. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@ + You ask for a meeting with your mercenaries' captain and lay out a proposal for a new contract between you over $PC.refreshment. As he reviews the terms, he looks skeptical, then surprised, then interested, and finally, he breaks out into laughter. "<<= properTitle()>>," he says, "you have no idea how needed this was. Just the other day I saw a half dozen bimbos waiting for a broken elevator. When I walked past an hour later, they were still waiting." He rises and gives you a short bow. "Shepherd of the slow reporting for duty, <<= properTitle()>>." The mercenaries — no, the Shepherds — are well looked after. They are each assigned a nice apartment, a very horny servant to stake their lust, and a suit of prototype armor equipped with the latest of weapons and a bevy of toys to lure wayward slaves with. Word of the innovation runs through the Free Cities @@.green;like wildfire.@@ <<run repX(5000, "event")>> <<run cashX(forceNeg(_cost), "mercenaries")>> <<set $mercenaries = 5>> - <<set $mercenariesTitle = "Shepards">> + <<set $mercenariesTitle = "Shepherds">> <</replace>> <</link>> <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost <<print cashFormat(10000)>> and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost <<print cashFormat(20000)>> and incur significant upkeep costs//<</if>> <</if>> diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw index 02bceec4236386964aed72229cc3195f83e01544..55fde756aa0368440198ec1fa4f19f24eb3622b8 100644 --- a/src/uncategorized/pHostageAcquisition.tw +++ b/src/uncategorized/pHostageAcquisition.tw @@ -131,7 +131,7 @@ Your hired mercenaries are en route now with your precious cargo. <<set $activeSlave.trust = 80>> Your mercenaries radio you upon arrival. "This one's got quite a lip on $him, you better ready yourself. We're coming in now." Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "<<S>>tay away from me, you <<s>>ick freak! My body i<<s>> undefiled by child and never will be! I know your type! All you want to do i<<s>> watch my belly <<s>>well with —" - The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the girl you used to know. Odds are high that $he'll cause problems for you in the future, especially given $his hatred for pregnancy. + The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future, especially given $his hatred for pregnancy. <</if>> <<case "Eugenics">> <<set $activeSlave.health = 50>> @@ -180,7 +180,7 @@ Your hired mercenaries are en route now with your precious cargo. <<set $activeSlave.trust = 80>> Your mercenaries radio you upon arrival. "This one's got quite some spunk in $him, you better ready yourself. We're coming in now." Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "<<S>>tay away from me, you <<s>>ick fuck! Vagina<<s>> are for <<s>>e<<x>>, not a<<ss>>hole<<s>>! Don't you dare come near my a<<ss>> —" - The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his views on a $girl's place in society. + The mercenary captain quickly gags $him, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his views on a $girl's place in society. <</if>> <<case "Gender Fundamentalism">> <<set $activeSlave.health = 20>> @@ -197,7 +197,7 @@ Your hired mercenaries are en route now with your precious cargo. <<set $activeSlave.trust = 80>> Your mercenaries radio you upon arrival. "This one's quite lively, you better ready yourself.<<if $seeDicks != 0>> $He's been rock hard the entire way here, we think $he might have something crammed up $his rear. What ever it is, it isn't dangerous.<</if>> We're coming in now." Upon seeing you, $activeSlave.slaveName's eyes fill with a distinct hatred. As you step forward, $he stands $his ground. After several steps, $he shouts "<<S>>tay away from me, you <<s>>ick fuck! A<<ss>>hole<<s>> are the <<s>>uperior <<s>>e<<x>> organ!"<<if $seeDicks != 0>> $He quickly flexes $his Kegels several times and blows a load of cum across your shoes<<else>> $He spits on your shoes<</if>>. - The mercenary captain quickly pulls $him back, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember<<if $seeDicks != 0>>, save for $his working cock and balls<</if>>, but $he acts nothing like the girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his penchant for sticking things in butts. + The mercenary captain quickly pulls $him back, "My apologies, I did warn you $he was a handful. Please be careful when you unbind $him, $he may try to do something stupid," he says as he and his group exit your penthouse, leaving you with the enraged $activeSlave.slaveName. $He looks the same as you remember<<if $seeDicks != 0>>, save for $his working cock and balls<</if>>, but $he acts nothing like the $girl you used to know. Odds are high that $he'll cause problems for you in the future, given $his penchant for sticking things in butts. <</if>> <<case "Paternalism">> <<if $rivalryDuration <= 5>>