diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index df4e1b7c72..cddcee6915 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -465,10 +465,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: PROC: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index b3d8f3f353..9ef2308f9e 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -747,10 +747,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: PROC: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 09455d2dc2..858950a204 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -908,8 +908,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true + ^Vehicle: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false ^Infantry: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: WEAP: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index 29f30066c1..1204dd9349 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -553,12 +553,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false ^Tank: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: CRATE: Crate: Lifetime: 9999 diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 89b76c6ea6..822146e31e 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -632,12 +632,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false ^Tank: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: E3: AutoTarget: ScanRadius: 5 diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 041d74d466..7863beb31c 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -899,12 +899,48 @@ Rules: -ConquestVictoryConditions: MissionObjectives: EarlyGameOver: true - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false ^Tank: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: ^CivInfantry: Health: HP: 125 diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index ee5846e0d8..ff684131f0 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -323,11 +323,48 @@ Rules: MustBeDestroyed: ^CivInfantry: MustBeDestroyed: - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: - + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: Sequences: VoxelSequences: diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index d4f53b67a9..dea3bd2b6a 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -537,10 +537,48 @@ Rules: Scripts: nod03a.lua ObjectivesPanel: PanelName: MISSION_OBJECTIVES - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: NUK2: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 5fd45c90a0..77d0b361fc 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -582,10 +582,48 @@ Rules: Scripts: nod03b.lua ObjectivesPanel: PanelName: MISSION_OBJECTIVES - ^Infantry: - MustBeDestroyed: ^Vehicle: MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Tank: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Helicopter: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Infantry: + MustBeDestroyed: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Plane: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Ship: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Building: + Tooltip: + GenericVisibility: Enemy + ShowOwnerRow: false + ^Wall: + Tooltip: + ShowOwnerRow: false + ^Husk: + Tooltip: + GenericVisibility: Enemy, Ally, Neutral + GenericStancePrefix: false + ShowOwnerRow: false + HARV: + -MustBeDestroyed: NUK2: Buildable: Prerequisites: ~disabled diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 977088e953..a910fbce35 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -31,6 +31,8 @@ Guard: Guardable: BodyOrientation: + Tooltip: + GenericName: Vehicle UpdatesPlayerStatistics: Cloak: RequiresUpgrade: cloak @@ -85,6 +87,8 @@ Guard: Guardable: BodyOrientation: + Tooltip: + GenericName: Tank UpdatesPlayerStatistics: Cloak: RequiresUpgrade: cloak @@ -133,6 +137,8 @@ Huntable: LuaScriptEvents: ScriptTriggers: + Tooltip: + GenericName: Helicopter GainsStatUpgrades: SelfHealing@ELITE: Step: 2 @@ -190,6 +196,8 @@ Guard: Guardable: BodyOrientation: + Tooltip: + GenericName: Soldier SelfHealing@HOSPITAL: Step: 5 Ticks: 100 @@ -234,6 +242,7 @@ Cost: 70 Tooltip: Name: Civilian + GenericVisibility: None Mobile: Speed: 56 Health: @@ -396,6 +405,8 @@ Guardable: Range: 3 BodyOrientation: + Tooltip: + GenericName: Structure FrozenUnderFog: UpdatesPlayerStatistics: Huntable: @@ -426,6 +437,7 @@ Building: Tooltip: Name: Civilian Building + GenericVisibility: None FrozenUnderFog: StartsRevealed: true @@ -439,6 +451,7 @@ RelativeToTopLeft: yes Tooltip: Name: Civilian Building (Destroyed) + GenericVisibility: None BodyOrientation: FrozenUnderFog: StartsRevealed: true @@ -481,6 +494,7 @@ RelativeToTopLeft: yes Tooltip: Name: Field (Destroyed) + GenericVisibility: None BelowUnits: BodyOrientation: RenderBuilding: @@ -610,6 +624,8 @@ ForceHealthPercentage: 25 BelowUnits: BodyOrientation: + Tooltip: + GenericName: Destroyed Vehicle LuaScriptEvents: DisabledOverlay: ScriptTriggers: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 0df1495b2f..b80667b04f 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -43,6 +43,7 @@ HARV: Cost: 1000 Tooltip: Name: Harvester + GenericName: Harvester Description: Collects Tiberium for processing.\n Unarmed Buildable: BuildPaletteOrder: 10