diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 5d523edb5d8548ab07e21bbd92a2a0565073704d..d5465cc6ee51a9bd9a6c2de1aacdfa2866e2ea7f 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,23 @@
0.10.7.1-0.1.x
+4/01/2018
+
+ 20
+ -various little fixes
+ -fixed slimming diet not lowering muscle
+ -many typo corrections
+
+3/31/2018
+
+ 19
+ -fixes
+ -more nicknames
+
+ 18
+ -bunch of bug fixes, typo corrections and scene oddity fixes
+ -also more nicknames
+
3/30/2018
17
diff --git a/devNotes/twine JS b/devNotes/twine JS
index b2545e3d95cba3884723d15797b9d8a415156346..f6809f4a75fe3c3c68eec941defeda745f0dd98a 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -4783,7 +4783,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.boobs > 1400) {
+ if(eventSlave.boobs >= 2000) {
if(eventSlave.boobsImplant == 0) {
if(eventSlave.nipples != "tiny") {
if(eventSlave.devotion > 20) {
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index e19c46956107af42b111d2bf40678ac9487bf889..3c9554c88a12559be40adb601a708f93b45cd163 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -516,7 +516,7 @@ Defensive tactics
<<set $chosenTactic = "Bait and Bleed">>
<<replace "#tactic">><strong><<print $chosenTactic>></strong><</replace>>
<</link>>
-<br> //Combines bait and switch tactics with guerriglia style assaults, with the objective of slowly bleed the enemy.//
+<br> //Combines bait and switch tactics with guerrilla style assaults, with the objective of slowly bleed the enemy.//
<br>
<<link "Guerrilla">>
<<set $chosenTactic = "Guerrilla">>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 5f57a4812b33f02495f92002a6271eabd26fc4c3..cc562291a2b42fc262fe8918b1d5bc3749487877 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -698,150 +698,105 @@
<<if $leadingTroops == "PC">>
You decided to personally lead the defense of your arcology.
<<if $deployingMilitia == 1>>
- <<if _oldRep <= 2500 && _oldRep > 1000>>
- You're not particularly popular between the inhabitants of your arcology, so your presence does little to reassure the volunteers
- <<elseif _oldRep <= 1000>>
- As your low reputation proves, your volunteers do not particularly enjoy your company. As far as they are concerned your presence is more of an hindrance than an advantage
- <</if>>
- <<if $PC.career == "celebrity">>
- , still your past celebrity does carry some weight, many do look forward to fight alongside a famous name.
- <<elseif $PC.career == "capitalist">>
- , still your past life as a famous venture capitalist does carry some weight, many trust in your cunning to save them in the incoming battle.
- <<elseif $PC.career == "gang">>
- , the situation is not made easier by your past. Many still remember you as the gang leader who used to be on the other side of their guns.
- <<elseif $PC.career == "escort">>
- , the situation is not made easier by your past. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
- <<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
- <<else>>
- .
- <</if>>
- <<if _oldRep >= 5000 && _oldRep < 15000>>
- Your citizens are honored that their arcology owner is willing to put <<if $PC.title == 0>>her<<else>>his<</if>> life in danger
- <<elseif _oldRep >= 15000>>
- Many among the volunteers are awed by your presence, never would they have thought they would fight shoulder to shoulder with their famous arcology owner
- <</if>>
- <<if $PC.career == "celebrity">>
- , not to mention the priceless opportunity of fighting together with someone with such a renowned past as yours. Your celebrity still does carry its weight.
- <<elseif $PC.career == "capitalist">>
- , not to mention the priceless opportunity of fighting together with one of the great capitalist sharks of their time. Such fine mind on their side can only bring victory!
- <<elseif $PC.career == "gang">>
- , your past, however, does not help you: many still remember you as the gang leader who used to be on the other side of their guns.
- <<elseif $PC.career == "escort">>
- , your past, however, does not help you: many still remember your past career as an escort and doubt you'll be of any use during the fighting.
- <<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
- <<else>>
- .
- <</if>>
- <</if>>
- <<if $deployingSlaves == 1>>
- <<if _oldAuth <= 2500 &&_oldAuth > 1000>>
- Your slave soldiers do not feel bound to you as much as they should, as your authority is far from absolute
- <<if $PC.career == "escort">>
- , fortunately many feel some level of kinship with you, thanks to your past as an escort.
- <<elseif $PC.career == "servant">>
- , fortunately many feel some level of kinship with you, thanks to your past as a servant.
- <<elseif $PC.career == "slaver">>
- , things are made worse by your past as a notorious slaver.
+ <<if _oldRep <= 2500>>
+ <<if _oldRep > 1000>>
+ You're not particularly popular between the inhabitants of your arcology, so your presence does little to reassure the volunteers.
+ <<else>>
+ As your low reputation proves, your volunteers do not particularly enjoy your company. As far as they are concerned your presence is more of an hindrance than an advantage.
+ <</if>>
+ <<if $PC.career == "celebrity">>
+ Still, your past celebrity does carry some weight, and many look forward to fight alongside a famous name.
+ <<elseif $PC.career == "capitalist">>
+ Still, your past life as a famous venture capitalist does carry some weight, and many trust in your cunning to save them in the incoming battle.
+ <<elseif $PC.career == "gang">>
+ The situation is not made easier by your past. Many still remember you as the gang leader who used to be on the other side of their guns.
+ <<elseif $PC.career == "escort">>
+ The situation is not made easier by your past. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
<<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+ Still, your past mercenary work does carry some weight, and many look forward to fight alongside a battle hardened name.
+ <</if>>
+ <<elseif _oldRep >= 5000>>
+ <<if _oldRep < 15000>>
+ Your citizens are honored that their arcology owner is willing to put <<if $PC.title == 0>>her<<else>>his<</if>> life in danger.
<<else>>
- .
+ Many among the volunteers are awed by your presence; never would they have thought they would fight shoulder to shoulder with their famous arcology owner.
<</if>>
- <<elseif _oldAuth <= 1000>>
- Your slave soldiers are often openly rebellious. Only the threat of execution hold them in line
- <<if $PC.career == "escort">>
- , fortunately many feel some level of kinship with you, thanks to your past as an escort.
- <<elseif $PC.career == "servant">>
- , fortunately many feel some level of kinship with you, thanks to your past as a servant.
- <<elseif $PC.career == "slaver">>
- , things are made worse by your past as a notorious slaver.
+ <<if $PC.career == "celebrity">>
+ They consider it a priceless opportunity to fight together with someone with such a renowned past as yours. Your celebrity past still carries weight.
+ <<elseif $PC.career == "capitalist">>
+ They consider it a priceless opportunity to fight together with one of the great capitalist sharks of their time. Such a fine mind on their side can only bring victory!
+ <<elseif $PC.career == "gang">>
+ Your past, however, does not help you. Many still remember you as the gang leader who used to be on the other side of their guns.
+ <<elseif $PC.career == "escort">>
+ Your past, however, does not help you. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.
<<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+ Your past mercenary work does carries some weight, and many look forward to fight alongside a battle hardened name.
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if $deployingSlaves == 1>>
+ <<if _oldAuth <= 2500>>
+ <<if _oldAuth > 1000>>
+ Your slave soldiers do not feel bound to you as much as they should, as your authority is far from absolute.
<<else>>
- .
+ Your slave soldiers are often openly rebellious. Only the threat of execution holds them in line.
<</if>>
- <<elseif _oldAuth >= 5000 && _oldAuth < 15000>>
- Your slave soldiers show a surprising amount of discipline, thanks to your high authority
<<if $PC.career == "escort">>
- and the feeling of kinship they instinctively feel towards you, because of your past as an escort.
+ Fortunately many feel some level of kinship with you, thanks to your past as an escort.
<<elseif $PC.career == "servant">>
- and the feeling of kinship they instinctively feel towards you, because of your past as a servant.
+ Fortunately many feel some level of kinship with you, thanks to your past as a servant.
<<elseif $PC.career == "slaver">>
- . Still some rebellious looks can be spotted once in a while, in their eyes your slaver past will always paint you in a dark light.
+ Things are made worse by your past as a notorious slaver.
<<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
+ Your past mercenary work carries some weight, and many look forward to fighting alongside a battle hardened name.
+ <</if>>
+ <<elseif _oldAuth >= 5000>>
+ <<if _oldAuth < 15000>>
+ Your slave soldiers show a surprising amount of discipline, thanks to your high authority.
<<else>>
- .
+ Your slave soldiers show almost a fanatical level of martial discipline. Your absolute authority has a great effect on them.
<</if>>
- <<elseif _oldAuth >= 15000>>
- Your slave soldiers show almost a fanatical level of martial discipline. Your absolute authority has a great effect on them
<<if $PC.career == "escort">>
- and the feeling of kinship they instinctively feel towards you, because of your past as an escort.
+ Many have an instinctual feeling of kinship towards you because of your past as an escort.
<<elseif $PC.career == "servant">>
- and the feeling of kinship they instinctively feel towards you, because of your past as a servant.
+ Many have an instinctual feeling of kinship towards you because of your past as a servant.
<<elseif $PC.career == "slaver">>
- . Still some rebellious looks can be spotted once in a while, in their eyes your slaver past will always paint you in a dark light.
+ Still, some rebellious looks can be spotted once in a while. In their eyes your slaver past will always paint you in a dark light.
<<elseif $PC.career == "mercenary">>
- , still your past merc works does carry some weight, many do look forward to fight alongside a battle hardened name.
- <<else>>
- .
+ Your past mercenary work carries some weight, and many look forward to fighting alongside a battle hardened name.
<</if>>
<</if>>
<</if>>
<<if $deployingMercs == 1>>
<<if $mercLoyalty <= 25>>
- Your presence does little to spur your mercenaries into action, their loyalty is straining and their performance suffers
- <<if $PC.career == "mercenary">>
- , thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
- <<elseif $PC.career == "wealth">>
- and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
- <<elseif $PC.career == "servant">>
- and they do little to hide their disgust at being ordered around by an ex-servant.
- <<elseif $PC.career == "BlackHat">>
- and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
+ <<if $mercLoyalty <= 10>>
+ Your mercenaries barely bother to pretend being loyal; their battle performance is obviously barely passable.
<<else>>
- .
+ Your presence does little to spur your mercenaries into action; their loyalty is straining and their performance suffers.
<</if>>
- <<elseif $mercLoyalty <= 10>>
- Your mercenaries barely bother to pretend being loyal, their battle performance is obviously barely passable
<<if $PC.career == "mercenary">>
- , thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
+ Thankfully they hold in high regard someone who made their fortune as a mercenary themselves.
<<elseif $PC.career == "wealth">>
- and they do little to hide the contempt they have for someone who was born into wealth, rather than gaining it from their sweat.
+ They do little to hide the contempt they have for someone who was born into wealth, rather than gaining it through blood, sweat, and tears.
<<elseif $PC.career == "servant">>
- and they do little to hide their disgust at being ordered around by an ex-servant.
+ They do little to hide their disgust at being ordered around by an ex-servant.
<<elseif $PC.career == "BlackHat">>
- and they do little to hide their disgust at being ordered around by some unscrupulous code monkey.
- <<else>>
- .
+ They do little to hide their disgust at being ordered around by some unscrupulous code monkey.
<</if>>
- <<elseif $mercLoyalty >= 50 && $mercLoyalty < 75>>
- Your mercenaries are ready to fight their hardest for you, their loyalty a testament to your capability as a leader
- <<if $PC.career == "mercenary">>
- , not to mention they're more than willing to follow someone who walked their same steps once as a gun for hire.
- <<elseif $PC.career == "wealth">>
- , unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
- <<elseif $PC.career == "servant">>
- , unfortunately some still resent the fact they are ordered around by an ex-servant.
- <<elseif $PC.career == "BlackHat">>
- , unfortunately some still resent the fact they are ordered around by an unscrupulous hacker.
+ <<elseif $mercLoyalty >= 50>>
+ <<if $mercLoyalty < 75>>
+ Your mercenaries are ready to fight their hardest for you, their loyalty a testament to your capability as a leader.
<<else>>
- .
+ Your mercenaries fight with a martial fury worthy of religious fanatics. Their loyalty to you is absolute.
<</if>>
- <<elseif $mercLoyalty >= 75>>
- Your mercenaries fight with a martial fury worthy of religious fanatics. Their loyalty to you is absolute
<<if $PC.career == "mercenary">>
- , not to mention they're more than willing to follow someone who walked their same steps once as a gun for hire.
+ They're more than willing to follow someone who walked their same steps once as a gun for hire.
<<elseif $PC.career == "wealth">>
- , unfortunately many do still resent you being born into your wealth and power, rather than having earned it with sweat and tears.
+ Unfortunately many still resent you being born into your wealth and power, rather than having earned it through blood, sweat, and tears.
<<elseif $PC.career == "servant">>
- , unfortunately some still resent the fact they are ordered around by an ex-servant.
+ Unfortunately some still resent the fact they are ordered around by an ex-servant.
<<elseif $PC.career == "BlackHat">>
- , unfortunately some still resent the fact they are ordered around by a dubious incursion specialist.
- <<else>>
- .
+ Unfortunately some still resent the fact they are ordered around by an unscrupulous hacker.
<</if>>
<</if>>
<<if _oldRep >= 15000>>
@@ -1297,7 +1252,7 @@
<<elseif $chosenTactic == "Interior Lines">>
While the urban environment offers many highly defensive position, it does restrict movement and with it the advantages of exploiting interior lines.
<<elseif $chosenTactic == "Pincer Maneuver">>
- The urban terrain does not allow for wide maneuvers, the attempts of your forces to encircle the assaulters are mostly unsuccessful.
+ The urban terrain does not allow for wide maneuvers, the attempts of your forces to encircle the attackers are mostly unsuccessful.
<<elseif $chosenTactic == "Defense In Depth">>
While the urban environment offers many defensive positions, it limits mobility, limiting the advantages of using a defense in depth tactic.
<<elseif $chosenTactic == "Blitzkrieg">>
diff --git a/src/SecExp/encyclopediaSecExpMain.tw b/src/SecExp/encyclopediaSecExpMain.tw
index 4a3451b10dd5c25841bf19623e9ee7f0050cf5b8..f676b188df69b64b01917aa0c9a8c9103e04bc8c 100644
--- a/src/SecExp/encyclopediaSecExpMain.tw
+++ b/src/SecExp/encyclopediaSecExpMain.tw
@@ -29,7 +29,7 @@ For a detailed outlook of how battles work see the relative page.
<br><strong>The Barracks</strong>: This is where troops can be prepared and organized to respond to threats encroaching on the arcology's territory.
<br><strong>The Security HQ</strong>: This is where your security department will manage the security of the arcology.
<br><strong>The Propaganda Hub</strong>: This is where your propaganda department will expand and deepen your authority over the arcology.
-<br><strong>The transportHub</strong>: This is where trade happens. Mainly intended as a counter to proserity loss events.
-<br><strong>The riotControlCenter</strong>: Fairly self explanitory, will help you manage rebellions.
+<br><strong>The transportHub</strong>: This is where trade happens. Mainly intended as a counter to prosperity loss events.
+<br><strong>The riotControlCenter</strong>: Fairly self explanatory, will help you manage rebellions.
<br>
<hr>
\ No newline at end of file
diff --git a/src/SecExp/rebellionEvents.tw b/src/SecExp/rebellionEvents.tw
index c767324164d630e5c2209b222a21092a6dd89339..73093a64f9d543f67f27015a75bee76a4555a4df 100644
--- a/src/SecExp/rebellionEvents.tw
+++ b/src/SecExp/rebellionEvents.tw
@@ -25,9 +25,9 @@
<<if _rand == 0>>
This week several slaves were found plotting the death of their master. They were quickly dealt with, but their owner's choice of punishment did little to calm tensions in the arcology.
<<elseif _rand == 1>>
- This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed to dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten.
+ This week a large group of slaves attempted to escape. Several were recaptured, but others were deemed too dangerous and were shot on sight. The unfortunate circumstances raised the disapproval of many citizens, either because of the waste of good slaves or the brutality with which the operation was carried. With a bit of luck, however, the incident will be soon forgotten.
<<elseif _rand == 2>>
- This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences.
+ This week books of unknown origin and dangerous content were found in the possession of several slaves. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. The books were quickly collected and archived, hopefully this affair will not have lasting consequences.
<<elseif _rand == 3>>
This week a citizen was caught giving refuge to an escaped slave. He was not able to pay for the value of the stolen goods, so he was processed as the case required and the slave returned to their rightful master. Many questions however remain without answers.
<<elseif _rand == 4>>
@@ -46,13 +46,13 @@
<<elseif _rand == 1>>
This week an underground railroad was discovered. The rebels did not go down without a fight, but in the end <<if $mercenaries >= 1>>your mercenaries<<else>>your security drones<</if>> managed to destroy the old tunnels they were using to ship out slaves out of the arcology.
<<elseif _rand == 2>>
- This week a famous citizen was assaulted and brutally murdered by his slaves. The responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
+ This week a famous citizen was assaulted and brutally murdered by his slaves. The ones responsible were apprehended and dealt with easily enough, but the mere fact something like this could have happened is concerning. Those slaves had to be aware of their certain doom.
<<elseif _rand == 3>>
- This week a group of slavers entering the arcology was assaulted. Many reported heavy injuries, but fortunately there were no casualties. The assaulters were disguised, but the security systems already identified several slaves who were likely part of the group, based on camera feeds.
+ This week a group of slavers entering the arcology was assaulted. Many reported heavy injuries, but fortunately there were no casualties. The attackers were disguised, but the security systems already identified several slaves who were likely part of the group, based on camera feeds.
<<elseif _rand == 4>>
This week the waterways were found infected by a virulent pathogen. The cause was later found to be a diseased slave that died while in the maintenance tunnels. It's not clear if the slave was there because of orders given to him or if he was trying to escape.
<<else>>
- This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and repeated before they could be dealt with.
+ This week a sleeper cell of a famous anti slavery organization was discovered in the low levels of the arcology. The group however was aware of the coming security forces and retreated before they could be dealt with.
<</if>>
<<set $tension += random(5,10)>>
<<case 3>>
@@ -63,7 +63,7 @@
<<elseif _rand == 1>>
This week a number of shops were burned to the ground by rioting slaves and sympathetic citizens. It took considerable effort for the security forces to take control of the situation. Harsh punishment is required and scheduled for the instigators.
<<elseif _rand == 2>>
- This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by their terrorized peers of the desperate horde of slaves. It will take some time to restore the streets involved to working order.
+ This week a mass escape attempt was barely stopped before becoming a catastrophe. Many citizens were trampled by the desperate horde of slaves. It will take some time to restore the streets involved to working order.
<<elseif _rand == 3>>
This week a number of riots inflamed the arcology. Many slaves took violent actions against citizens and security personnel. The number of victims keeps getting higher as still now the last sparks of revolt are still active.
<</if>>
@@ -73,7 +73,7 @@
<<if _rand == 0>>
This week a citizen refused to pay rent, claiming ideological opposition to the arcology's owner policies. He was quickly dealt with, but his words might not have fallen silent yet.
<<elseif _rand == 1>>
- This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology.
+ This week books of unknown origin and dangerous content were found in the possession of several citizens. They were mostly sociopolitical treaties, making it clear that the intent of the ones responsible was to fan the fire of rebellion. Most of them were bought and archived, but a few are still circling between the citizens of the arcology.
<<elseif _rand == 2>>
This week a citizen was caught giving refuge to other citizens, who would be liable to be enslaved because of their debts. The situation was quickly resolved, but the misplaced generosity of that citizen might have inflamed a few souls.
<<elseif _rand == 3>>
@@ -89,9 +89,9 @@
<<case 5>>
<<set _rand = random(0,5)>>
<<if _rand == 0>>
- This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by our security department.
+ This week a factory was subject to a strike by a group of citizens protesting against the owner. They were promptly arrested and the factory returned to its rightful proprietor by your security department.
<<elseif _rand == 1>>
- This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by our forces.
+ This week a group of citizens organized a protest against the systemic enslavement of the citizens of the arcology. Their little parade gathered a surprisingly large crowd, but it was nonetheless quickly suppressed by your forces.
<<elseif _rand == 2>>
This week the security department registered the formation of several assemblies of citizens, whose purpose seems to be political in nature. For now no further steps were taken, but it's a worrying sign of further political opposition within the arcology.
<<elseif _rand == 3>>
@@ -109,7 +109,7 @@
<<elseif _rand == 1>>
This week several factories were set aflame by their workers. The security department worked day and night to control the fire and apprehend the criminals behind the act. Many are known dissidents, but there are a fair few new faces within them. This is a worrying sign.
<<elseif _rand == 2>>
- This week numerous riots exploded all over the arcology. Many citizens went in the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no little trouble and only through generous use of violence.
+ This week numerous riots exploded all over the arcology. Many citizens took to the streets to protest against the arcology owner and its supporters. The security forces slowly managed to stop the rioters, with no small amount of trouble and only through generous use of violence.
<<elseif _rand == 3>>
This week a massive protest of citizens and slaves gathered just outside the penthouse. The crowd was dispersed only after several hours. There were several victims from both sides and no shortage of injured.
<</if>>
diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 41e445f99956c4f4eaf46da0a23e485f8c763ae1..e7a1783168a8434c27bb088f824473cd05dc193e 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -111,7 +111,7 @@
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
<<if _CSratio > 1>>
- Your citizens are not happy with the noticeable lack of slaves compared to their numbers.<<set _citizen +=20>>
+ Your citizens are not happy with the noticeable lack of slaves compared to their numbers.<<set _citizen += 20>>
<<elseif _CSratio > 0.5>>
Your citizens are not happy with the lack of slaves compared to their numbers.<<set _citizen += 15>>
<<elseif _CSratio < 0.2>>
@@ -119,9 +119,9 @@
<</if>>
<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
<<if _CSratio < 0.5>>
- Your citizens are not happy of being outbred by the slaves of the arcology<<set _citizen +=20>>
+ Your citizens are not happy about being outbred by the slaves of the arcology<<set _citizen += 20>>
<<elseif _CSratio < 1>>
- Your citizens are not happy of being outbred by the slaves of the arcology<<set _citizen += 15>>
+ Your citizens are not happy about being outbred by the slaves of the arcology<<set _citizen += 15>>
<<elseif _CSratio > 1.4>>
<<set _citizen += 5>>
<</if>>
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
index 62a752196c54b95347d683b32d7511ce25051721..ef83cc9584fcc30e8bf0127334e2df2857b59178 100644
--- a/src/SecExp/rebellionReport.tw
+++ b/src/SecExp/rebellionReport.tw
@@ -519,7 +519,7 @@
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
- <<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+ <<set $Concubine.health = -90>>
<</if>>
<</if>>
<</if>>
@@ -582,7 +582,7 @@
<<if $Bodyguard.health >= -60>>
<<set $Bodyguard.health -= 30>>
<<else>>
- <<set $Bodyguard.health -= Math.abs(90 - $Bodyguard.health)>>
+ <<set $Bodyguard.health = -90>>
<</if>>
<</if>>
<</if>>
@@ -689,7 +689,7 @@
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
- <<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+ <<set $Concubine.health = -90>>
<</if>>
<</if>>
<</if>>
@@ -797,7 +797,7 @@
<<if $Concubine.health >= -60>>
<<set $Concubine.health -= 30>>
<<else>>
- <<set $Concubine.health -= Math.abs(90 - $Concubine.health)>>
+ <<set $Concubine.health = -90>>
<</if>>
<</if>>
<</if>>
@@ -831,4 +831,4 @@
<</if>>
<<set $slaveRebellion = 0>>
<<set $citizenRebellion = 0>>
-<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
+<<set $tension = Math.clamp($tension - random(50,100), 0, 100)>>
\ No newline at end of file
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index f342a3c03a1ad2a542d9fbf399995f596c859cb5..962d9b99dbb97c9c379fb326d2021db0dd6bc3a4 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -150,17 +150,17 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<set $riotUpkeep += 5000>>
<<goto "riotControlCenter">>
<</link>>
- <br>//Will take weeks of work and will cost 10000 each, but once finished rebellions will progress a lot slower.//
+ <br>//Will take weeks of work and will cost 5000 each week, but once finished rebellions will progress a lot slower.//
<<elseif $brainImplantProject < 5>>
<<link "Invest more resources in the brain implant project">>
<<set $brainImplantProject += 1>>
<<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier>>
<<set $PC.hacking += 1>>
- <<set $riotUpkeep += $upgradeUpkeep * 100>>
+ <<set $riotUpkeep += 5000>>
<<goto "riotControlCenter">>
<</link>>
<br>Invest more resources into the project to increase its speed.
- <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier))>>. Will shorten the time required to complete the project.//
+ <br>//One-time cost of <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$HackingSkillMultiplier))>> with an additional 5000 each week in maintenance. Will shorten the time required to complete the project.//
<<else>>
You sped up the project to its maximum.
<</if>>
@@ -180,7 +180,7 @@ The riot control center opens its guarded doors to you. The great chamber inside
<</link>>
<br>//Costs <<print cashFormat(30000)>>. Will allow the selection of advanced riot equipment in case of a rebellion, which will let your troops fight at full effectiveness while doing reduced collateral damage.//
<<else>>
- You developed advanced riot equipment, which allows your troops to fight within the confies of your arcology without the fear of doing major collateral damage.
+ You developed advanced riot equipment, which allows your troops to fight within the confines of your arcology without the fear of doing major collateral damage.
<</if>>
<br>
<<if $fort.reactor == 0>>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index d935c9b35c9d2b8497ad245cb46e48d55c051c75..ba68110ef72d2289859ef1fee5a5bf158567a28d 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -6,7 +6,7 @@ The Barracks
<hr>
__Upgrades__
<br>
-While this a sore sight for many citiens of $arcologies[0].name, the barracks stand proud before you.
+While this a sore sight for many citizens of $arcologies[0].name, the barracks stand proud before you.
<<if $secBarracksUpgrades.size == 0>>
The building is relatively small and able to house a limited number of units.
<<elseif $secBarracksUpgrades.size == 1>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 5a8f3bdbe3608953c45d1240bf50be7bae2a525e..ebadaa8d29c58893a04c87f61cbe03f231096342 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -217,7 +217,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<<if $intelUpgrades.sensors == 0>>
[[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed perimeter seismic sensors able to detect movement with high accuracy.
<</if>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index b3b38ffbf1ad036581c5d56f389b87e44966718e..09d1093144c1cadede025db68b06185f75185f2d 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -132,7 +132,7 @@
The training officers of $securityForceName assigned to the Security HQ improve its effectiveness.
<</if>>
<<if $SFSupportLevel >= 1>>
- Providing your Security Department with equipment from $securityForceName slightly boosts the security of your arology.
+ Providing your Security Department with equipment from $securityForceName slightly boosts the security of your arcology.
<</if>>
/* resting point */
diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw
index 7b39e0e1395c40744cb7880892cd47c5071aa365..e45d6025cf49963bb777f7397911350347a7466b 100644
--- a/src/SecExp/unitsBattleReport.tw
+++ b/src/SecExp/unitsBattleReport.tw
@@ -114,7 +114,7 @@
catastrophic casualties
<</if>>
suffered.
- <<if $secBots.troops <= 0>>
+ <<if $secBots.troops <= 5>>
<<set $secBots.active = 0>>
Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. It will take quite the investment to rebuild them.
<<elseif $secBots.troops <= 10>>
@@ -175,7 +175,7 @@
<<set $militiaUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
- <<if $militiaUnits[_j].troops <= 0>>
+ <<if $militiaUnits[_j].troops <= 5>>
<<set $militiaUnits[_j].active = 0>>
<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The remnants will be sent home honored as veterans or reorganized in a new unit.
<<elseif $militiaUnits[_j].troops <= 10>>
@@ -217,9 +217,9 @@
<<set $slaveUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
- <<if $slaveUnits[_j].troops <= 0>>
+ <<if $slaveUnits[_j].troops <= 5>>
<<set $slaveUnits[_j].active = 0>>
- <br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The sorvivors will be sent home honored as veterans or reorganized in a new unit.
+ <br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The survivors will be sent home honored as veterans or reorganized in a new unit.
<<elseif $slaveUnits[_j].troops <= 10>>
<br>The unit has very few operatives left, it risks complete annihilation if deployed again.
<</if>>
@@ -259,7 +259,7 @@
<<set $mercUnits[_j].training += random(5,15) + $majorBattle * random(5,15)>>
<</if>>
<</if>>
- <<if $mercUnits[_j].troops <= 0>>
+ <<if $mercUnits[_j].troops <= 5>>
<<set $mercUnits[_j].active = 0>>
<br>Unfortunately the losses they took were simply too great, their effective combatants are in so small number you can no longer call them a deployable unit. The remnants will be sent home honored as veterans or reorganized in a new unit.
<<elseif $mercUnits[_j].troops <= 10>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index e9daf3365a115bdc2b35fb6dbe25108c7f4007ba..73d587adb15e07a2c6a013ec50988f4d16d11233 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -452,7 +452,7 @@ __''Player Character''__
<<if $PC.title == 1>>
<<set $PCCreationSex = "masculine ''Master''">>
<<else>>
- <<set $PCCreationSex = feminine ''Mistress'>>
+ <<set $PCCreationSex = "feminine ''Mistress''">>
<</if>>
<</if>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index d592884fd60d415ae4399e772ab98551018fd065..001f18257b6f19f53ec5f86d272ee913496404d6 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1076,7 +1076,7 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(eventSlave.boobs > 1400) {
+ if(eventSlave.boobs >= 2000) {
if(eventSlave.boobsImplant == 0) {
if(eventSlave.nipples != "tiny") {
if(eventSlave.devotion > 20) {
diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw
new file mode 100644
index 0000000000000000000000000000000000000000..f9a74eb3de2358c7c608aee7d9f9880a998e7f4f
--- /dev/null
+++ b/src/pregmod/theBlackMarket.tw
@@ -0,0 +1,9 @@
+:: The Black Market [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "The Black Market">>
+
+You board your VTOL bird for the trip the the current location of the particularly exclusive, and quite lucrative, Black Market knowing full well that the trip may take far longer than anticipated; the market frequently relocates to shake the unwanted attention it inevitably gains. It's far easier than paying off authorities, especially with how outrageous their demands have become with the decline of the Old World. You're greeting by a gruff bouncer, already fully aware of just who you are and your permission to be there. "Check your weapons - No firearms allowed inside.<<if $$Bodyguard != 0>> She may keep her blade, "he gesture to $Bodyguard.slaveName, "but keep in mind. If you cause us trouble, you will not be going home in one piece.<<if $Bodyguard.amp <= -4>>" He taps his clearly bionic arm. "Disable her weapons systems. I know what she is capable of.<</if>><</if>>"
+
+<br><br>
+
+Once inside, you are able to fully absorb in the sights and sounds of the market proper. All sorts of items are available for purchase, from exotic beasts that may very well be the last of their kind, to the most lethal of weaponry both old and new, and even luxuries long gone. Despite the overbearing security, one's wallet can easiliy be emptied in this place.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 6c9a7e09b0f0473ff515059b8fe46a273f51e43c..a58c59390d1d351ff6f1930745cd3eaad3065370 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -12920,7 +12920,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<else>>
Getting roughly fucked
<</if>>
- while hugely pregnant isn't the most comfortable way to have sex, neither is being forced to out more pressure on an already overfilled organ, but such is the life of a sex slave.
+ while hugely pregnant isn't the most comfortable way to have sex, neither is being forced to put more pressure on an already overfilled organ, but such is the life of a sex slave.
<<if ($activeSlave.lactation == 1)>>
As you pound her, her breasts, sore from lactation, give her quite a bit of discomfort.
<<elseif ($activeSlave.boobs > 1000)>>
@@ -13287,7 +13287,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
jabbing a thumb into one of her kidneys,
<</if>>
forcing her back to arch in involuntary response, and then grinding her face into the couch cushions.
- <<if canDoVaginal($activeSlave)>>
+ <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
Her cunt isn't all that wet, and she has cause to regret this, first when you fuck it without mercy, and then when you switch your barely-lubricated dick to her anus.
<<BothVCheck>>
She tries to be brave and relax, but those are contradictory goals and she manages neither as you assrape her into inelegant, tearful begging for you to take your dick out of her butt, because it hurts.
@@ -13408,7 +13408,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
jabbing a thumb into one of her kidneys,
<</if>>
forcing her back to arch in involuntary response, and then grinding her face into the couch cushions.
- <<if canDoVaginal($activeSlave)>>
+ <<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
Her cunt isn't all that wet, and she has cause to regret this, first when you fuck it without mercy, and then when you switch your barely-lubricated dick to her anus.
<<BothVCheck>>
She tries to be brave and relax, but those are contradictory goals and she manages neither as you assrape her into inelegant, tearful begging for you to take your dick out of her butt, because it hurts.
@@ -14779,7 +14779,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<switch $assistantAppearance>>
<<case "monstergirl">>
with both her cocks up the asshole of an avatar of $activeSlave.slaveName. Below this, the slave herself is
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14919,7 +14919,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<case "witch">>
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
with her prehensile cocks crammed into every available hole in an avatar of $activeSlave.slaveName. Below this, the slave herself is
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14930,7 +14930,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set $activeSlave.vaginalCount += 2, $vaginalTotal += 2, $activeSlave.analCount += 2, $analTotal += 2>>
<<elseif canDoVaginal($activeSlave)>>
with her prehensile cocks crammed into every available hole in an avatar of $activeSlave.slaveName. Below this, the slave herself is
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14941,7 +14941,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set $activeSlave.vaginalCount += 4, $vaginalTotal += 4>>
<<else>>
with her prehensile cocks crammed into the asshole of an avatar of $activeSlave.slaveName. Below this, the slave herself is
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14958,7 +14958,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
has a huge empathy belly strapped to her middle and is
<</if>>
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14972,7 +14972,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
has a huge empathy belly strapped to her middle and is
<</if>>
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
@@ -14986,7 +14986,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<if isItemAccessible("a huge empathy belly") && $activeSlave.belly < 1500 && $activeSlave.weight <= 130>>
has a huge empathy belly strapped to her middle and is
<</if>>
- <<if $activeSlave.belly >= 5000>>
+ <<if $activeSlave.belly >= 300000>>
face-down, perched atop her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>>,
<<elseif $activeSlave.belly >= 5000>>
face-down, her rear up in the air to give her _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>> room,
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index d08212738e2c8bfefe23f8fe2bb3887ec6c0edf2..ab33a859163752ed803a37f407b19d5bd0aa205a 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -362,84 +362,82 @@
<<if !canWalk($slaves[$i])>>
She is no longer capable of actively working out. Her special diet @@.yellow;has ended.@@
<<set $slaves[$i].diet = "healthy">>
- <<else>>
+ <<elseif $slaves[$i].muscles > 5>>
<<if $slaves[$i].muscles <= 10>>
- <<if $slaves[$i].muscles <= 10>>
- Her long workouts focus on cardio. She has finally @@.orange;lost all visible musculature.@@
- <<set $slaves[$i].muscles = 0>>
- <<set $slaves[$i].diet = "healthy">>
- <<elseif ($slaves[$i].drugs == "steroids")>>
- Her long workouts focus on cardio, but since she's still shooting gear, she @@.lime;loses mass slowly.@@
- <<set $slaves[$i].muscles -= 3>>
- <<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance <= -100)>>
- Her long workouts focus on cardio, but since she's got so much natural and artificial testosterone, she @@.lime;loses mass slowly.@@
- <<set $slaves[$i].muscles -= 3>>
- <<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance >= 100)>>
- Her long workouts focus on cardio, and with the natural testosterone in her system counteracted by hormone treatment, she @@.lime;loses musculature.@@
- <<set $slaves[$i].muscles -= 5>>
- <<elseif ($slaves[$i].balls > 0)>>
- Her long workouts focus on cardio, but with some natural testosterone in her system, she @@.lime;loses muscle slowly.@@
- <<set $slaves[$i].muscles -= 3>>
- <<elseif ($slaves[$i].hormoneBalance >= 100)>>
- Her long workouts focus on cardio, and with female hormone treatment, she @@.lime;loses musculature rapidly.@@
- <<set $slaves[$i].muscles -= 8>>
- <<elseif ($slaves[$i].hormoneBalance <= -100)>>
- Her long workouts focus on cardio, but under male hormone treatment, she @@.lime;loses muscle slowly.@@
- <<set $slaves[$i].muscles -= 3>>
- <<else>>
- Her long workouts focus on cardio, and she @@.lime;loses musculature.@@
- <<set $slaves[$i].muscles -= 5>>
- <</if>>
- <<if ($slaves[$i].behavioralQuirk == "fitness")>>
- She approaches endurance work with real enthusiasm, quickly slimming her down.
- <<set $slaves[$i].muscles -= 2>>
- <</if>>
- <<if random(1,100) > 90>>
- <<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
- @@.orange;Her breasts get a little smaller.@@
- <<set $slaves[$i].boobs -= 50>>
- <<elseif ($slaves[$i].butt > 1)>>
- @@.orange;Her butt gets a little smaller.@@
- <<set $slaves[$i].butt -= 1>>
- <</if>>
- <</if>>
- <<if random(1,100) > 80>>
- Her workout successes have @@.green;improved her health.@@
- <<set $slaves[$i].health += 10>>
- <</if>>
- <<if $slaves[$i].weight > 10>>
- Her workouts have also @@.orange;burned off some excess fat.@@
- <<set $slaves[$i].weight -= 2>>
- <</if>>
+ Her long workouts focus on cardio. She has finally @@.orange;lost all visible musculature.@@
+ <<set $slaves[$i].muscles = 0>>
+ <<set $slaves[$i].diet = "healthy">>
+ <<elseif ($slaves[$i].drugs == "steroids")>>
+ Her long workouts focus on cardio, but since she's still shooting gear, she @@.lime;loses mass slowly.@@
+ <<set $slaves[$i].muscles -= 3>>
+ <<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance <= -100)>>
+ Her long workouts focus on cardio, but since she's got so much natural and artificial testosterone, she @@.lime;loses mass slowly.@@
+ <<set $slaves[$i].muscles -= 3>>
+ <<elseif ($slaves[$i].balls > 0) && ($slaves[$i].hormoneBalance >= 100)>>
+ Her long workouts focus on cardio, and with the natural testosterone in her system counteracted by hormone treatment, she @@.lime;loses musculature.@@
+ <<set $slaves[$i].muscles -= 5>>
+ <<elseif ($slaves[$i].balls > 0)>>
+ Her long workouts focus on cardio, but with some natural testosterone in her system, she @@.lime;loses muscle slowly.@@
+ <<set $slaves[$i].muscles -= 3>>
+ <<elseif ($slaves[$i].hormoneBalance >= 100)>>
+ Her long workouts focus on cardio, and with female hormone treatment, she @@.lime;loses musculature rapidly.@@
+ <<set $slaves[$i].muscles -= 8>>
+ <<elseif ($slaves[$i].hormoneBalance <= -100)>>
+ Her long workouts focus on cardio, but under male hormone treatment, she @@.lime;loses muscle slowly.@@
+ <<set $slaves[$i].muscles -= 3>>
<<else>>
- Her long workouts focus on cardio to keep her body lithe.
- <<if ($slaves[$i].behavioralQuirk == "fitness")>>
- She @@.hotpink;enjoys@@ the time she's given to workout.
- <<set $slaves[$i].devotion += 2>>
- <</if>>
- <<if $slaves[$i].muscles < -10>>
- Since she is rather weak, her routine slowly tones her soft muscles.
- <<set $slaves[$i].muscles++>>
- <</if>>
+ Her long workouts focus on cardio, and she @@.lime;loses musculature.@@
+ <<set $slaves[$i].muscles -= 5>>
+ <</if>>
+ <<if ($slaves[$i].behavioralQuirk == "fitness")>>
+ She approaches endurance work with real enthusiasm, quickly slimming her down.
+ <<set $slaves[$i].muscles -= 2>>
+ <</if>>
+ <<if random(1,100) > 90>>
<<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
@@.orange;Her breasts get a little smaller.@@
<<set $slaves[$i].boobs -= 50>>
+ <<elseif ($slaves[$i].butt > 1)>>
+ @@.orange;Her butt gets a little smaller.@@
+ <<set $slaves[$i].butt -= 1>>
<</if>>
- <<if random(1,100) > 50>>
- <<if ($slaves[$i].butt > 1)>>
- @@.orange;Her butt loses a little mass.@@
- <<set $slaves[$i].butt -= 1>>
- <</if>>
- <</if>>
- <<if random(1,100) > 50 && $slaves[$i].health <= 90 && $slaves[$i].health >= -20>>
- Her workout successes have @@.green;improved her health.@@
- <<set $slaves[$i].health += 5>>
- <</if>>
- <<if $slaves[$i].weight > 10>>
- Her workouts have also @@.orange;burned off some excess fat.@@
- <<set $slaves[$i].weight -= 2>>
+ <</if>>
+ <<if random(1,100) > 80>>
+ Her workout successes have @@.green;improved her health.@@
+ <<set $slaves[$i].health += 10>>
+ <</if>>
+ <<if $slaves[$i].weight > 10>>
+ Her workouts have also @@.orange;burned off some excess fat.@@
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
+ <<else>>
+ Her long workouts focus on cardio to keep her body lithe.
+ <<if ($slaves[$i].behavioralQuirk == "fitness")>>
+ She @@.hotpink;enjoys@@ the time she's given to workout.
+ <<set $slaves[$i].devotion += 2>>
+ <</if>>
+ <<if $slaves[$i].muscles < -10>>
+ Since she is rather weak, her routine slowly tones her soft muscles.
+ <<set $slaves[$i].muscles++>>
+ <</if>>
+ <<if ($slaves[$i].boobs-$slaves[$i].boobsImplant >= 200)>>
+ @@.orange;Her breasts get a little smaller.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if random(1,100) > 50>>
+ <<if ($slaves[$i].butt > 1)>>
+ @@.orange;Her butt loses a little mass.@@
+ <<set $slaves[$i].butt -= 1>>
<</if>>
<</if>>
+ <<if random(1,100) > 50 && $slaves[$i].health <= 90 && $slaves[$i].health >= -20>>
+ Her workout successes have @@.green;improved her health.@@
+ <<set $slaves[$i].health += 5>>
+ <</if>>
+ <<if $slaves[$i].weight > 10>>
+ Her workouts have also @@.orange;burned off some excess fat.@@
+ <<set $slaves[$i].weight -= 2>>
+ <</if>>
<</if>>
<<case "cum production">>
<<if $slaves[$i].fetish != "mindbroken">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 2e9485f254ee87869e4cc0dff17cd362a3656ae9..8ec6937e6bede8257cde617e37317c744bacec12 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -7756,26 +7756,103 @@ $pronounCap has
<</if>>
<</if>>
<<case "a mini dress">>
- <<if $activeSlave.bellyPreg >= 600000>>
- $activeSlave.slaveName's mini dress has burst trying to contain $possessive titanic bulging pregnant belly leaving it hanging out the hole it made.
+ <<if $activeSlave.belly >= 1000000>>
+ //WIP//
+ <<elseif $activeSlave.bellyPreg >= 750000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $possessive monolithic implant-filled belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $possessive monolithic pregnant belly, drawing the eye to $possessive protruding navel, the clear bulges of the life growing within $object, and every slight twitch inside $possessive taut middle.
+ <</if>>
+ <<elseif $activeSlave.bellyPreg >= 600000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $possessive titanic implant-filled belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $possessive titanic pregnant belly, drawing the eye to $possessive protruding navel, the bulges of the life growing within $object, and every kick and sqiurm inside $possessive straining middle.
+ <</if>>
+ <<elseif $activeSlave.bellyPreg >= 450000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $possessive gigantic implant-filled belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $possessive gigantic pregnant belly, drawing the eye to $possessive protruding navel, the outlines of the life within $object, and every kick and sqiurm inside $possessive straining middle.
+ <</if>>
<<elseif $activeSlave.bellyPreg >= 300000>>
- $activeSlave.slaveName's mini dress has burst trying to contain $possessive massive pregnant belly leaving it hanging out the hole it made.
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive massive implant-filled belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive massive pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle.
+ <</if>>
+ <<elseif $activeSlave.belly >= 120000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive giant implant-filled belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $possessive giant pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle.
+ <</if>>
+ <<elseif $activeSlave.belly >= 30000>>
+ <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $possessive huge pregnant belly and draws the eye right to $possessive protruding navel.
+ <<else>>
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $possessive huge pregnant belly, drawing the eye to $possessive protruding navel and clearly showing every kick and sqiurm inside $possessive bulging middle.
+ <</if>>
<<elseif $activeSlave.weight > 190>>
- $activeSlave.slaveName's mini dress strains to contain $possessive massively fat belly, clearly showing all $possessive folds and rolls. Flab forces its way through every growing tear in $possessive seams.
- <<elseif $activeSlave.bellyPreg >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>>
- $activeSlave.slaveName's mini dress barely clings to $possessive big pregnant belly.
+ $activeSlave.slaveName's mini dress strains to contain $possessive massively fat belly, clearly showing all $possessive folds and rolls. Flab forces its way through every growing tear in $possessive seams; a growing nuisance, as the outfit must be restitched frequently.
+ <<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a huge empathy belly">>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive huge pregnant belly and frequently rides up far enough to show off her privates.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive huge implant-filled belly and frequently rides up far enough to show off her privates.
+ <<else>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive huge pregnant belly and frequently rides up far enough to show off her privates.
+ <</if>>
+ <<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a large empathy belly">>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive big pregnant belly, leaving it looking much shorter than it really is.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's mini dress barely clings to $possessive hugely swollen belly, leaving it looking much shorter than it really is.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress barely clings to $possessive huge implant-filled belly, leaving it looking much shorter than it really is.
+ <<else>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive big pregnant belly, leaving it looking much shorter than it really is.
+ <</if>>
<<elseif $activeSlave.weight > 160>>
$activeSlave.slaveName's mini dress barely clings to $possessive hugely fat belly, clearly showing all $possessive folds and rolls.
<<elseif $activeSlave.weight > 130>>
$activeSlave.slaveName's mini dress tightly clings to $possessive big fat belly, clearly showing all $possessive folds and rolls.
- <<elseif $activeSlave.bellyPreg >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
- $activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+ <<elseif $activeSlave.belly >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>>
+ <<if $activeSlave.bellyAccessory == "a medium empathy belly">>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive jiggling <<print $activeSlave.inflationType>>-filled belly.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive implant-filled belly.
+ <<else>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly.
+ <</if>>
<<elseif $activeSlave.weight > 95>>
$activeSlave.slaveName's mini dress tightly clings to $possessive fat belly, clearly showing every fold and roll.
- <<elseif (($activeSlave.bellyPreg >= 1500) || ($activeSlave.bellyAccessory == "a small empathy belly"))>>
- $activeSlave.slaveName's mini dress tightly clings to $possessive growing belly.
+ <<elseif $activeSlave.belly >= 1500 || $activeSlave.bellyAccessory == "a small empathy belly">>
+ <<if $activeSlave.bellyAccessory == "a small empathy belly">>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive small pregnant belly.
+ <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive <<print $activeSlave.inflationType>>-swollen belly.
+ <<elseif $activeSlave.bellyImplant > 0>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive implant-rounded belly.
+ <<else>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive growing belly.
+ <</if>>
<<elseif $activeSlave.weight > 30>>
$activeSlave.slaveName's mini dress tightly clings to $possessive chubby belly, clearly showing every fold and roll.
+ <<elseif $activeSlave.bellyPreg >= 100 || $activeSlave.bellyImplant >= 100>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive belly, clearly showing the slight swell beneath $possessive navel.
+ <<elseif $activeSlave.muscles > 30>>
+ $activeSlave.slaveName's mini dress tightly clings to $possessive ripped abs, clearly displaying $possessive six pack.
<</if>>
<<case "attractive lingerie">>
<<if $activeSlave.bellyPreg >= 600000>>