Merge branch 'patch-2' into 'pregmod-master'

Independence Day SF rewrites and fixes

See merge request pregmodfan/fc-pregmod!7567

src/uncategorized/seIndependenceDay.tw

@@ -383,67 +383,71 @@ In the Free Cities, Independence Day falls on the day when the Free City achieve
 	<<elseif $SF.ArmySize < 2000>>
 		The almost full size of $SF.Lower inspires confidence in your citizens.
 		<<run repX(1250, "event")>>
+	/* TODO: <<else>> line for huge army */
 	<</if>>
 	<<if $SF.Squad.Armoury === 0>>
 		Seeing the soldiers of $SF.Lower with high-quality personal weapons and light armor, but little in the way of exceptional armament, provides little confidence in $SF.Lower.
 		<<run repX(-200, "event")>>
 	<<else>>
-		The citizens of $arcologies[0].name are relieved to see that $SF.Lower's troops are out fitted the absolutely latest in gear.
+		The citizens of $arcologies[0].name are relieved to see that $SF.Lower's troops are outfitted with the absolute latest gear.
 		<<run repX(1250, "event")>>
 	<</if>>
 	<<if $SF.Squad.Drugs === 0>>
-		Seeing $SF.Lower being relaxed inspires confidence that they are unlikely to
+		The relaxed demeanor of $SF.Lower's soldiers inspires confidence that they are unlikely to
 		<<run repX(1250, "event")>>
 	<<else>>
 		The slight twitchiness and high-end alertness of $SF.Lower's troops makes your citizens afraid that they may
 		<<run repX(-200, "event")>>
 	<</if>> get a face full of lead.
 	<<if $SF.Squad.AV < 1 && $SF.Squad.TV < 1>>
-		The use of basic, unarmored mainly high-end civilian vehicles with jury-rigged crew-served weapons by $SF.Lower does not
+		The use of basic, unarmored civilian vehicles with jury-rigged crew-served weapons by $SF.Lower does not
 		<<run repX(-200, "event")>>
 	<<elseif $SF.Squad.AV < 11 && $SF.Squad.TV < 11>>
-		$SF.Lower's use of the most advanced heavy armored and support vehicles possible
+		The advanced heavy armor and support vehicles in use by $SF.Lower
 		<<run repX(1250, "event")>>
 	<</if>> inspires confidence in your citizens.
-	<<if $SF.Squad.AA < 1 && $SF.Squad.TA < 1>>
-		Seeing $SF.Lower's air force only number enough to be a squadron and armed with just a Gatling cannon does not assure your citizens.
-		<<run repX(-200, "event")>>
-	<<elseif $SF.Squad.AA < 11 && $SF.Squad.TA < 11>>
-		Seeing $SF.Lower's air force using more advanced equipment assures your citizens that they are safe from the air.
-		<<run repX(1250, "event")>>
+	<<if $SF.Squad.AA > 0 && $SF.Squad.TA > 0>>
+		<<if $SF.Squad.AA === 1 && $SF.Squad.TA === 1>>
+			Seeing the single squadron of meagerly-armed old aircraft $SF.Lower calls an "air force" does not reassure your citizens.
+			<<run repX(-200, "event")>>
+		<<elseif $SF.Squad.AA < 11 && $SF.Squad.TA < 11>>
+			Seeing the numerous advanced aircraft of $SF.Lower's air force assures your citizens that they are safe from the air.
+			<<run repX(1250, "event")>>
+		<</if>>
 	<</if>>
 	<<if $SF.Squad.Drones === 0>>
-		Seeing "re-purposed" non-military drones from the arcology's original contingent flying around, does not inspire confidence in your citizens.
+		Seeing repurposed non-military drones from the arcology's original contingent flying around does not inspire confidence in your citizens.
 		<<run repX(-200, "event")>>
 	<<else>>
 		Seeing the latest and greatest drones buzzing over head assures your citizens that they are unmatched.
 		<<run repX(1250, "event")>>
 	<</if>>
 	<<if $SF.Squad.GiantRobot === 1>>
-		Seeing a basic old world rusted looking Giant Robot, doesn't provide your citizens with much assurance that they are protected.
+		The ramshackle-looking Giant Robot that $SF.Lower has cobbled together inspires more fear of it falling apart than trust in its ability to protect the arcology.
 		<<run repX(-200, "event")>>
-	<<else>>
+	/* TODO: Add a line for partially-upgraded Giant Robot? */
+	<<elseif $SF.Squad.GiantRobot === 10>>
 		Seeing that the Giant Robot has been fully upgraded provides your citizens with a feeling of safety.
 		<<run repX(1250, "event")>>
 	<</if>>
 	<<if ($SF.ROE === "hold") && ($SF.Depravity >= 1.5)>>
-		The sight of $SF.Lower's forcing their captured slaves to suck them off while swinging their swords and other nonlethal tools around their itchy trigger fingers inspires terror in your citizens.
+		The sight of $SF.Lower's troops forcing their captured slaves to suck them off while visibly itching to draw their weapons inspires terror in your citizens.
 		<<run repX(-200, "event")>>
 	<<elseif ($SF.ROE === "limited") && ($SF.Depravity >= 1.5)>>
-		The sight of $SF.Lower's forcing their captured slaves to suck them off with itchy trigger fingers inspires terror in your citizens.
+		The sight of $SF.Lower's troops forcing their captured slaves to suck them off with itchy trigger fingers inspires terror in your citizens.
 		<<run repX(-200, "event")>>
 	<<elseif ($SF.ROE === "free") && ($SF.Depravity >= 1.5)>>
-		The sight of $SF.Lower's forcing their captured slaves to suck them off while frequently firing without any care into the air, inspiring terror in your citizens.
+		The sight of $SF.Lower's troops forcing their captured slaves to suck them off while frequently firing wildly into the air inspires terror in your citizens.
 		<<run repX(-200, "event")>>
 	<</if>>
 	<<if ($SF.ROE === "hold") && ($SF.Depravity <= 0.3)>>
-		The sight of $SF.Lower's professionally holstering their weapons provides your citizens with a sense of safety.
+		The sight of $SF.Lower's troops professionally holstering their weapons provides your citizens with a sense of safety.
 		<<run repX(1250, "event")>>
 	<<elseif ($SF.ROE === "limited") && ($SF.Depravity <= 0.3)>>
-		The sight of $SF.Lower's professionally keeping their finger on the trigger provides your citizens with a sense of safety.
+		The sight of $SF.Lower's troops professionally keeping their finger off the trigger provides your citizens with a sense of safety.
 		<<run repX(1250, "event")>>
 	<<elseif ($SF.ROE === "free") && ($SF.Depravity <= 0.3)>>
-		The sight of $SF.Lower's professionally being alert and to ready to act at a moment's notice provides your citizens with a sense of safety.
+		The sight of $SF.Lower's troops professionally remaining alert and ready to act at a moment's notice provides your citizens with a sense of safety.
 		<<run repX(1250, "event")>>
 	<</if>>
 	/* Maybe a random chance attack by the Daughters of Liberty if they haven't been already defeated or if they have a cell that managed to survive. The size of the attack could depend the time since their last encounter. The amount of damage inflicted would depend primarily on whether hacker's support was acquired, $bodyguard's combat skill, the player's combat skill, SF upgrades and finally some RNG. If a low amount of damage is inflicted then there will be a low hit to rep and some criminals can be acquired or dealt with in the usual manner. Higher amounts of damage leads to higher hits to rep and a chance that fewer attackers will survive. Without a bodyguard there is a chance that PC may die or be held hostage with a chance of being killed if the rescue attempt is botched. */