From fede1a1e4b4fd82741178fe1db6a6fe811aaa515 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 21 Jun 2015 12:53:25 +0100 Subject: [PATCH 1/3] Remove "Enemy Unit Detected" announcements from RA. --- mods/ra/rules/aircraft.yaml | 2 -- mods/ra/rules/defaults.yaml | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index bbb86c7b2d..c1b8fe752a 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -33,7 +33,6 @@ BADR: -EjectOnDeath: -GpsDot: RejectsOrders: - -AnnounceOnSeen: AutoSelectionSize: RenderSprites: @@ -363,7 +362,6 @@ U2: Offset: -1c43,0,0 Interval: 2 RejectsOrders: - -AnnounceOnSeen: AutoSelectionSize: RenderSprites: diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 77ed4c8a75..a8db082879 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -91,8 +91,6 @@ CaptureNotification: Notification: UnitStolen MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyDetected Voiced: VoiceSet: VehicleVoice @@ -155,8 +153,6 @@ GroundCorpsePalette: WaterCorpseSequence: WaterCorpsePalette: - AnnounceOnSeen: - Notification: EnemyDetected Voiced: VoiceSet: VehicleVoice @@ -244,8 +240,6 @@ Cloneable: Types: Infantry MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyDetected Voiced: VoiceSet: GenericVoice @@ -277,8 +271,6 @@ Tooltip: GenericName: Ship MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyDetected EditorTilesetFilter: ExcludeTilesets: INTERIOR Voiced: @@ -317,8 +309,6 @@ GenericName: Plane WithShadow: MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyDetected Voiced: VoiceSet: GenericVoice @@ -329,8 +319,6 @@ GpsDot: String: Helicopter Hovers: - AnnounceOnSeen: - Notification: EnemyDetected ^Building: Inherits@1: ^ExistsInWorld From 096ce36d7be65dd660c9f382c12ed7e736f31440 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 21 Jun 2015 12:54:00 +0100 Subject: [PATCH 2/3] Remove "Enemy Unit Detected" announcements from D2K. --- mods/d2k/rules/defaults.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index d87eee569d..311c2575ce 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -63,8 +63,6 @@ UpgradeManager: TemporaryOwnerManager: MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyUnitsDetected Voiced: VoiceSet: VehicleVoice Carryable: @@ -119,8 +117,6 @@ UpgradeManager: TemporaryOwnerManager: MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyUnitsDetected Voiced: VoiceSet: VehicleVoice Carryable: @@ -259,8 +255,6 @@ FallRate: 130 UpgradeManager: MustBeDestroyed: - AnnounceOnSeen: - Notification: EnemyUnitsDetected TerrainModifiesDamage: TerrainModifier: Rough: 80 @@ -292,8 +286,6 @@ AttackMove: ScriptTriggers: UpgradeManager: - AnnounceOnSeen: - Notification: EnemyUnitsDetected Voiced: VoiceSet: GenericVoice WithFacingSpriteBody: From a40133331652f5e381115f30571c152fde8c9e75 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 21 Jun 2015 13:40:25 +0100 Subject: [PATCH 3/3] Fix Monster Tank Madness. --- mods/ra/maps/monster-tank-madness/map.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index e196f57b93..34d121e29a 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2119,17 +2119,14 @@ Rules: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false - -AnnounceOnSeen: ^Vehicle: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false - -AnnounceOnSeen: ^Tank: Tooltip: GenericVisibility: Enemy ShowOwnerRow: false - -AnnounceOnSeen: ^Ship: Tooltip: GenericVisibility: Enemy