diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 110051fe62..bcfc3043fb 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -50,6 +50,7 @@ UpgradeTypes: selfheal UpgradeMinEnabledLevel: 1 UpgradeManager: + MustBeDestroyed: ^Tank: AppearsOnRadar: @@ -106,6 +107,7 @@ UpgradeTypes: selfheal UpgradeMinEnabledLevel: 1 UpgradeManager: + MustBeDestroyed: ^Helicopter: AppearsOnRadar: @@ -149,6 +151,7 @@ UpgradeManager: WithShadow: Hovers: + MustBeDestroyed: ^Infantry: AppearsOnRadar: @@ -233,6 +236,7 @@ UpgradeTypes: selfheal UpgradeMinEnabledLevel: 1 UpgradeManager: + MustBeDestroyed: ^CivInfantry: Inherits: ^Infantry @@ -424,6 +428,7 @@ ^BaseBuilding: Inherits: ^Building MustBeDestroyed: + RequiredForShortGame: true RepairableBuilding: RepairPercent: 40 RepairStep: 14 diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index e0465a915c..3e62f3f7b9 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -198,7 +198,8 @@ SILO: -EmitInfantryOnSell: Power: Amount: -10 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false PYLE: Inherits: ^BaseBuilding @@ -616,7 +617,8 @@ GUN: Range: 3 Power: Amount: -20 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false SAM: Inherits: ^BaseBuilding @@ -657,7 +659,8 @@ SAM: RenderRangeCircle: Power: Amount: -20 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false OBLI: Inherits: ^BaseBuilding @@ -704,7 +707,8 @@ OBLI: Range: 5 Power: Amount: -150 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false GTWR: Inherits: ^BaseBuilding @@ -744,7 +748,8 @@ GTWR: ROT: 255 Power: Amount: -10 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false ATWR: Inherits: ^BaseBuilding @@ -794,7 +799,8 @@ ATWR: RenderRangeCircle: Power: Amount: -40 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false SBAG: Inherits: ^Wall diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 94ab348d86..26a9a9e4ca 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -28,6 +28,7 @@ MCV: NoTransformSounds: deploy1.aud RenderUnit: MustBeDestroyed: + RequiredForShortGame: true BaseBuilding: LeavesHusk: HuskActor: MCV.Husk @@ -548,6 +549,7 @@ STNK: TargetableUnit: LeavesHusk: HuskActor: STNK.Husk + -MustBeDestroyed: MHQ: Inherits: ^Vehicle diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index c551ef0371..655e1c295a 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -242,6 +242,7 @@ FREMEN: CloakDelay: 250 CloakSound: STEALTH1.WAV UncloakSound: STEALTH2.WAV + -MustBeDestroyed: GRENADIER: Inherits: ^Infantry diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index cdf36f445f..e7477b01b4 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -48,6 +48,7 @@ UpgradeMinEnabledLevel: 1 UpgradeManager: TemporaryOwnerManager: + MustBeDestroyed: ^Tank: AppearsOnRadar: @@ -99,6 +100,7 @@ UpgradeMinEnabledLevel: 1 UpgradeManager: TemporaryOwnerManager: + MustBeDestroyed: ^Husk: Health: @@ -224,6 +226,7 @@ UpgradeTypes: selfheal UpgradeMinEnabledLevel: 1 UpgradeManager: + MustBeDestroyed: ^Plane: AppearsOnRadar: @@ -286,6 +289,7 @@ EmitInfantryOnSell: ActorTypes: rifle,rifle,rifle,rifle,rifle,bazooka,bazooka,bazooka,engineer MustBeDestroyed: + RequiredForShortGame: true GivesExperience: FrozenUnderFog: CaptureNotification: diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index 93b5c99ae5..19fc9b2bb8 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -197,6 +197,7 @@ STEALTHRAIDER: UncloakSound: STEALTH2.WAV AutoTarget: InitialStance: HoldFire + -MustBeDestroyed: CARRYALLO: Inherits: ^CARRYALL diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index 1cd31969d9..962e7a9841 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -228,6 +228,8 @@ CONCRETEB: -EmitInfantryOnSell: Power: Amount: -5 + MustBeDestroyed: + RequiredForShortGame: false ^LIGHT: Inherits: ^Building @@ -501,6 +503,8 @@ WALL: Types: turret Power: Amount: -20 + MustBeDestroyed: + RequiredForShortGame: false ^ROCKETTOWER: Inherits: ^Building @@ -554,6 +558,8 @@ WALL: Types: turret Power: Amount: -30 + MustBeDestroyed: + RequiredForShortGame: false ^REPAIR: Inherits: ^Building diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 3706689135..298b37c885 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -22,6 +22,7 @@ RevealsShroud: Range: 8c0 MustBeDestroyed: + RequiredForShortGame: true BaseBuilding: Explodes: Weapon: UnitExplodeScale diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 8208eb26b3..a4644dd6ad 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -71,6 +71,7 @@ UpgradeMaxAcceptedLevel: 2 TimedUpgradeBar: Upgrade: invulnerability + MustBeDestroyed: ^Tank: AppearsOnRadar: @@ -145,6 +146,7 @@ UpgradeMaxAcceptedLevel: 2 TimedUpgradeBar: Upgrade: invulnerability + MustBeDestroyed: ^Infantry: AppearsOnRadar: @@ -233,6 +235,7 @@ UpgradeTypes: selfheal UpgradeMinEnabledLevel: 1 UpgradeManager: + MustBeDestroyed: ^Ship: AppearsOnRadar: @@ -286,6 +289,7 @@ TimedUpgradeBar: Upgrade: invulnerability UpgradeMinEnabledLevel: 1 + MustBeDestroyed: ^Plane: AppearsOnRadar: @@ -342,6 +346,7 @@ TimedUpgradeBar: Upgrade: invulnerability WithShadow: + MustBeDestroyed: ^Helicopter: Inherits: ^Plane @@ -377,6 +382,7 @@ EmitInfantryOnSell: ActorTypes: e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,e6,e6,e6,e6,e6 MustBeDestroyed: + RequiredForShortGame: true GivesExperience: CaptureNotification: EditorAppearance: @@ -416,7 +422,8 @@ Inherits: ^Building TargetableBuilding: TargetTypes: Ground, C4, DetonateAttack, Structure, Defense - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false ^Wall: AppearsOnRadar: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 67a182d115..dbad3a1819 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -520,6 +520,7 @@ SNIPER: UncloakOnMove: yes DetectCloaked: Range: 6 + -MustBeDestroyed: Zombie: Inherits: ^Infantry diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index f2bdea813a..3c7b4b8f64 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -48,6 +48,7 @@ SS: Explodes: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine + -MustBeDestroyed: MSUB: Inherits: ^Ship @@ -99,6 +100,7 @@ MSUB: Explodes: Weapon: UnitExplodeSubmarine EmptyWeapon: UnitExplodeSubmarine + -MustBeDestroyed: DD: Inherits: ^Ship diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index d2c8f9869b..2e787fb0c7 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -43,7 +43,8 @@ MSLO: SupportPowerChargeBar: Power: Amount: -100 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false GAP: Inherits: ^Building @@ -77,7 +78,8 @@ GAP: RenderShroudCircle: Power: Amount: -60 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false SPEN: Inherits: ^Building @@ -228,7 +230,8 @@ IRON: SupportPowerChargeBar: Power: Amount: -200 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false PDOX: Inherits: ^Building @@ -272,7 +275,8 @@ PDOX: -AcceptsSupplies: Power: Amount: -200 - -MustBeDestroyed: + MustBeDestroyed: + RequiredForShortGame: false TSLA: Inherits: ^Defense @@ -491,6 +495,7 @@ HBOX: PortCones: 86, 86, 86, 86, 86, 86 Power: Amount: -15 + -MustBeDestroyed: GUN: Inherits: ^Defense diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 01e85fdc93..2d6d57aa24 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -311,6 +311,7 @@ MCV: NoTransformSounds: nodeply1.aud RenderUnit: MustBeDestroyed: + RequiredForShortGame: true BaseBuilding: LeavesHusk: HuskActor: MCV.Husk @@ -772,4 +773,5 @@ STNK: Explodes: Weapon: UnitExplodeSmall EmptyWeapon: UnitExplodeSmall + -MustBeDestroyed: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index f91927d7ca..a89b349c31 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -23,6 +23,7 @@ RepairableBuilding: EngineerRepairable: MustBeDestroyed: + RequiredForShortGame: true GivesExperience: CaptureNotification: EditorAppearance: @@ -92,6 +93,7 @@ UpgradeMinEnabledLevel: 1 InitialDelay: 0 CloakDelay: 90 + MustBeDestroyed: ^Infantry: AppearsOnRadar: @@ -174,6 +176,7 @@ UpgradeMinEnabledLevel: 1 InitialDelay: 0 CloakDelay: 90 + MustBeDestroyed: ^CivilianInfantry: Inherits: ^Infantry @@ -201,6 +204,7 @@ Types: CivilianInfantry RenderInfantry: ScaredyCat: + -MustBeDestroyed: ^Vehicle: AppearsOnRadar: @@ -280,6 +284,7 @@ UpgradeMaxAcceptedLevel: 2 InitialDelay: 0 CloakDelay: 90 + MustBeDestroyed: ^Tank: AppearsOnRadar: @@ -359,6 +364,7 @@ UpgradeMaxAcceptedLevel: 2 InitialDelay: 0 CloakDelay: 90 + MustBeDestroyed: ^Helicopter: AppearsOnRadar: @@ -406,6 +412,7 @@ Guard: Guardable: UpgradeManager: + MustBeDestroyed: ^BlossomTree: Tooltip: diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index 9fd5e53224..227358afcd 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -23,6 +23,7 @@ MCV: RevealsShroud: Range: 4c0 MustBeDestroyed: + RequiredForShortGame: true BaseBuilding: Transforms: IntoActor: gacnst @@ -848,4 +849,5 @@ STNK: RenderSprites: RenderVoxels: WithVoxelBody: + -MustBeDestroyed: