diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 3ed9afcd0f5467b48e73c95b87e6dc3bc0812e45..8dcded9c3a60a8bceaea736fccbeb118dcc540cc 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1048,6 +1048,8 @@ You should have received a copy of the GNU General Public License along with thi <<set $rivalOwnerEnslaved = 0>> <<set $rivalryPower = 0>> <<set $rivalryDuration = 0>> +<<set $rivalRace = 0>> +<<set $rivalGender = 0>> <<set $nationHate = 0>> <<set $slaveMedic = 0>> <<set $PShoot = 0>> diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw index e558d5f58921a9d46ac08fba7e9e9978787695c8..5ca29cd68efb94dd46a46d12f6deeeab3c2d0c84 100644 --- a/src/pregmod/reMaleCitizenHookup.tw +++ b/src/pregmod/reMaleCitizenHookup.tw @@ -1,4 +1,4 @@ -:: RE male citizen hookup [nobr] +:: RE male citizen hookup [nobr] <<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">> diff --git a/src/uncategorized/pCoupAftermath.tw b/src/uncategorized/pCoupAftermath.tw index c71f6df2f10c8bc6446ae4e9cb76a1e945bc5edf..c0ff3e4f1735796e179b349ed83f872982b667ba 100644 --- a/src/uncategorized/pCoupAftermath.tw +++ b/src/uncategorized/pCoupAftermath.tw @@ -1,13 +1,25 @@ :: P coup aftermath [nobr] <<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $rivalOwner = 0, $rivalryPower = 0, _num = random(0,99)>> /* hide button until user makes a selection */ +<<if _num <= $seeDicks>> + <<set $rivalGender = 2>> +<<else>> + <<set $rivalGender = 1>> +<</if>> +<<if $rivalGender == 2>> + <<set _heR = "he">> + <<set _HeR = capFirstChar(_heR)>> +<<else>> + <<set _heR = "she">> + <<set _HeR = capFirstChar(_heR)>> +<</if>> <<setAssistantPronouns>> <<if $mercenaries == 0>>Your security drones<<elseif $mercenaries <= 3>>Your mercenaries<<else>>Your $mercenariesTitle<</if>> perform the grisly task of disposing of the bodies of the Daughters killed in the assault. They strip them of anything that might be of use in cleaning up after the attempted coup — communication devices, PDAs, computers, even handwritten notes. The raw intel is scanned and passed to $assistantName. Most of it is rubbish. <br><br> -Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," _heA says in a tone of satisfaction, "is the <<if _num < $seeDicks>>bastard<<elseif (_num-25) < $seeDicks>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>> +Some of it is not. There is evidence of payments from a <<if $rivalSet == 0>>nearby Free City<<else>>neighboring arcology<</if>> to the leadership of the Daughters. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> is silent for a long time, crosschecking records to assemble a complete picture despite your enemies' attempts to disguise the transactions. Finally, $assistantName finishes and displays a picture, using nearly the entire surface of your desk for effect. <<if $assistant > 0>>"This," _heA says in a tone of satisfaction, "is the <<if $rivalGender == 2>>bastard<<elseif $rivalGender == 1>>bitch<<else>>cunt<</if>> you want, <<= properTitle()>>."<<else>>"This," _heA says neutrally, "is the culprit, <<= properTitle()>>."<</if>> -The face is vigorous, determined, <<if _num < $seeDicks>>and masculine. The very stereotype of the male arcology owner.<<elseif (_num-50 < $seeDicks)>>and androgynous. The very stereotype of the dissolute arcology owner.<<else>>and feminine. The very stereotype of the female arcology owner.<</if>> +The face is vigorous, determined, <<if $rivalGender == 2>>and masculine. The very stereotype of the male arcology owner.<<elseif ($rivalGender == 1)>>and feminine. The very stereotype of the female arcology owner.<<else>>and androgynous. The very stereotype of the dissolute arcology owner.<</if>> <<if $rivalSet != 0>> And, as you suspected, it's one of your neighbors. It's the individual who owns <<for $i = 0; $i < $arcologies.length; $i++>> @@ -18,7 +30,7 @@ The face is vigorous, determined, <<if _num < $seeDicks>>and masculine. The very <</for>> <br><br> <</if>> -Your assistant continues, "<<if _num < $seeDicks>>He<<else>>She<</if>> came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack <<if _num < $seeDicks>>him<<else>>her<</if>>, but <<if _num < $seeDicks>>he<<else>>she<</if>> bought them off and sent them after you, instead."<<if $assistant > 0>> "I wonder," she teases, "if <<if _num < $seeDicks>>he<<else>>she<</if>> thinks you're cute, or what?"<</if>> +Your assistant continues, "_HeR came into an arcology about when you did, <<= properTitle()>>. It seems the Daughters originally planned to attack _himR, but _heR bought them off and sent them after you, instead."<<if $assistant > 0>> "I wonder," _heA teases, "if _heR thinks you're cute, or what?"<</if>> <br><br> You inquire as to whether there's any identifiable cause for the evident dislike. <<if $rivalryFS != 0>> @@ -33,7 +45,7 @@ You inquire as to whether there's any identifiable cause for the evident dislike <<link "Contact the culprit privately and discuss the matter">> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <<replace "#result">> - Your fellow arcology owner proves very receptive to your missive, as well they might. Your defeat of the Daughters has made a major impact on the willingness of slaveowners to discuss slave revolts in public, and any arcology owner who was proved to be funding anti-slaver violence, even under duress, would be shunned. With very little prompting, <<if _num < $seeDicks>>he<<else>>she<</if>> forwards a @@.yellowgreen;huge indemnity payment.@@ It's nowhere near enough to cause bankruptcy, but it's enough to give you a massive advantage should you find yourselves at odds again. + Your fellow arcology owner proves very receptive to your missive, as well they might. Your defeat of the Daughters has made a major impact on the willingness of slaveowners to discuss slave revolts in public, and any arcology owner who was proved to be funding anti-slaver violence, even under duress, would be shunned. With very little prompting, _heR forwards a @@.yellowgreen;huge indemnity payment.@@ It's nowhere near enough to cause bankruptcy, but it's enough to give you a massive advantage should you find yourselves at odds again. <<run cashX(100000, "war")>> <</replace>> <</link>> diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw index 983dc2e0274e34d9373aa433f2c1a60cb1d71902..5fbc3eadc953f02609919f622bcc2c68c5f78e7f 100644 --- a/src/uncategorized/pRivalryActions.tw +++ b/src/uncategorized/pRivalryActions.tw @@ -1,6 +1,6 @@ :: P rivalry actions [nobr] -<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $rivalryDuration += 1, _num = random(1,99)>> +<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $rivalryDuration += 1>> <<if $hostageAnnounced == 1>> /* 000-250-006 */ @@ -3828,11 +3828,23 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty <br><br> +<<if $rivalGender == 2>> + <<set _hisR = "his">> + <<set _himR = "him">> + <<set _HeR = "He">> + <<set _HisR = capFirstChar(_hisR)>> +<<else>> + <<set _hisR = "her">> + <<set _himR = "her">> + <<set _HeR = "She">> + <<set _HisR = capFirstChar(_hisR)>> +<</if>> + You remind yourself that success in this conflict will not be defined by the traditional measures of impending victory and defeat. The primary concern here is the weight of your holdings against those of your opponent. Improving your arcology's prosperity will move you closer to victory<<if $rivalSet == 1>>, and so will attacking the prosperity of your rival's neighboring arcology through economic means<</if>>. Of course, you can also take more direct action. <br><br> -<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> collates several options for directly attacking your rival. This is a corporate war, not a military one; your peers would not tolerate a direct attack on <<if _num < $seeDicks>>him.<<else>>her.<</if>> You must bankrupt your opponent so they are no longer able to hide within the physical and intangible fortress that is their arcology. Your rival <<if ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.6>>is on their economic knees, putting them on the verge of defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.7>>is in a bad financial state, well on the way to final dissolution and defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.8>>has taken some hard corporate blows but is still standing.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.9>>is starting to feel the pressure.<<else>>is essentially undamaged; you have hard work ahead of you.<</if>> +<<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> collates several options for directly attacking your rival. This is a corporate war, not a military one; your peers would not tolerate a direct attack on _himR. You must bankrupt your opponent so they are no longer able to hide within the physical and intangible fortress that is their arcology. Your rival <<if ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.6>>is on their economic knees, putting them on the verge of defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.7>>is in a bad financial state, well on the way to final dissolution and defeat.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.8>>has taken some hard corporate blows but is still standing.<<elseif ($rivalOwner-$rivalryPower)/$arcologies[0].prosperity < 0.9>>is starting to feel the pressure.<<else>>is essentially undamaged; you have hard work ahead of you.<</if>> <br><br> @@ -3840,13 +3852,13 @@ You remind yourself that success in this conflict will not be defined by the tra <<link "Apply <<print cashFormat(10000)>> in standard corporate warfare">> <<if random(1,100) > 50>> <<replace "#result">> - Money is your infantry, your weapon, your ammunition in one. Last century, your soldiers would have died taking the enemy's positions. Today, your ¤ die @@.green;taking@@ <<if _num < $seeDicks>>his<<else>>her<</if>> holdings. Once more unto the breach. + Money is your infantry, your weapon, your ammunition in one. Last century, your soldiers would have died taking the enemy's positions. Today, your ¤ die @@.green;taking@@ _hisU holdings. Once more unto the breach. <<run cashX(-10000, "war")>> <<set $rivalryPower += 2>> <</replace>> <<else>> <<replace "#result">> - Money is your infantry, your weapon, your ammunition in one. Last century, your soldiers would have died before the enemy's machine guns. Today, your ¤ die @@.red;failing to take@@ <<if _num < $seeDicks>>his<<else>>her<</if>> holdings. Once more unto the breach. + Money is your infantry, your weapon, your ammunition in one. Last century, your soldiers would have died before the enemy's machine guns. Today, your ¤ die @@.red;failing to take@@ _hisU holdings. Once more unto the breach. <<run cashX(-10000, "war")>> <<set $rivalryPower += 1>> <</replace>> @@ -3871,14 +3883,14 @@ You remind yourself that success in this conflict will not be defined by the tra <</link>> <br><<link "Use <<print cashFormat(25000)>> creating local shortages">> <<replace "#result">> - With enough money, it's entirely possible to temporarily overwhelm even the advanced free market of the Free Cities. You choose a few critical items — pharmaceutical materials, electronic components, and other physical items — and purchase shipments intended for your rival's arcology. <<if _num < $seeDicks>>His<<else>>Her<</if>> tenants are @@.green;seriously inconvenienced@@ and blame their difficulties on their hapless landlord. + With enough money, it's entirely possible to temporarily overwhelm even the advanced free market of the Free Cities. You choose a few critical items — pharmaceutical materials, electronic components, and other physical items — and purchase shipments intended for your rival's arcology. _HisR tenants are @@.green;seriously inconvenienced@@ and blame their difficulties on their hapless landlord. <<run cashX(-25000, "war")>> <<set $rivalryPower += 3>> <</replace>> <</link>> <br><<link "Devote <<print cashFormat(50000)>> to purchasing the support of your peers">> <<replace "#result">> - Your fellow arcology owners have an interest in seeing the funder of the Daughters' attempt on you destroyed, but few of them are willing to spend any money or real effort on the matter. You do a few of them the favor of making the money and effort spent yours. Your rival finds <<if _num < $seeDicks>>his<<else>>her<</if>> dealings with your mutual peers becoming @@.green;strangely difficult.@@ Market opinion is swinging your way. + Your fellow arcology owners have an interest in seeing the funder of the Daughters' attempt on you destroyed, but few of them are willing to spend any money or real effort on the matter. You do a few of them the favor of making the money and effort spent yours. Your rival finds _hisR dealings with your mutual peers becoming @@.green;strangely difficult.@@ Market opinion is swinging your way. <<run cashX(-50000, "war")>> <<set $rivalryPower += 5>> <</replace>> @@ -3887,7 +3899,7 @@ You remind yourself that success in this conflict will not be defined by the tra <<if $rep >= 15000>> <br><<link "Use your connections to throttle your rival's arcology">> <<replace "#result">> - With every external, and several internal, supply lines severed, <<if _num < $seeDicks>>his<<else>>her<</if>> tenants are faced with imminent destruction and @@.green;rise up@@ against their hapless landlord. <<if _num < $seeDicks>>He<<else>>She<</if>> will not be able to weather such a siege for long. + With every external, and several internal, supply lines severed, _hisR tenants are faced with imminent destruction and @@.green;rise up@@ against their hapless landlord. _HeR will not be able to weather such a siege for long. <<set $rivalryPower += 10>> <</replace>> <</link>> //This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival// diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw index 8c4fe76b60931eb89e3001f4677a97b8271085ea..244c2a2bf05d69d09e73559659744641498a0bf4 100644 --- a/src/uncategorized/pRivalryCapture.tw +++ b/src/uncategorized/pRivalryCapture.tw @@ -1,9 +1,8 @@ :: P rivalry capture [nobr] <<set $rivalOwner = -1>> -<<set _num = random(1,99)>> <<set _rivalType = []>> -<<if _num <= $seeDicks>> +<<if $rivalGender == 2>> <<set _rivalType.push("expansionist shemale")>> <<set _rivalType.push("masculine")>> <<set _rivalType.push("micropenis")>> @@ -475,4 +474,5 @@ the delicious moment of finding your rival on $his knees in front of you with a <<set $nextLink = "AS Dump", $returnTo = "P rival initiation", $rivalID = $activeSlave.ID>> /* proceed directly to rival initiation event after New Slave Intro */ <<set $rivalRace = 0>> +<<set $rivalGender = 0>> <<include "New Slave Intro">> diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw index c868025402c3bea1ae086eff81dc8700484855b5..34afe226f95956ba4088ab950304bd951ddca92b 100644 --- a/src/uncategorized/pRivalryHostage.tw +++ b/src/uncategorized/pRivalryHostage.tw @@ -239,6 +239,11 @@ /* 000-250-006 */ </span> +<<if $rivalGender == 2>> + <<set _heR = "he">> +<<else>> + <<set _heR = "she">> +<</if>> <<setLocalPronouns $activeSlave>> <<setPlayerPronouns>> @@ -269,7 +274,7 @@ Only a few days into your inter-arcology war, you receive a video message from y <<case "arcology owner">> time owning another arcology. $He was a prominent citizen who supported your government. You were never particularly close, <</switch>> -but you do remember $him, and your rival knows it. This is obviously the best they could come up with to provoke an emotional reaction. +but you do remember $him, and your rival knows it. This is obviously the best _heR could come up with to provoke an emotional reaction. <br><br> "Hello, <<= PlayerName()>>," your rival sneers. "Sorry to pull you away from diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw index d7844212c1c24f89f984e040f619e184b9607e28..81801ded0d298128110e4a0b8bac40a06314a6f4 100644 --- a/src/uncategorized/pRivalryVictory.tw +++ b/src/uncategorized/pRivalryVictory.tw @@ -1,13 +1,25 @@ :: P rivalry victory [nobr] -<<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $rivalOwner = 0, $rivalryPower = 0, _num = random(1,99)>> /* hide button until user makes a selection */ +<<set $nextButton = " ", $nextLink = "Random Nonindividual Event", $rivalOwner = 0, $rivalryPower = 0>> /* hide button until user makes a selection */ <<set $rivalRace = 0>> +<<if $rivalGender == 2>> + <<set _heR = "he">> + <<set _hisR = "his">> + <<set _HeR = capFirstChar(_heR)>> + <<set _HisR = capFirstChar(_hisR)>> +<<else>> + <<set _heR = "she">> + <<set _hisR = "her">> + <<set _HeR = capFirstChar(_heR)>> + <<set _HisR = capFirstChar(_hisR)>> +<</if>> + -For the first time, you receive a direct call from your rival. You pictured the moment as feeling grander than this, sitting at your desk as usual looking into <<if _num < $seeDicks>>his<<else>>her<</if>> downcast face. You're the victor in a new form of warfare in which bankruptcy has replaced surrender. If the world survives in its present state, you may one day be remembered as an innovator in the evolution of (nearly) bloodless war. Today, your reputation has @@.green;greatly improved.@@ But today all you have that's tangible is a view of a still-dignified arcology owner, self-possessed despite the situation. +For the first time, you receive a direct call from your rival. You pictured the moment as feeling grander than this, sitting at your desk as usual looking into _hisR downcast face. You're the victor in a new form of warfare in which bankruptcy has replaced surrender. If the world survives in its present state, you may one day be remembered as an innovator in the evolution of (nearly) bloodless war. Today, your reputation has @@.green;greatly improved.@@ But today all you have that's tangible is a view of a still-dignified arcology owner, self-possessed despite the situation. <br><br> -"For what it's worth," <<if _num < $seeDicks>>he<<else>>she<</if>> says without preamble, "I had nothing against you. The Daughters wouldn't accept a straight buy-off. Their leadership needed a target to attack, or the rank and file would have killed them themselves and gone ahead attacking me. I had to give them an alternative, or it would have been me." <<if _num < $seeDicks>>He<<else>>She<</if>> looks nervous for the first time. "So, what do we do now? I've still got enough resources to make the end of this story a messy one for you. Let me go, and I won't. I'll walk away, and I'll sign everything I've got left over to you.<<if $hostageAnnounced == 1>> Including $hostage.slaveName, of course.<</if>>" +"For what it's worth," _heR says without preamble, "I had nothing against you. The Daughters wouldn't accept a straight buy-off. Their leadership needed a target to attack, or the rank and file would have killed them themselves and gone ahead attacking me. I had to give them an alternative, or it would have been me." _HeR looks nervous for the first time. "So, what do we do now? I've still got enough resources to make the end of this story a messy one for you. Let me go, and I won't. I'll walk away, and I'll sign everything I've got left over to you.<<if $hostageAnnounced == 1>> Including $hostage.slaveName, of course.<</if>>" <br><br> @@ -17,7 +29,7 @@ For the first time, you receive a direct call from your rival. You pictured the <<replace "#result">> You accept, magnanimous in victory. "I don't think I would have done that," your rival replies. "Thank you. When they write the book, I'll make sure you look good." <<if $rivalSet != 0>> - <<if _num < $seeDicks>>His<<else>>Her<</if>> remaining liquid assets will go to satisfy her great debts, <<if _num < $seeDicks>>his<<else>>her<</if>> @@.yellowgreen;arcology holdings are yours.@@ + _HisR remaining liquid assets will go to satisfy _hisR great debts, but _hisR @@.yellowgreen;arcology holdings are yours.@@ <<for _prv = 0; _prv < $arcologies.length; _prv++>> <<if $arcologies[_prv].rival == 1>> <<set $arcologies[_prv].embargo = 0>> @@ -32,7 +44,7 @@ For the first time, you receive a direct call from your rival. You pictured the <</for>> <<if $hostageAnnounced == 1>><<set $hostageRescued = 1>><</if>> <<else>> - <<if _num < $seeDicks>>His<<else>>Her<</if>> arcology will go to satisfy her great debts, but you will still profit @@.yellowgreen;immensely@@ from your victory<<if $hostageAnnounced == 1>>, and acquire $hostage.slaveName as a slave<</if>>. + _HisR arcology will go to satisfy _hisR great debts, but you will still profit @@.yellowgreen;immensely@@ from your victory<<if $hostageAnnounced == 1>>, and acquire $hostage.slaveName as a slave<</if>>. <<run cashX(random(100000,250000), "war")>> <</if>> <</replace>> diff --git a/src/uncategorized/reBusyMasterSuite.tw b/src/uncategorized/reBusyMasterSuite.tw index 2fe805741e20ae22e0b9720fc99d0f8fa76c9091..8efb33a6afb69b57930e6d5b75c4b087d4ec2076 100644 --- a/src/uncategorized/reBusyMasterSuite.tw +++ b/src/uncategorized/reBusyMasterSuite.tw @@ -22,7 +22,7 @@ You have an extended meeting with a prominent citizen planned, from the start of business in the morning until you're done. That's likely to be in the late evening, since he's probably going to get into technical business proposals, and $Concubine.slaveName knows it. $He is surprised, therefore, when a minor business emergency calls your would-be interlocutor away, canceling the meeting and sending you home hours earlier than you'd planned. $He <<if canTalk($Concubine)>>giggles helplessly<<else>>signs humorously<</if>> at the surprise when you walk into your suite. Apparently, $he decided to while away the hours until you got back by having some truly grandiose group sex with all the slaves you have in the suite. - <br><br> +<br><br> $He had to turn to greet you as you entered, since $he was facing away from the entry, and the reason why is rather obvious. Up near the opposite wall, _msSlaves[0].slaveName is on the floor with _his2 face down and _his2 ass up. @@ -74,6 +74,7 @@ $He had to turn to greet you as you entered, since $he was facing away from the <<else>> who is propped up against _msSlaves[$i].slaveName's _msSlaves[$i].skin butt. <</if>> +<</for>> Finally, _msSlaves[$i].slaveName's <<if _msSlaves[$i].anus > 2>> @@ -235,9 +236,10 @@ who has paused $his thrusting to issue a peremptory order to the slaves to stay <<else>> <<set $slaves[_reBMS].trust += 1, $slaves[_reBMS].counter.oral += 2, $oralTotal += 2>> <</if>> - <</for>> + <</if>> + <</for>> <</replace>> - <</link>> - </span> +<</link>> +</span> <</if>> /* closes eligibility check */ diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 96ff3ac91a705cbc52e4524a291e661b77e09688..254763b5142146250b7f64cfa82a43a198d9a6e5 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1,4 +1,4 @@ -:: Slave Interact [nobr] +:: Slave Interact [nobr] <<if $cheatMode == 1>> <center>//[[Cheat Edit Slave|MOD_Edit Slave Cheat][$cheater = 1]] | [[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]]//</center>