From dc6f5188ac9bc562eecd7b06336ee264c7baa9d2 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 10 Jun 2018 03:25:22 -0400
Subject: [PATCH] tons of typos and a couple bugs.
---
src/SecExp/attackHandler.tw | 6 +
src/SecExp/attackReport.tw | 190 +++++++++-----------
src/SecExp/securityReport.tw | 2 +-
src/SecExp/weaponsManufacturing.tw | 2 +-
src/events/intro/introSummary.tw | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 3 +-
src/pregmod/seFCTVshows.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 4 +-
src/uncategorized/RESS.tw | 4 +-
src/uncategorized/arcmgmt.tw | 12 +-
src/uncategorized/futureSociety.tw | 48 ++---
src/uncategorized/genericPlotEvents.tw | 4 +-
src/uncategorized/pRaidInvitation.tw | 30 ++--
src/uncategorized/pRaidResult.tw | 14 +-
src/uncategorized/persBusiness.tw | 4 +-
src/uncategorized/reputation.tw | 2 +-
16 files changed, 159 insertions(+), 170 deletions(-)
diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw
index 3bfcc1d5551..4fae71757db 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -331,10 +331,13 @@
<<set _i = $slaveIndices[$Bodyguard.ID]>>
<<if $woundType == 1>>
<<set $slaves[_i].voice = 0>>
+ <<set $slaves[_i].health -= 60>>
<<elseif $woundType == 2>>
<<set $slaves[_i].eyes = -2>>
+ <<set $slaves[_i].health -= 30>>
<<elseif $woundType == 3>>
<<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].health = -80>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
@@ -452,10 +455,13 @@
<<set _i = $slaveIndices[$HeadGirl.ID]>>
<<if $woundType == 1>>
<<set $slaves[_i].voice = 0>>
+ <<set $slaves[_i].health -= 60>>
<<elseif $woundType == 2>>
<<set $slaves[_i].eyes = -2>>
+ <<set $slaves[_i].health -= 30>>
<<elseif $woundType == 3>>
<<set $slaves[_i].amp = 1>>
+ <<set $slaves[_i].health = -80>>
<<elseif $woundType >= 4>>
<<if $slaves[_i].health >= -60>>
<<set $slaves[_i].health -= 30>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 6f22aefa935..ba2e5635cb3 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -156,33 +156,29 @@
<</if>>
<<if $battleResult == 3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men easily stopped the disorganized horde futile attempt at raiding your arcology
+ The fight was quick and one sided, our men easily stopped the disorganized horde futile attempt at raiding your arcology<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard, but in the end our men stopped the disorganized horde attempt at raiding your arcology
+ The fight was hard, but in the end our men stopped the disorganized horde attempt at raiding your arcology<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but our men managed to stop the horde raiding party
+ The fight was long and hard, but our men managed to stop the horde raiding party<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , adding another victory to the growing list of our military's successes.
+ adding another victory to the growing list of our military's successes.
<<elseif $PClossStreak >= 2>>
- , finally putting an end to a series of unfortunate defeats.
- <<else>>
- .
+ finally putting an end to a series of unfortunate defeats.
<</if>>
<<elseif $battleResult == -3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men were easily crushed by the barbaric horde of raiders
+ The fight was quick and one sided, our men were easily crushed by the barbaric horde of raiders<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard and in the end the bandits proved too much to handle for our men
+ The fight was hard and in the end the bandits proved too much to handle for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but despite their bravery the horde proved too much for our men
+ The fight was long and hard, but despite their bravery the horde proved too much for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
- <<if $PCvictoryStreak >= 2>>
- , so interrupting a long series of military successes.
+ <<if $PCvictoryStreak >= 2>>
+ so interrupting a long series of military successes.
<<elseif $PClossStreak >= 2>>
- , confirming the long list of recent failures our armed forces collected.
- <<else>>
- .
+ confirming the long list of recent failures our armed forces collected.
<</if>>
<<elseif $battleResult == 2>>
The fight was long and hard, but in the end our men managed to repel the raiders, though not without difficulty.
@@ -222,33 +218,29 @@
<</if>>
<<if $battleResult == 3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men easily stopped the mercenaries dead in their tracks
+ The fight was quick and one sided, our men easily stopped the mercenaries dead in their tracks<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard, but in the end our men stopped the slavers attempt at weakening your arcology
+ The fight was hard, but in the end our men stopped the slavers attempt at weakening your arcology<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but our men managed to stop the free city mercenaries
+ The fight was long and hard, but our men managed to stop the free city mercenaries<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , adding another victory to the growing list of our military's successes.
+ adding another victory to the growing list of our military's successes.
<<elseif $PClossStreak >= 2>>
- , finally putting an end to a series of unfortunate defeats.
- <<else>>
- .
+ finally putting an end to a series of unfortunate defeats.
<</if>>
<<elseif $battleResult == -3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men were easily crushed by the consumed mercenary veterans sent against us
+ The fight was quick and one sided, our men were easily crushed by the consumed mercenary veterans sent against us<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard and in the end the slavers proved too much to handle for our men
+ The fight was hard and in the end the slavers proved too much to handle for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but despite their bravery the mercenary slavers proved too much for our men
+ The fight was long and hard, but despite their bravery the mercenary slavers proved too much for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , so interrupting a long series of military successes.
+ so interrupting a long series of military successes.
<<elseif $PClossStreak >= 2>>
- , confirming the long list of recent failures our armed forces collected.
- <<else>>
- .
+ confirming the long list of recent failures our armed forces collected.
<</if>>
<<elseif $battleResult == 2>>
The fight was long and hard, but in the end our men managed to repel the mercenaries, though not without difficulty.
@@ -288,33 +280,29 @@
<</if>>
<<if $battleResult == 3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men easily stopped the freedom fighters dead in their tracks
+ The fight was quick and one sided, our men easily stopped the freedom fighters dead in their tracks<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard, but in the end our men stopped the fighters attack
+ The fight was hard, but in the end our men stopped the fighters attack<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but our men managed to stop the freedom fighters
+ The fight was long and hard, but our men managed to stop the freedom fighters<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , adding another victory to the growing list of our military's successes.
+ adding another victory to the growing list of our military's successes.
<<elseif $PClossStreak >= 2>>
- , finally putting an end to a series of unfortunate defeats.
- <<else>>
- .
+ finally putting an end to a series of unfortunate defeats.
<</if>>
<<elseif $battleResult == -3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men were easily crushed by the fanatical fury of the freedom fighters
+ The fight was quick and one sided, our men were easily crushed by the fanatical fury of the freedom fighters<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard and in the end the freedom fighters proved too much to handle for our men
+ The fight was hard and in the end the freedom fighters proved too much to handle for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but despite their bravery the freedom fighters fury proved too much for our men
+ The fight was long and hard, but despite their bravery the freedom fighters fury proved too much for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , so interrupting a long series of military successes.
+ so interrupting a long series of military successes.
<<elseif $PClossStreak >= 2>>
- , confirming the long list of recent failures our armed forces collected.
- <<else>>
- .
+ confirming the long list of recent failures our armed forces collected.
<</if>>
<<elseif $battleResult == 2>>
The fight was long and hard, but in the end our men managed to repel the freedom fighters, though not without difficulty.
@@ -354,33 +342,29 @@
<</if>>
<<if $battleResult == 3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men easily stopped the old world soldiers dead in their tracks
+ The fight was quick and one sided, our men easily stopped the old world soldiers dead in their tracks<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard, but in the end our men stopped the soldiers of the old world
+ The fight was hard, but in the end our men stopped the soldiers of the old world<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but our men managed to stop the old world soldiers
+ The fight was long and hard, but our men managed to stop the old world soldiers<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , adding another victory to the growing list of our military's successes.
+ adding another victory to the growing list of our military's successes.
<<elseif $PClossStreak >= 2>>
- , finally putting an end to a series of unfortunate defeats.
- <<else>>
- .
+ finally putting an end to a series of unfortunate defeats.
<</if>>
<<elseif $battleResult == -3>>
<<if $battleTurns <= 5>>
- The fight was quick and one sided, our men were easily crushed by the discipline of the old world armies
+ The fight was quick and one sided, our men were easily crushed by the discipline of the old world armies<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<elseif $battleTurns <= 7>>
- The fight was hard and in the end the old world proved too much to handle for our men
+ The fight was hard and in the end the old world proved too much to handle for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<<else>>
- The fight was long and hard, but despite their bravery the determination of the old world troops proved too much for our men
+ The fight was long and hard, but despite their bravery the determination of the old world troops proved too much for our men<<if $PCvictoryStreak >= 2 || $PClossStreak >= 2>>,<<else>>.<</if>>
<</if>>
<<if $PCvictoryStreak >= 2>>
- , so interrupting a long series of military successes.
+ so interrupting a long series of military successes.
<<elseif $PClossStreak >= 2>>
- , confirming the long list of recent failures our armed forces collected.
- <<else>>
- .
+ confirming the long list of recent failures our armed forces collected.
<</if>>
<<elseif $battleResult == 2>>
The fight was long and hard, but in the end our men managed to repel the old world soldiers, though not without difficulty.
@@ -501,7 +485,7 @@
<<set $arcologies[0].prosperity -= 5 * _majorBattleMod>>
<</if>>
<<elseif $battleResult == 2>>
- Thanks to your victory, your @@.green;reputation@@ and @@.darkviolet;authority@@ slightly increased. Our men were not able to capture any attacker, however some equipment was seized during the enemy hasty retreat,
+ Thanks to your victory, your @@.green;reputation@@ and @@.darkviolet;authority@@ slightly increased. Our men were not able to capture any combatants, however some equipment was seized during the enemy's hasty retreat,
<<if $attackType == "raiders">>
<<set $rep += 200 * _majorBattleMod>>
<<set $authority += 200 * _majorBattleMod>>
@@ -849,25 +833,25 @@
your assistant performs admirably. Her vast computing power allows her to be everywhere on the battlefield, greatly enhancing the efficacy of your troops and the effectiveness of your battleplan.
<</if>>
<<elseif $leadingTroops == "bodyguard">>
- <<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your bodyguard to lead the troops.
+ <<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your bodyguard that leads the troops.
<<if $deployingSlaves == 1>>
<<if $Bodyguard.devotion < -20>>
Her low devotion has a negative impact on the morale of your slave soldiers.
<<elseif $Bodyguard.devotion > 51>>
- Her devotion to you has a positive impact on the morale of your slave soldiers, proud to be lead by one of their own.
+ Her devotion to you has a positive impact on the morale of your slave soldiers, proud to be led by one of their own.
<</if>>
<</if>>
<<if _oldRep < 10000 && _oldAuth < 10000 || $Bodyguard.prestige < 1>>
<<if $deployingMilitia == 1>>
- Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander
+ Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- and neither are your mercenaries or your soldiers.
+ commander and neither are your mercenaries or your soldiers.
<<elseif $deployingMercs == 1>>
- and neither are your mercenaries.
+ commander and neither are your mercenaries.
<<elseif $SFIntervention == 1>>
- and neither are your soldiers.
+ commander and neither are your soldiers.
<<else>>
- .
+ commander.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
@@ -888,15 +872,15 @@
Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>>
<<if $deployingMilitia == 1>>
- Your volunteers
+ Your
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- , your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>>
- and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SFIntervention == 1>>
- and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<else>>
- are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
@@ -907,22 +891,22 @@
<</if>>
<<else>>
<<if $deployingMilitia == 1>>
- Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander
+ Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
+ commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>>
- and neither are your mercenaries, but they trust you enough not to question your decision.
+ commander and neither are your mercenaries, but they trust you enough not to question your decision.
<<elseif $SFIntervention == 1>>
- and neither are your soldiers, but they trust you enough not to question your decision.
+ commander and neither are your soldiers, but they trust you enough not to question your decision.
<<else>>
- , but they trust you enough not to question your decision.
+ commander, but they trust you enough not to question your decision.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
- Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
+ Your mercenaries and soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>>
- Your mercenaries <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
+ Your mercenaries <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<<elseif $SFIntervention == 1>>
- Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
+ Your soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
<</if>>
<</if>>
<<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence == 3>>
@@ -950,15 +934,15 @@
During the battle, she had to fight for her life, giving her experience in modern combat. She is now proficient with modern firearms and hand to hand combat.
<</if>>
<<if $woundType != 0>>
- Unfortunately @@.red;she reported injuries@@.
+ Unfortunately, @@.red;she sustained major injuries.@@
<<if $woundType == 1>>
- A stray bullet hit her neck. While she fortunately avoided fatal hemorrhages, her vocal cords were irreparably damaged.
+ A stray bullet hit her neck. While she fortunately avoided fatal hemorrhaging, her vocal cords were irreparably damaged.
<<elseif $woundType == 2>>
- A few shrapnels found her eyes as final target, blinding her permanently.
+ Some shrapnel found her eyes as their final target, blinding her permanently.
<<elseif $woundType == 3>>
A grenade landed close to her, rendering her a quadruple amputee.
<<elseif $woundType >= 4>>
- While grave wounds, it seems she will be able to fully recover, given enough time.
+ While gravely wounded, it seems she will be able to fully recover, given enough time.
<</if>>
Your troops were greatly affected by the loss of their leader.
<</if>>
@@ -995,25 +979,25 @@
She brought your army to victory so many times that her @@.green;prestige has increased@@.
<</if>>
<<elseif $leadingTroops == "headGirl">>
- <<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your head girl to lead the troops.
+ <<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your head girl that leads the troops.
<<if $deployingSlaves == 1>>
<<if $HeadGirl.devotion < -20>>
Her low devotion has a negative impact on the morale of your slave soldiers.
<<elseif $HeadGirl.devotion > 51>>
- Her devotion to you has a positive impact on the morale of your slave soldiers, proud to be lead by one of their own.
+ Her devotion to you has a positive impact on the morale of your slave soldiers, proud to be led by one of their own.
<</if>>
<</if>>
<<if _oldRep < 10000 && _oldAuth < 10000 || $HeadGirl.prestige < 1>>
<<if $deployingMilitia == 1>>
- Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander
+ Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- and neither are your mercenaries or your soldiers.
+ commander and neither are your mercenaries or your soldiers.
<<elseif $deployingMercs == 1>>
- and neither are your mercenaries.
+ commander and neither are your mercenaries.
<<elseif $SFIntervention == 1>>
- and neither are your soldiers.
+ commander and neither are your soldiers.
<<else>>
- .
+ commander.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander.
@@ -1034,15 +1018,15 @@
Your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>>
<<if $deployingMilitia == 1>>
- Your volunteers
+ Your
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- , your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers, your mercenaries and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $deployingMercs == 1>>
- and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers and your mercenaries are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<elseif $SFIntervention == 1>>
- and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers and your soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<<else>>
- are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
+ volunteers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
Your mercenaries and soldiers are delighted to have such a prestigious individual as their commander, almost forgetting she is a slave.
@@ -1053,15 +1037,15 @@
<</if>>
<<else>>
<<if $deployingMilitia == 1>>
- Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander
+ Your volunteers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a
<<if $deployingMercs == 1 && $SFIntervention == 1>>
- and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
+ commander and neither are your mercenaries and soldiers, but they trust you enough not to question your decision.
<<elseif $deployingMercs == 1>>
- and neither are your mercenaries, but they trust you enough not to question your decision.
+ commander and neither are your mercenaries, but they trust you enough not to question your decision.
<<elseif $SFIntervention == 1>>
- and neither are your soldiers, but they trust you enough not to question your decision.
+ commander and neither are your soldiers, but they trust you enough not to question your decision.
<<else>>
- , but they trust you enough not to question your decision.
+ commander, but they trust you enough not to question your decision.
<</if>>
<<elseif $deployingMercs == 1 && $SFIntervention == 1>>
Your mercenaries and soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision.
@@ -1096,15 +1080,15 @@
During the battle, she had to fight for her life, giving her experience in modern combat. She is now proficient with modern firearms and hand to hand combat.
<</if>>
<<if $woundType != 0>>
- Unfortunately @@.red;she reported injuries@@.
+ Unfortunately, @@.red;she sustainded severe injuries.@@
<<if $woundType == 1>>
- A stray bullet hit her neck. While she fortunately avoided fatal hemorrhages, her vocal cords were irreparably damaged.
+ A stray bullet hit her neck. While she fortunately avoided fatal hemorrhaging, her vocal cords were irreparably damaged.
<<elseif $woundType == 2>>
- A few shrapnels found her eyes as final target, blinding her permanently.
+ Some shrapnel found her eyes as final their target, blinding her permanently.
<<elseif $woundType == 3>>
A grenade landed close to her, rendering her a quadruple amputee.
<<elseif $woundType >= 4>>
- While grave wounds, it seems she will be able to fully recover, given enough time.
+ While gravely wounded, it seems she will be able to fully recover, given enough time.
<</if>>
Your troops were greatly affected by the loss of their leader.
<</if>>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 434767021f7..6e8943dc8c7 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -543,7 +543,7 @@
<<else>>
good
<</if>>
- progress
+ progress.
<</if>>
<</if>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 0d9e5f3ed56..8cb1a5d5dbf 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -399,7 +399,7 @@ __Upgrades__:
<<if $completedUpgrades.length > 0>>
<br>
<br>
- you completed:
+ You completed:
<<for _i = 0; _i < $completedUpgrades.length; _i++>>
<<if _i < $completedUpgrades.length - 2>>
<<if $completedUpgrades[_i] == 0>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 98847b3966b..bda313366b4 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -745,7 +745,7 @@ __''Player Character''__
<<elseif $PC.actualAge >= 35>>
''entering middle age''.
<<else>>
- ''surprisingly young''
+ ''surprisingly young''.
<</if>>
Your birthday will be in $PC.birthWeek weeks
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 643efdc72e2..7faca2573ba 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2822,12 +2822,13 @@ LORE: INTERVIEWS
<dt>Black market specialty goods:</dt>
<dd>[[Childhood Fertility Induced NCS|Encyclopedia][$encyclopedia = "Childhood Fertility Induced NCS"]]</dd>
</dl>
+
<<case "Childhood Fertility Induced NCS">>
<dl>
<dt>Childhood Fertility Induced NCS</dt>
<dd>
- This uses a designer retrograde virus to set the Genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000's. Which in layman's terms @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This @@.lime;modified@@ version of the genetic flaw is not dangerous, but in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads,@@ at a slighlty faster than normal pace. Even allowing for pregnancies. What it does is to specifically block (and will even reverse) all secondary sexual characteristics. Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-Induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicallity of a child.<br><br>
+ This uses a designer retrograde virus to set the genetic markers for the Neotenic Complex Syndrome, a syndrome originally called Syndrome X discovered in the early 2000's. In layman's terms, it @@.gold;suppresses the growth and secondary sexual characteristics of slaves@@; both male and female. The original condition was usually fatal or dangerous. This modified version of the genetic flaw is not harmful (relatively speaking), and in addition to the growth blockage, it permits the slave to continue the @@.lime;development of gonads@@ at a slighlty faster than normal pace. Secondary sexual characteristics are also reversed, though interestingly enough, pregnancy is still possible.Slaves put on this genetic engineered blend will be permanently changed and will no longer grow in stature or assets without severe chemical assistance, and even then at a reduced rate when compared to non-NCS-induced slaves, and should their ongoing growth treatments stop they will slowly regress back to the physicality of a child.<br><br>
@@.red;The genetic tampering is considered illegal,@@ but there is also a @@.yellow;moral question as this abrogates the rights of slaves to ever grow up.@@<br><br>
Can only be purchased in [[The Black Market|Encyclopedia][$encyclopedia = "The Black Market"]].
</dd>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index ae306b5d7ae..253a9c55f3b 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -81,7 +81,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<</if>>
<<case 1>>
<<set $showTwo += 1, $lastShow = 1>>
- It looks like the random function chose to play the newest episode of a popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>>where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! $showTwo ladies have already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'.
+ It looks like the random function chose to play <<if $showTwo < 12>>the newest episode of a<<else>>a repeat of the<</if>> popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>>where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! <<if $showTwo < 12>>random(2,10)<<else>>$showTwo<</if>> lad<<if $showTwo > 0>>ies have<<else>>y has<</if>> already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'.
<br><br>
<<if $masterSuiteSlaves > 1 && $Concubine != 0>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from her own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled orgy.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index dc84412d92b..3d0d32f6588 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -671,9 +671,9 @@
<<if ndef $assistantBodyDesire>>
<<set $assistantBodyDesire = 0>>
<</if>>
-<<if ndef $assistantPronouns>>
+
<<set $assistantPronouns = {pronoun: "she", possessivePronoun: "hers", possessive: "her", object: "her", objectReflexive: "herself", noun: "girl"}>>
-<</if>>
+
<<if ndef $huskSlaveOrdered>>
<<set $huskSlaveOrdered = 0>>
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 62681f8ef59..671181532de 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -13407,7 +13407,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
She keeps licking away, cleaning up the mess you made as $assistantName does everything she can to make it seem like the slave is pleasuring her. Partway through, $assistantName sticks out a hand for a high-five from you, producing a gurgle of indignation @@.mediumaquamarine;or perhaps even laughter@@ as her owner and her owner's personal assistant program high-five over her back.
<<set $activeSlave.trust += 4, $activeSlave.oralCount++, $oralTotal++>>
<</replace>>
-<</link>>
+<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
<<if canDoAnal($activeSlave)>>
<br><<link "Double penetrate the slave with your PA">>
<<EventNameDelink $activeSlave>>
@@ -13515,7 +13515,7 @@ You tell her kindly that you understand, and that she'll be trained to address t
<<set $activeSlave.devotion += 4>>
<<AnalVCheck 3>>
<</replace>>
-<</link>>
+<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
<</if>>
<<case "like me">>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index f8fd3be4f45..ebd6a6abda1 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -353,15 +353,17 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<</if>>
<</for>>
<<if _refugees > 0>>
- Some desperate people filtered into the arcology during the week
+ Some desperate people filtered into the arcology during the
<<if $propCampaign >= 1 && $propFocus == "enslavement">>
- , many attracted by your advertisement campaigns
+ week, many attracted by your advertisement campaigns
<<if $propCampaignBoost == 0>>
<<set _refugees += random(0,2)>>
<<else>>
<<set _refugees += random(0,4)>>
<</if>>
- <</if>>.
+ <<else>>
+ week.
+ <</if>>
As owner, you were able to enslave _refugees of them.
<<set $helots += _refugees>>
<</if>>
@@ -573,7 +575,7 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
Your arcology is extremely safe and stable. Many businesses are attracted to it because of this.
<<set _AWeekGrowth++>>
<<elseif $security < 20>>
- Your arcology low security is an instability factor simply too dangerous to be ignored. Many businesses avoid your arcology because of this.
+ Your arcology's low security is an instability factor simply too dangerous to be ignored. Many businesses avoid your arcology because of this.
<<set _AWeekGrowth-->>
<</if>>
<<if $weaponsLaw == 3>>
@@ -748,7 +750,7 @@ The Hippolyta Academy have a <<if $HA.schoolProsperity > 4>>very prosperous<<els
<<set $HA.subsidize = 0, $HA.schoolProsperity = 10>>
<</if>>
<<if $HA.subsidize == 1>>
- You have a policy of subsidizing them
+ You have a policy of subsidizing them.
<<set $HA.schoolProsperity++>>
<<elseif $HA.subsidize == -1>>
You have a policy of covertly undermining them.
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 1189aed23d3..f0f5de340ba 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -597,7 +597,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSSupremacist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -626,7 +626,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSSubjugationist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -658,7 +658,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSRepopulationFocus" "clothesBoughtMaternityLingerie" "clothesBoughtMaternityDress" "clothesBoughtBelly">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -688,7 +688,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
The Societal Elite exist as the highest class, allowing you access to all manner of benefits
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<</if>>
@@ -710,7 +710,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSGenderRadicalist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "shemale") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -730,7 +730,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSGenderFundamentalist" "clothesBoughtBunny">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -749,7 +749,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSPaternalist" "clothesBoughtConservative">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -768,7 +768,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSDegradationist" "clothesBoughtChains">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "monstergirl") || ($assistantAppearance == "businesswoman") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "imp")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -787,7 +787,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSBodyPurist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "fairy") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "angel") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -806,7 +806,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSTransformationFetishist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "ERROR_1606_APPEARANCE_FILE_CORRUPT")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -825,7 +825,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSYouthPreferentialist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -844,7 +844,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSMaturityPreferentialist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "goddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -863,7 +863,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSSlimnessEnthusiast">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "shemale") || ($assistantAppearance == "loli") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -882,7 +882,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSAssetExpansionist">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "succubus") || ($assistantAppearance == "incubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -900,7 +900,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSPastoralist" "clothesBoughtWestern">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "shemale") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -918,7 +918,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSPhysicalIdealist" "clothesBoughtOil">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "shemale") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -937,7 +937,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSHedonisticDecadence">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "imp") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -956,7 +956,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSChattelReligionist" "clothesBoughtHabit">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "angel") || ($assistantAppearance == "cherub") || ($assistantAppearance == "imp")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -975,7 +975,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSRomanRevivalist" "clothesBoughtToga">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -994,7 +994,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSAztecRevivalist" "clothesBoughtHuipil">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "amazon") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -1013,7 +1013,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSEgyptianRevivalist" "clothesBoughtEgypt">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "goddess") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -1032,7 +1032,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSEdoRevivalist" "clothesBoughtKimono">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "amazon") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "loli") || ($assistantAppearance == "kitsune") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -1049,7 +1049,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSArabianRevivalist" "clothesBoughtHarem">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
@@ -1066,7 +1066,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<<FSChangeDecoration "FSChineseRevivalist" "clothesBoughtQipao">>
<<if $PAPublic == 1>>
<<if ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "monstergirl") || ($assistantAppearance == "incubus") || ($assistantAppearance == "succubus")>>
- With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
<</if>>
<</if>>
<<else>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 459992007c5..50c8a161bad 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -640,7 +640,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].drugs == "intensive breast injections">>
<<set $slaves[$i].lactation = 1>>
- <<if ($slaves[$i].inducedNCS == 0) && ($slaves[$i].hips < 1))>>
+ <<if ($slaves[$i].inducedNCS == 0) && ($slaves[$i].hips < 1)>>
<<set $slaves[$i].hips += 1>>
<<set $slaves[$i].butt += 1>>
<</if>>
@@ -672,7 +672,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<SetBellySize $slaves[$i]>>
<<elseif $slaves[$i].drugs == "hyper breast injections">>
<<set $slaves[$i].lactation = 1>>
- <<if ($slaves[$i].inducedNCS == 0) && ($slaves[$i].hips < 1))>>
+ <<if ($slaves[$i].inducedNCS == 0) && ($slaves[$i].hips < 1)>>
<<set $slaves[$i].hips += 1>>
<<set $slaves[$i].butt += 2>>
<</if>>
diff --git a/src/uncategorized/pRaidInvitation.tw b/src/uncategorized/pRaidInvitation.tw
index 0805b6397a5..fd0df933de5 100644
--- a/src/uncategorized/pRaidInvitation.tw
+++ b/src/uncategorized/pRaidInvitation.tw
@@ -1,46 +1,42 @@
-:: P raid invitation
+:: P raid invitation [nobr]
-<<nobr>>
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
-<<set $PRaid = 0>>
-<<set $PRraidTarget = 0>>
+<<set $PRaid = 0, $PRaidTarget = 0>>
-<</nobr>>\
-\
-The former country whose citizens launched the ultimately futile attack on the arcology has continued to degenerate. After a series of civil disturbances and minor natural disasters, the nearest major city is being abandoned by its few remaining residents. A regional warlord is threatening the area, so they are streaming in small parties towards another city that is not under his shadow.
+The former country whose citizens launched the ultimately futile attack on the arcology has continued to degenerate. After a series of civil disturbances and minor natural disasters, the nearest major city is being abandoned by its few remaining residents. A regional warlord is threatening the area, so they are streaming in small parties towards another city that is not under his shadow.
+<br><br>
The citizens of $arcologies[0].name view their discomfiture without much pity. These people almost certainly would have abused them just as much as they are now in danger of being abused themselves, had the attack on the Free City been a success. There would be little to no criticism if you and your mercenary contingent were to take this unique opportunity to corral one of the refugee groups. They are refugees, after all; no one will miss them.
-\
+<br><br>
<span id="result">
Fund a quick raid on the refugees with <<print cashFormat(5000)>>, targeting:
- <<link "Ex-soldiers">>
+<br> <<link "Ex-soldiers">>
<<replace "#result">>
Your mercenaries probably would have been enthusiastic even before the recent combat, but now they're positively eager. The split agreed upon is that they keep the proceeds from the sale of anything that isn't sex slave material, while you keep anything that is.
<<set $cash -= 5000>>
<<set $PRaid = 1>>
- <<set $PRraidTarget = 1>>
+ <<set $PRaidTarget = 1>>
<</replace>>
<</link>>
- <<link "Healthy civilians">>
+<br> <<link "Healthy civilians">>
<<replace "#result">>
Your mercenaries probably would have been enthusiastic even before the recent combat, but now they're positively eager. The split agreed upon is that they keep the proceeds from the sale of anything that isn't sex slave material, while you keep anything that is.
<<set $cash -= 5000>>
<<set $PRaid = 1>>
- <<set $PRraidTarget = 2>>
+ <<set $PRaidTarget = 2>>
<</replace>>
<</link>>
- <<link "The largest possible group of slaves">>
+<br> <<link "The largest possible group of slaves">>
<<replace "#result">>
Your mercenaries probably would have been enthusiastic even before the recent combat, but now they're positively eager. The split agreed upon is that they keep the proceeds from the sale of anything that isn't sex slave material, while you keep anything that is.
<<set $cash -= 5000>>
<<set $PRaid = 1>>
- <<set $PRraidTarget = 3>>
+ <<set $PRaidTarget = 3>>
<</replace>>
<</link>>
-<<link "Let them go">>
+<br><<link "Let them go">>
<<replace "#result">>
Some of the refugees make it to safety. Some do not.
<</replace>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 98d1669ca37..64ecd8152c1 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -10,10 +10,10 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<br><br>
<<set _newSlaves = []>>
-<<if $PRraidTarget == 1>>
+<<if $PRaidTarget == 1>>
Under orders to target resistance, your mercenaries target the leading group. They even manage to direct a little small arms fire at the VTOL craft as it circles them, dropping mercenaries and plying its nonlethal weapons, but they are of course rapidly defeated. Your share is two slaves in good physical condition, who prove to have been survivors of the defeated attack on the arcology. The mercenaries find after a data search that one of the prisoners whose part of their share was a minor leader in the anti-Free Cities movement. After a quick consultation over their radios, the mercenaries decide that a summary execution out here would be too quick for the wretch, and bring their prize back to the arcology for more thorough punishment. Between the successful raid and the capture of this public enemy, @@.green;the citizens are quite impressed by you.@@
<<set $rep += 500>>
- <<for $i = 0; $i < 3; $i++>>
+ <<for _prr = 0; _prr < 3; _prr++>>
<<if ($seeDicks > 0)>>
<<include "Generate XY Slave">>
<<set $activeSlave.origin = "She is an enslaved refugee who participated in the defeated attack on your arcology.">>
@@ -24,10 +24,10 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<set _newSlaves.push($activeSlave)>>
<</if>>
<</for>>
-<<elseif $PRraidTarget == 2>>
+<<elseif $PRaidTarget == 2>>
Under orders to target civilians, your mercenaries head for the isolated group. When the VTOL descends to circle around the large group of refugees, it becomes obvious that it won't even be necessary to expend nonlethal ammunition. A few of the refugees throw themselves down in bitterness, but most just subside into the catatonia of helplessness. They stand quiescent as they are searched, tagged, and loaded onto the VTOL like the wretched human refuse they are. The successful raid @@.green;is the talk of the Free City.@@
<<set $rep += 200>>
- <<for $i = 0; $i < 4; $i++>>
+ <<for _prr = 0; _prr < 4; _prr++>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She is an enslaved refugee.">>
<<set _newSlaves.push($activeSlave)>>
@@ -36,7 +36,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
Under orders to target the largest possible group of people, your mercenaries head for the sick and injured. As the VTOL settles, it becomes apparent that most of the injuries are from combat, almost certainly in the defeat at $arcologies[0].name. The tent proves to contain a harassed nurse, almost without medical supplies and at the end of her rope. When she sees the mercenaries push through the tent flap, she heaves a sigh of mixed defeat and relief and wordlessly offers her wrists. The mercenaries give you a larger share of the other slaves in return for her: they tell you in confidence that she'll be a medical asset to them as well as the usual amusement. The successful raid @@.green;is the talk of the Free City.@@
<<set $slaveMedic = 1>>
<<set $rep += 200>>
- <<for $i = 0; $i < 5; $i++>>
+ <<for _prr = 0; _prr < 5; _prr++>>
<<include "Generate New Slave">>
<<set $activeSlave.origin = "She is an enslaved refugee who was wounded in the defeated attack on your arcology.">>
<<set $activeSlave.health = random(-80,-40)>>
@@ -57,7 +57,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<</link>>
<br><<link "Give your prisoners to citizens injured in the recent invasion">>
<<replace "#result">>
- <<for $i = 0; $i < _newSlaves.length; $i++>>
+ <<for _prr = 0; _prr < _newSlaves.length; _prr++>>
<<slaveCost _newSlaves[$i]>>
<<set $rep += Math.trunc($slaveCost/10)>>
<</for>>
@@ -66,7 +66,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<</link>>
<br><<link "Enslave all of the refugees">>
<<replace "#result">>
- <<for $i = 0; $i < _newSlaves.length; $i++>>
+ <<for _prr = 0; _prr < _newSlaves.length; _prr++>>
<<AddSlave _newSlaves[$i]>> /* skip New Slave Intro */
<</for>>
You simply enslave all of the refugees yourself. They would have been worse off had you not intervened.
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 592e9297def..b3184b1c110 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -827,7 +827,7 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<<set _income += Math.round($peacekeepers.strength * _price * 10 * _factoryMod)>>
<</if>>
<<set _income = Math.trunc(_income * 0.5)>>
- This week we made @@.yellowgreen;<<print cashFormat(_income)>>@@
+ This week we made @@.yellowgreen;<<print cashFormat(_income)>>.@@
<<if !isInt(_income)>>
<br>@@.red;Error failed to calculate income@@
<<else>>
@@ -836,7 +836,7 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<</if>>
<<if $taxTrade == 1>>
- <br>Fees on transitioning goods this week made @@.yellowgreen;<<print cashFormat($trade * random(80,120))>>@@
+ <br>Fees on transitioning goods this week made @@.yellowgreen;<<print cashFormat($trade * random(80,120))>>.@@
<<set $cash += $trade * 100>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 34baee223ca..d8754e565aa 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -667,7 +667,7 @@ On formal occasions, you are announced as $PCTitle.
<<if $secExp == 1>>
<<if $fakeNews == 1>>
- The authenticity department produces and distributes copious amounts of plausible enough news and reports, @@.green;increasing your reputation@@
+ The authenticity department produces and distributes copious amounts of plausible enough news and reports, @@.green;increasing your reputation.@@
<<set $repGain += 10 * $miniTruth>>
<</if>>
<</if>>
--
GitLab