diff --git a/mods/ts/maps/fields-of-green/map.yaml b/mods/ts/maps/fields-of-green/map.yaml index a56cf3f9c8..581710380b 100644 --- a/mods/ts/maps/fields-of-green/map.yaml +++ b/mods/ts/maps/fields-of-green/map.yaml @@ -1447,13 +1447,13 @@ Rules: InitialUnits: e1, e1, e2, e2, medic GACTWR: DamageMultiplier@UNKILLABLE: - UpgradeTypes: unkillable - Modifier: 0, 0 + RequiresCondition: unkillable + Modifier: 0 NAOBEL: DamageMultiplier@UNKILLABLE: - UpgradeTypes: unkillable - Modifier: 0, 0 + RequiresCondition: unkillable + Modifier: 0 NALASR: DamageMultiplier@UNKILLABLE: - UpgradeTypes: unkillable - Modifier: 0, 0 + RequiresCondition: unkillable + Modifier: 0 diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 270e23ca80..baf4bc07a0 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -147,8 +147,7 @@ ORCAB: AutoTarget: RenderSprites: Hovers@CRUISING: - UpgradeTypes: cruising - UpgradeMinEnabledLevel: 1 + RequiresCondition: cruising SpawnActorOnDeath: Actor: ORCAB.Husk @@ -310,13 +309,11 @@ APACHE: WithIdleOverlay@ROTORAIR: Offset: 85,0,384 Sequence: rotor - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne WithIdleOverlay@ROTORGROUND: Offset: 85,0,384 Sequence: slow-rotor - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne RenderSprites: SpawnActorOnDeath: Actor: APACHE.Husk @@ -351,8 +348,7 @@ HUNTER: Image: GGHUNT WithFacingSpriteBody: Hovers@CRUISING: - UpgradeTypes: cruising - UpgradeMinEnabledLevel: 1 + RequiresCondition: cruising QuantizeFacingsFromSequence: AutoSelectionSize: DrawLineToTarget: diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index a8906b1208..b74e1c2654 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -70,8 +70,7 @@ CHAMSPY: Palette: pips ReferencePoint: Top, Right ZOffset: 256 - UpgradeTypes: disguise - UpgradeMinEnabledLevel: 1 + RequiresCondition: disguise Infiltrates: Types: SpyInfiltrate -AutoTarget: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 1faf7dce35..679010a8d5 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -18,69 +18,80 @@ ^GainsExperience: GainsExperience: Upgrades: - 500: rank, firepower, damage, speed, reload - 1000: rank, firepower, damage, speed, reload, selfheal, eliteweapon - FirepowerMultiplier@EXPERIENCE: - UpgradeTypes: firepower - Modifier: 110, 130 - DamageMultiplier@EXPERIENCE: - UpgradeTypes: damage - Modifier: 90, 75 - SpeedMultiplier@EXPERIENCE: - UpgradeTypes: speed - Modifier: 120, 140 - ReloadDelayMultiplier@EXPERIENCE: - UpgradeTypes: reload - Modifier: 90, 75 + 500: rank-veteran + 1000: rank-elite + FirepowerMultiplier@VETERAN: + RequiresCondition: (rank-veteran && !rank-elite) || crate-firepower + Modifier: 110 + FirepowerMultiplier@ELITE: + RequiresCondition: rank-elite || (rank-veteran && crate-firepower) + Modifier: 130 + DamageMultiplier@VETERAN: + RequiresCondition: (rank-veteran && !rank-elite) || crate-damage + Modifier: 90 + DamageMultiplier@ELITE: + RequiresCondition: rank-elite || (rank-veteran && crate-damage) + Modifier: 75 + SpeedMultiplier@VETERAN: + RequiresCondition: (rank-veteran && !rank-elite) || crate-speed + Modifier: 120 + SpeedMultiplier@ELITE: + RequiresCondition: rank-elite || (rank-veteran && crate-speed) + Modifier: 140 + ReloadDelayMultiplier@VETERAN: + RequiresCondition: rank-veteran && !rank-elite + Modifier: 90 + ReloadDelayMultiplier@ELITE: + RequiresCondition: rank-elite + Modifier: 75 SelfHealing@ELITE: Step: 2 Delay: 100 HealIfBelow: 100 DamageCooldown: 125 - UpgradeTypes: selfheal - UpgradeMinEnabledLevel: 1 - WithRankDecoration: + RequiresCondition: rank-elite + WithDecoration@VETERAN: Image: rank - Sequence: rank + Sequence: veteran Palette: ra ReferencePoint: Bottom, Right - UpgradeTypes: rank + RequiresCondition: rank-veteran && !rank-elite + ZOffset: 256 + WithDecoration@ELITE: + Image: rank + Sequence: elite + Palette: ra + ReferencePoint: Bottom, Right + RequiresCondition: rank-elite ZOffset: 256 - UpgradeMinEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 2 ^EmpDisable: UpgradeOverlay@EMPDISABLE: - UpgradeTypes: empdisable - UpgradeMinEnabledLevel: 1 + RequiresCondition: empdisable Palette: disabled DisableOnUpgrade@EMPDISABLE: - UpgradeTypes: empdisable - UpgradeMinEnabledLevel: 1 + RequiresCondition: empdisable TimedUpgradeBar@EMPDISABLE: Upgrade: empdisable Color: FFFFFF WithIdleOverlay@EMPDISABLE: Sequence: emp-overlay Palette: effect - UpgradeTypes: empdisable + RequiresCondition: empdisable ShowToEnemies: true ZOffset: 512 - UpgradeMinEnabledLevel: 1 PowerMultiplier@EMPDISABLE: - UpgradeTypes: empdisable + RequiresCondition: empdisable Modifier: 0 ^EmpDisableMobile: Inherits: ^EmpDisable Mobile: - UpgradeTypes: notmobile - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !notmobile ^Cloakable: Cloak@CLOAKGENERATOR: - UpgradeTypes: cloakgenerator - UpgradeMinEnabledLevel: 1 + RequiresCondition: cloakgenerator || crate-cloak InitialDelay: 0 CloakDelay: 90 IsPlayerPalette: true @@ -306,8 +317,7 @@ Delay: 100 HealIfBelow: 100 DamageCooldown: 125 - UpgradeTypes: hospitalheal - UpgradeMinEnabledLevel: 1 + RequiresCondition: hospitalheal GlobalUpgradable@HOSPITAL: Upgrades: hospitalheal Prerequisites: cahosp @@ -316,8 +326,7 @@ Sequence: medic Palette: pips ReferencePoint: Bottom, Right - UpgradeTypes: hospitalheal - UpgradeMinEnabledLevel: 1 + RequiresCondition: hospitalheal ^RegularInfantryDeath: WithDeathAnimation@normal: @@ -406,7 +415,7 @@ ValidDamageStates: Critical GrantPermanently: true SpeedMultiplier@CRITICAL: - UpgradeTypes: criticalspeed + RequiresCondition: criticalspeed Modifier: 50 ^CivilianInfantry: @@ -488,10 +497,10 @@ Upgrades: criticalspeed ValidDamageStates: Critical SpeedMultiplier@DAMAGED: - UpgradeTypes: damagedspeed + RequiresCondition: damagedspeed Modifier: 80 SpeedMultiplier@CRITICAL: - UpgradeTypes: criticalspeed + RequiresCondition: criticalspeed Modifier: 60 Carryable: @@ -543,12 +552,10 @@ UseLocation: true Targetable@GROUND: TargetTypes: Ground, Vehicle - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne Targetable@AIRBORNE: TargetTypes: Air - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne Selectable: WithTextControlGroupDecoration: SelectionDecorations: @@ -584,8 +591,7 @@ CruiseAltitude: 2048 CanHover: True Hovers@CRUISING: - UpgradeTypes: cruising - UpgradeMinEnabledLevel: 1 + RequiresCondition: cruising ^Plane: Inherits: ^Aircraft @@ -939,5 +945,4 @@ Upgrades: veins WithIdleOverlay@VEINS: Sequence: veins - UpgradeTypes: veins - UpgradeMinEnabledLevel: 1 + RequiresCondition: veins diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml index 3c0a1733d7..b3005c315c 100644 --- a/mods/ts/rules/gdi-structures.yaml +++ b/mods/ts/rules/gdi-structures.yaml @@ -41,24 +41,20 @@ GAPOWR: Upgrades: powrup: powrup.a Power@pluga: - UpgradeTypes: powrup.a - UpgradeMinEnabledLevel: 1 + RequiresCondition: powrup.a Amount: 50 WithIdleOverlay@pluga: - UpgradeTypes: powrup.a - UpgradeMinEnabledLevel: 1 + RequiresCondition: powrup.a Sequence: idle-powrupa Pluggable@plugb: Offset: 1,1 Upgrades: powrup: powrup.b WithIdleOverlay@plugb: - UpgradeTypes: powrup.b - UpgradeMinEnabledLevel: 1 + RequiresCondition: powrup.b Sequence: idle-powrupb Power@plugb: - UpgradeTypes: powrup.b - UpgradeMinEnabledLevel: 1 + RequiresCondition: powrup.b Amount: 50 ProvidesPrerequisite@buildingname: SelectionDecorations: @@ -118,8 +114,7 @@ GAPILE: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary GAWEAP: Inherits: ^Building @@ -181,8 +176,7 @@ GAWEAP: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary GAHPAD: Inherits: ^Building @@ -236,8 +230,7 @@ GAHPAD: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary GADEPT: Inherits: ^Building @@ -406,8 +399,7 @@ GAPLUG: MaxHeightDelta: 3 IonCannonPower: Cursor: ioncannon - UpgradeTypes: plug.ioncannon - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.ioncannona || plug.ioncannonb Icon: ioncannon Effect: explosion EffectSequence: ionring @@ -421,8 +413,7 @@ GAPLUG: DisplayRadarPing: True CameraActor: camera ProduceActorPower: - UpgradeTypes: plug.hunterseeker - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.hunterseekera || plug.hunterseekerb Description: Hunter Seeker LongDesc: Releases a drone that will acquire and destroy an enemy target. Icon: hunterseeker @@ -437,38 +428,32 @@ GAPLUG: Power: Amount: -150 Power@ioncannon: - UpgradeTypes: plug.ioncannon - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.ioncannona || plug.ioncannonb Amount: -100 Power@hunterseeker: - UpgradeTypes: plug.hunterseeker - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.hunterseekera || plug.hunterseekerb Amount: -50 Pluggable@pluga: Offset: 0,2 Upgrades: - plug.ioncannon: plug.ioncannon, plug.ioncannona - plug.hunterseeker: plug.hunterseeker, plug.hunterseekera + plug.ioncannon: plug.ioncannona + plug.hunterseeker: plug.hunterseekera WithIdleOverlay@ioncannona: - UpgradeTypes: plug.ioncannona - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.ioncannona Sequence: idle-ioncannona WithIdleOverlay@hunterseekera: - UpgradeTypes: plug.hunterseekera - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.hunterseekera Sequence: idle-hunterseekera Pluggable@plugb: Offset: 1,2 Upgrades: - plug.ioncannon: plug.ioncannon, plug.ioncannonb - plug.hunterseeker: plug.hunterseeker, plug.hunterseekerb + plug.ioncannon: plug.ioncannonb + plug.hunterseeker: plug.hunterseekerb WithIdleOverlay@ioncannonb: - UpgradeTypes: plug.ioncannonb - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.ioncannonb Sequence: idle-ioncannonb WithIdleOverlay@hunterseekerb: - UpgradeTypes: plug.hunterseekerb - UpgradeMinEnabledLevel: 1 + RequiresCondition: plug.hunterseekerb Sequence: idle-hunterseekerb ProvidesPrerequisite@buildingname: SelectionDecorations: diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 1306aaed33..c4469e53b8 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -68,61 +68,51 @@ GACTWR: BodyOrientation: QuantizedFacings: 32 DetectCloaked: - UpgradeTypes: tower - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan || tower.rocket || tower.sam Turreted: TurnSpeed: 10 InitialFacing: 224 AttackTurreted: - UpgradeTypes: tower - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan || tower.rocket || tower.sam CanPowerDown: IndicatorPalette: mouse PowerupSpeech: EnablePower PowerdownSpeech: DisablePower WithSpriteTurret@VULC: - UpgradeTypes: tower.vulcan - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan Recoils: false Sequence: turret-vulcan WithSpriteTurret@ROCKET: - UpgradeTypes: tower.rocket - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.rocket Recoils: false Sequence: turret-rocket WithSpriteTurret@SAM: - UpgradeTypes: tower.sam - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.sam Recoils: false Sequence: turret-sam Armament@VULCPRIMARY: - UpgradeTypes: tower.vulcan - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan Weapon: VulcanTower LocalOffset: 416,85,960 MuzzleSequence: muzzle MuzzleSplitFacings: 8 Armament@VULCSECONDARY: - UpgradeTypes: tower.vulcan - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan Name: secondary Weapon: VulcanTower LocalOffset: 416,-85,960 MuzzleSequence: muzzle MuzzleSplitFacings: 8 Armament@ROCKET: - UpgradeTypes: tower.rocket - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.rocket Weapon: RPGTower LocalOffset: 192,-65,1056 Armament@SAM: - UpgradeTypes: tower.sam - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.sam Weapon: RedEye2 LocalOffset: 384,0,1200 WithMuzzleOverlay: - UpgradeTypes: tower.vulcan - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan WithIdleOverlay@LIGHTS: Sequence: idle-lights LineBuildNode: @@ -130,18 +120,16 @@ GACTWR: Power@base: Amount: -10 Power@turrets: - UpgradeTypes: tower - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.vulcan || tower.rocket || tower.sam Amount: -20 Power@samextra: - UpgradeTypes: tower.sam - UpgradeMinEnabledLevel: 1 + RequiresCondition: tower.sam Amount: -10 Pluggable: Upgrades: - tower.vulcan: tower, tower.vulcan - tower.rocket: tower, tower.rocket - tower.sam: tower, tower.sam + tower.vulcan: tower.vulcan + tower.rocket: tower.rocket + tower.sam: tower.sam ProvidesPrerequisite@buildingname: SelectionDecorations: VisualBounds: 48, 48, 0, -12 diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index db6bd3da65..86c58f6dee 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -34,12 +34,10 @@ APC: Upgrades: inwater TerrainTypes: Water WithVoxelBody: - UpgradeTypes: inwater - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !inwater WithVoxelBody@water: Sequence: water - UpgradeTypes: inwater - UpgradeMinEnabledLevel: 1 + RequiresCondition: inwater LeavesTrails: Image: wake Palette: effect diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index 1e5f7c345b..aa176c15f2 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -77,21 +77,21 @@ CRATE: GrantUpgradeCrateAction@cloak: SelectionShares: 5 Effect: stealth - Upgrades: cloakgenerator + Upgrades: crate-cloak Notification: cloak5.aud GrantUpgradeCrateAction@firepower: SelectionShares: 5 Effect: firepower - Upgrades: firepower + Upgrades: crate-firepower Notification: 00-i070.aud GrantUpgradeCrateAction@armor: SelectionShares: 5 Effect: armor - Upgrades: damage + Upgrades: crate-damage Notification: 00-i068.aud GrantUpgradeCrateAction@speed: SelectionShares: 5 - Upgrades: speed + Upgrades: crate-speed Notification: 00-i080.aud SROCK01: diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml index 5cef90a257..c1d8a21afa 100644 --- a/mods/ts/rules/nod-structures.yaml +++ b/mods/ts/rules/nod-structures.yaml @@ -128,8 +128,7 @@ NAHAND: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary NAWEAP: Inherits: ^Building @@ -187,8 +186,7 @@ NAWEAP: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary NAHPAD: Inherits: ^Building @@ -242,8 +240,7 @@ NAHPAD: ReferencePoint: Top Color: E0D048 ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary NARADR: Inherits: ^Building diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 8efed6ee36..1be6da809d 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -55,14 +55,11 @@ BIKE: MaxHeightDelta: 3 Armament@PRIMARY: Weapon: BikeMissile - UpgradeTypes: eliteweapon - UpgradeMaxEnabledLevel: 0 - UpgradeMaxAcceptedLevel: 1 + RequiresCondition: !rank-elite LocalOffset: -108,-144,360, -108,144,360 Armament@ELITE: Weapon: HoverMissile - UpgradeTypes: eliteweapon - UpgradeMinEnabledLevel: 1 + RequiresCondition: rank-elite LocalOffset: -108,-144,360, -108,144,360 AttackFrontal: Voice: Attack @@ -74,12 +71,10 @@ TTNK: Cost: 800 Tooltip: Name: Tick Tank - UpgradeTypes: deployed - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !deployed Tooltip@DEPLOYED: Name: Tick Tank (deployed) - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed Buildable: Queue: Vehicle BuildPaletteOrder: 60 @@ -93,20 +88,16 @@ TTNK: HP: 350 Armor: Type: Light - UpgradeTypes: undeployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: undeployed Armament@PRIMARY: Weapon: 90mm LocalOffset: 288,0,256 - UpgradeTypes: eliteweapon - UpgradeMaxEnabledLevel: 0 - UpgradeMaxAcceptedLevel: 1 + RequiresCondition: !rank-elite MuzzleSequence: muzzle Armament@ELITE: Weapon: 120mmx LocalOffset: 288,0,256 - UpgradeTypes: eliteweapon - UpgradeMinEnabledLevel: 1 + RequiresCondition: rank-elite MuzzleSequence: muzzle WithMuzzleOverlay: RevealsShroud: @@ -123,16 +114,12 @@ TTNK: DeploySound: place2.aud UndeploySound: clicky1.aud WithVoxelBody: - UpgradeTypes: undeployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: undeployed WithSpriteBody@deployed: - UpgradeTypes: undeployed - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !undeployed AttackFrontal: Voice: Attack - UpgradeTypes: undeployed - UpgradeMinEnabledLevel: 1 - UpgradeMaxAcceptedLevel: 1 + RequiresCondition: undeployed Turreted: TurnSpeed: 6 Turret: deployed @@ -141,38 +128,31 @@ TTNK: WithVoxelBarrel: Armament: deployed LocalOffset: 128, 0, 256 - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed WithVoxelTurret@deployed: Turret: deployed - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed AttackTurreted@deployed: Voice: Attack Armaments: deployed - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed Armament@deployed: Name: deployed Turret: deployed Weapon: 90mm LocalOffset: 384,0,256 - UpgradeTypes: eliteweapon - UpgradeMaxEnabledLevel: 0 - UpgradeMaxAcceptedLevel: 1 + RequiresCondition: !rank-elite MuzzleSequence: muzzle Armament@deployedElite: Name: deployed Turret: deployed Weapon: 120mmx LocalOffset: 384,0,256 - UpgradeTypes: eliteweapon - UpgradeMinEnabledLevel: 1 + RequiresCondition: rank-elite MuzzleSequence: muzzle Armor@deployed: Type: Concrete - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed AutoTarget: ART2: diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index d8639598e7..6855a769f3 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -15,13 +15,10 @@ E1: Speed: 71 Armament@PRIMARY: Weapon: Minigun - UpgradeTypes: eliteweapon - UpgradeMaxEnabledLevel: 0 - UpgradeMaxAcceptedLevel: 1 + RequiresCondition: !rank-elite Armament@ELITE: Weapon: M1Carbine - UpgradeTypes: eliteweapon - UpgradeMinEnabledLevel: 1 + RequiresCondition: rank-elite AttackFrontal: Voice: Attack WithInfantryBody: diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 72f62fd590..e069fbbdb8 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -116,12 +116,10 @@ LPST: Cost: 950 Tooltip: Name: Mobile Sensor Array - UpgradeTypes: deployed - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !deployed Tooltip@DEPLOYED: Name: Mobile Sensor Array (deployed) - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed Health: HP: 600 Armor: @@ -147,14 +145,11 @@ LPST: UndeploySound: clicky1.aud WithVoxelBody: Image: lpst - UpgradeTypes: undeployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: undeployed WithSpriteBody@deployed: - UpgradeTypes: undeployed - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !undeployed DetectCloaked: - UpgradeTypes: deployed - UpgradeMinEnabledLevel: 1 + RequiresCondition: deployed Range: 18c0 RenderDetectionCircle: TrailCount: 3 diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index dc9b2de88b..dd52cb7b65 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -62,9 +62,10 @@ crate-effects: levelup: veteran rank: - rank: pips + veteran: pips Start: 7 - Length: 2 + elite: pips + Start: 8 mpspawn: idle: