TFCA improvements. Yaml fixes.

Inq8 · Jul 7, 2023 · 28cb642 · 28cb642
1 parent 26934fe
commit 28cb642
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/mods/ca/maps/tfca/tfca-rules-base.yaml b/mods/ca/maps/tfca/tfca-rules-base.yaml
@@ -184,6 +184,11 @@ SPAWN:
 		Delay: 25
 		StartIfBelow: 100
 		RequiresCondition: shielded
+	FirepowerMultiplier@ENGIBUFF:
+		RequiresCondition: engibuff
+		Modifier: 115
+	ExternalCondition@ENGIBUFF:
+		Condition: engibuff
 
 XO:
 	Inherits@TFUNIT: ^TFUnit
@@ -436,7 +441,7 @@ E6:
 		BuildPaletteOrder: 9
 	TooltipExtras:
 		Weaknesses: • Unarmed
-		Attributes: • Detects mines
+		Attributes: • Detects mines\n• Nearby allies deal 15% more damage
 	Mobile:
 		Speed: 100
 	RevealsShroud:
@@ -495,6 +500,14 @@ E6:
 	DetectCloaked:
 		Range: 5c0
 		DetectionTypes: Mine
+	WithRangeCircle:
+		Color: ffff00aa
+		Range: 3c512
+		ValidRelationships: Ally
+	ProximityExternalCondition@ENGIBUFF:
+		Range: 3c512
+		Condition: engibuff
+		ValidRelationships: Ally
 
 SAB:
 	Inherits@TFUNIT: ^TFUnit
@@ -711,6 +724,14 @@ HQ:
 		-BeingCapturedCondition:
 	-RangedGpsRadarProvider:
 	-WithRangeCircle:
+	-SpawnActorPowerCA@sathack:
+	-SpawnActorPowerCA@sathacklegion:
+	-ProduceActorPowerCA@hackercell:
+	-ProduceActorPowerCA@hackercellAI:
+	-DropPodsPowerCA@Zocom:
+	-CashHackPower@Legion:
+	-AirstrikePower@BlackhandFirebomb:
+	-AirReinforcementsPower@ShadowTeam:
 
 APWR:
 	-Sellable:
@@ -766,6 +787,7 @@ SHIELDZONE:
 		Visible: Always
 		Color: 00ffbbaa
 		Range: 3c0
+		ValidRelationships: Ally
 	ProximityExternalCondition@SHIELD:
 		Range: 3c0
 		Condition: shielded
@@ -791,6 +813,7 @@ PYROZONE:
 		Visible: Always
 		Color: ff6600aa
 		Range: 3c0
+		ValidRelationships: Enemy, Ally
 	KillsSelf:
 		RemoveInstead: true
 		Delay: 200

diff --git a/mods/ca/maps/tfca/tfca-weapons.yaml b/mods/ca/maps/tfca/tfca-weapons.yaml
@@ -99,7 +99,7 @@ Heal:
 		Damage: -4000
 
 Repair:
-	ReloadDelay: 60
+	ReloadDelay: 40
 	Warhead@highlight: GrantExternalCondition
 		ValidTargets: Structure
 	Warhead@1Dam: SpreadDamage

diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -1145,7 +1145,7 @@
 	Targetable@AICAPTURE:
 		TargetTypes: NoCrew
 		RequiresCondition: driver-dead
-	TooltipDescription:
+	TooltipDescription@DRIVER_DEAD:
 		Description: Crewless. Capturable by infantry.
 		RequiresCondition: driver-dead
 

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -3276,6 +3276,7 @@ MTNK.Drone:
 	-Capturable@DRIVER_DEAD:
 	-GrantConditionIfOwnerIsNeutral:
 	-ChangesHealth@DRIVER_DEAD:
+	-TooltipDescription@DRIVER_DEAD:
 	-Targetable@DRIVERKILL:
 	-Targetable@DRIVERKILLLOWHP:
 	-GrantConditionOnDamageState@DRIVERKILLLOWHP:
@@ -3365,6 +3366,7 @@ MDRN:
 	-Capturable@DRIVER_DEAD:
 	-GrantConditionIfOwnerIsNeutral:
 	-ChangesHealth@DRIVER_DEAD:
+	-TooltipDescription@DRIVER_DEAD:
 	-Targetable@DRIVERKILL:
 	-Targetable@DRIVERKILLLOWHP:
 	-GrantConditionOnDamageState@DRIVERKILLLOWHP:
@@ -3627,6 +3629,7 @@ HTNK.Drone:
 	-Capturable@DRIVER_DEAD:
 	-GrantConditionIfOwnerIsNeutral:
 	-ChangesHealth@DRIVER_DEAD:
+	-TooltipDescription@DRIVER_DEAD:
 	-Targetable@DRIVERKILL:
 	-Targetable@DRIVERKILLLOWHP:
 	-GrantConditionOnDamageState@DRIVERKILLLOWHP:
@@ -6300,6 +6303,7 @@ MEMP:
 	-Capturable@DRIVER_DEAD:
 	-GrantConditionIfOwnerIsNeutral:
 	-ChangesHealth@DRIVER_DEAD:
+	-TooltipDescription@DRIVER_DEAD:
 	-Targetable@DRIVERKILL:
 	-Targetable@DRIVERKILLLOWHP:
 	-GrantConditionOnDamageState@DRIVERKILLLOWHP:
@@ -6395,6 +6399,7 @@ CDRN:
 	-Capturable@DRIVER_DEAD:
 	-GrantConditionIfOwnerIsNeutral:
 	-ChangesHealth@DRIVER_DEAD:
+	-TooltipDescription@DRIVER_DEAD:
 	-Targetable@DRIVERKILL:
 	-Targetable@DRIVERKILLLOWHP:
 	-GrantConditionOnDamageState@DRIVERKILLLOWHP: