cleanup (#10956)

LoneGazebo · Jun 8, 2024 · 56a8fe4 · 56a8fe4
1 parent 37e3f4a
commit 56a8fe4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/(2) Vox Populi/Database Changes/Text/en_US/UnitPromotions/NewPromotionText.xml b/(2) Vox Populi/Database Changes/Text/en_US/UnitPromotions/NewPromotionText.xml
@@ -178,7 +178,7 @@
 			<Text>Trailblazer II</Text>
 		</Row>
 		<Row Tag="TXT_KEY_PROMOTION_WOODLAND_TRAILBLAZER_2_HELP">
-			<Text>+1 [ICON_MOVES] Movement and Embarked Movement.[NEWLINE]Ignore Terrain Cost in [COLOR_POSITIVE_TEXT]Desert[ENDCOLOR], [COLOR_POSITIVE_TEXT]Snow[ENDCOLOR], and [COLOR_POSITIVE_TEXT]Marsh[ENDCOLOR].[NEWLINE]No [ICON_MOVES] Movement or combat penalties for crossing a river.</Text>
+			<Text>+1 [ICON_MOVES] Movement and Embarked Movement.[NEWLINE]Ignore Terrain Cost in [COLOR_POSITIVE_TEXT]Desert[ENDCOLOR], [COLOR_POSITIVE_TEXT]Snow[ENDCOLOR], and [COLOR_POSITIVE_TEXT]Marsh[ENDCOLOR].[NEWLINE]Eliminate combat penalties for attacking over a river.[NEWLINE]Crossing a river costs only 1 [ICON_MOVES] Movement.</Text>
 		</Row>
 		<Row Tag="TXT_KEY_PROMOTION_WOODLAND_TRAILBLAZER_3">
 			<Text>Trailblazer III</Text>

diff --git a/(2) Vox Populi/Database Changes/Text/en_US/UnitPromotions/PromotionTextChanges.sql b/(2) Vox Populi/Database Changes/Text/en_US/UnitPromotions/PromotionTextChanges.sql
@@ -96,7 +96,7 @@ WHERE Tag = 'TXT_KEY_PROMOTION_MEDIC_II_HELP';
 
 -- Amphibious
 UPDATE Language_en_US
-SET Text = 'Eliminate combat penalties for attacking from the sea or over a river. Crossing a river costs only 1 [ICON_MOVES] Movement. Ignore Terrain Cost in [COLOR_POSITIVE_TEXT]Marsh[ENDCOLOR].'
+SET Text = 'Eliminate combat penalties for attacking from the sea or over a river.[NEWLINE]Crossing a river costs only 1 [ICON_MOVES] Movement.[NEWLINE]Ignore Terrain Cost in [COLOR_POSITIVE_TEXT]Marsh[ENDCOLOR].'
 WHERE Tag = 'TXT_KEY_PROMOTION_AMPHIBIOUS_HELP';
 
 -- Cover

diff --git a/(2) Vox Populi/Database Changes/UnitPromotions/PromotionChanges.sql b/(2) Vox Populi/Database Changes/UnitPromotions/PromotionChanges.sql
@@ -700,8 +700,6 @@ VALUES
 
 UPDATE UnitPromotions SET RangeAttackIgnoreLOS = 1, RangedAttackModifier = -10 WHERE Type = 'PROMOTION_INDIRECT_FIRE';
 
-UPDATE UnitPromotions SET IgnoreTerrainCost = 1 WHERE Type = 'PROMOTION_IGNORE_TERRAIN_COST';
-
 -- Reconnaissance
 UPDATE UnitPromotions SET GainsXPFromScouting = 1 WHERE Type = 'PROMOTION_RECON_EXPERIENCE';
 
@@ -909,6 +907,9 @@ UPDATE UnitPromotions SET GoldenAgeValueFromKills = 100 WHERE Type = 'PROMOTION_
 -- Pracinha: Pride of the Nation
 UPDATE UnitPromotions SET GoldenAgeValueFromKills = 1000 WHERE Type = 'PROMOTION_MANY_GOLDEN_AGE_POINTS';
 
+-- Minuteman, Berber Cavalry: Ignores Terrain Cost
+UPDATE UnitPromotions SET IgnoreTerrainCost = 1 WHERE Type = 'PROMOTION_IGNORE_TERRAIN_COST';
+
 -- Mehal Sefari, Berber Cavalry: Homeland Guardian
 UPDATE UnitPromotions SET FriendlyLandsModifier = 25 WHERE Type = 'PROMOTION_HOMELAND_GUARDIAN';
 

diff --git a/(2) Vox Populi/Database Changes/UnitPromotions/PromotionDisplaySweeps.sql b/(2) Vox Populi/Database Changes/UnitPromotions/PromotionDisplaySweeps.sql
@@ -99,6 +99,7 @@ VALUES
 	('PROMOTION_JUGGERNAUT', 10),
 	-- Unique unit free promotions (stays on upgrade)
 	('PROMOTION_ADJACENT_BONUS', 113),
+	('PROMOTION_IGNORE_TERRAIN_COST', 114),
 	('PROMOTION_SPAWN_GENERALS_I', 115),
 	('PROMOTION_SPAWN_GENERALS_II', 116),
 	('PROMOTION_KNOCKOUT', 118),
@@ -197,7 +198,6 @@ VALUES
 	('PROMOTION_SUPPLY', 336),
 	-- Unit free promotions (stays on upgrade)
 	('PROMOTION_CAN_MOVE_AFTER_ATTACKING', 411),
-	('PROMOTION_IGNORE_TERRAIN_COST', 412),
 	('PROMOTION_RECON_EXPERIENCE', 413),
 	('PROMOTION_OCEAN_CROSSING', 414),
 	('PROMOTION_EMBARKED_SIGHT', 415),