Merge remote-tracking branch 'darkademic/dev'

Inq8 · Jun 23, 2024 · ff318e3 · ff318e3
2 parents f841b2f + 3f66850
commit ff318e3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/mods/ca/chrome/tooltips.yaml b/mods/ca/chrome/tooltips.yaml
@@ -49,7 +49,7 @@ Background@BUTTON_TOOLTIP:
 			X: 7
 			Y: 28
 			Height: 12
-			Font: TinyBold
+			Font: Small
 			VAlign: Top
 
 Background@BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP:

diff --git a/mods/ca/languages/rules/en.ftl b/mods/ca/languages/rules/en.ftl
@@ -36,12 +36,12 @@ checkbox-fast-regrowth =
 
 dropdown-queuetype =
     .label = Production Type
-    .description = Single-Queue = One queue per production category\n\nMulti-Queue = One queue per production structure (upgrades remain single-queue)\n\nMulti-Queue Scaled = Multi-Queue, but where additional production structures have increased cost\n                                   (which can be reduced via building T2/T3 structures), and structures remain single-queue
+    .description = Single-Queue:\n  • TD / RA1 / TS / RA2 style\n  • One queue per production type\n  • Units created at primary building\n\nMulti-Queue:\n  • C&C3 / RA3 style\n  • One queue per production structure\n  • Upgrades remain single-queue\n\nCompetitive:\n  • Multi-Queue for units\n  • Single-Queue for structures & upgrades\n  • Multiple production structures of the same type have increased cost,\n    which is reduced after building radar/tech center
 
 options-queuetype =
     .singlequeue = Single-Queue
     .multiqueuefull = Multi-Queue
-    .multiqueuescaled = Multi-Queue Scaled
+    .multiqueuescaled = Competitive
 
 ## World
 options-starting-units =

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -4254,9 +4254,6 @@
 	GrantConditionOnPrerequisite@MQS:
 		Condition: global-multiqueue
 		Prerequisites: global.multiqueuescaled
-	GrantConditionOnPrerequisite@MQF2:
-		Condition: global-multiqueuefull
-		Prerequisites: global.multiqueuefull
 
 ^ProductionOptimizer1:
 	ProvidesPrerequisite@ProductionOptimizer1:
@@ -4329,6 +4326,9 @@
 		ProductionType: DefenseMQ
 		Color: 8A8A8A
 		RequiresCondition: global-multiqueuefull
+	GrantConditionOnPrerequisite@MQF2:
+		Condition: global-multiqueuefull
+		Prerequisites: global.multiqueuefull
 
 ^ProducesInfantry:
 	Inherits@QUEUEUPDATER: ^QueueUpdater

diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml
@@ -4460,7 +4460,7 @@ ZTRP:
 		Queue: InfantrySQ, InfantryMQ
 		BuildAtProductionType: Soldier
 		BuildPaletteOrder: 150
-		Prerequisites: ~pyle, gtek, bomb2.strat. ~techlevel.high
+		Prerequisites: ~pyle, gtek, bombard2.strat, ~bombard.strat, ~techlevel.high
 		Description: Elite infantry armed with a railgun and equipped\n  with a jump pack.
 		IconPalette: chrometd
 	TooltipExtras:
@@ -4553,7 +4553,7 @@ ZTRP:
 ZRAI:
 	Inherits: ZTRP
 	Buildable:
-		Prerequisites: ~pyle, gtek, seek2.strat, ~techlevel.high
+		Prerequisites: ~pyle, gtek, seek2.strat, ~seek.strat, ~techlevel.high
 		Description: Elite infantry armed with a sonic grenade launcher\n  and equipped with a jump pack.
 		BuildPaletteOrder: 151
 	Tooltip:
@@ -4578,7 +4578,7 @@ ZRAI:
 ZDEF:
 	Inherits: ZTRP
 	Buildable:
-		Prerequisites: ~pyle, gtek, hold2.strat, ~techlevel.high
+		Prerequisites: ~pyle, gtek, hold2.strat, ~hold.strat, ~techlevel.high
 		Description: Elite infantry armed with an ion rifle\n  and an ability which shields nearby infantry.
 		BuildPaletteOrder: 152
 	Tooltip:

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -5439,7 +5439,7 @@ TRPC:
 		Description: Tough infantry transport pre-loaded with infantry.
 	TooltipExtras:
 		Weaknesses: • Unarmed
-		Attributes: • Empowers nearby basic infantry\n• Heals all nearby infantry
+		Attributes: • Empowers nearby basic infantry\n• Heals all nearby infantry\n• Detects cloaked units and mines
 	Valued:
 		Cost: 1500
 	Tooltip:
@@ -5517,7 +5517,14 @@ TRPC:
 	GivesExperienceCA:
 		ActorExperienceModifier: 2000
 		PlayerExperienceModifier: 0
-	-GrantConditionOnPrerequisite@GLOBALBOUNTY:
+	DetectCloaked:
+		Range: 6c0
+		DetectionTypes: Cloak, Thief, AirCloak
+		RequiresCondition: !(empdisable || being-warped)
+	DetectCloaked@Mines:
+		Range: 4c0
+		DetectionTypes: Mine
+		RequiresCondition: !(empdisable || being-warped)
 	GivesBounty:
 		Percentage: 2
 	Voiced: