diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 5e6e53879d..688b0680f2 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -2144,10 +2144,20 @@ namespace OpenRA.Mods.Common.UtilityCommands { // Rename WithMuzzleFlash to WithMuzzleOverlay if (depth == 1 && node.Key.StartsWith("WithMuzzleFlash")) - node.Key = node.Key.Replace("WithMuzzleFlash", "WithMuzzleOverlay"); + { + var parts = node.Key.Split('@'); + node.Key = "WithMuzzleOverlay"; + if (parts.Length > 1) + node.Key += "@" + parts[1]; + } if (depth == 1 && node.Key.StartsWith("-WithMuzzleFlash")) - node.Key = node.Key.Replace("-WithMuzzleFlash", "-WithMuzzleOverlay"); + { + var parts = node.Key.Split('@'); + node.Key = "-WithMuzzleOverlay"; + if (parts.Length > 1) + node.Key += "@" + parts[1]; + } } // WithSiloAnimation received own Sequence property, idle sequence is only 1 frame long now diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml index 0dd8b17973..6d063c43ea 100644 --- a/mods/cnc/cursors.yaml +++ b/mods/cnc/cursors.yaml @@ -87,7 +87,6 @@ Cursors: Start: 136 joystick-tl-blocked: Start: 137 - # Cursors that need minimap variants deploy: Start: 53 @@ -150,7 +149,6 @@ Cursors: move-blocked-minimap: Start: 25 Length: 1 - mouse5.shp: cursor guard: Start: 0 @@ -158,7 +156,6 @@ Cursors: guard-minimap: Start: 8 Length: 8 - mouse6.shp: cursor goldwrench: Start: 0 @@ -190,7 +187,6 @@ Cursors: enter-blocked-minimap: Start: 17 Length: 1 - mouse7.shp: cursor attackoutsiderange: Start: 0 diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml index ec3f9b7abe..85076aeb0d 100644 --- a/mods/cnc/maps/cnc64gdi01/map.yaml +++ b/mods/cnc/maps/cnc64gdi01/map.yaml @@ -839,6 +839,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml index acf4948235..7e27010cf3 100644 --- a/mods/cnc/maps/funpark01/map.yaml +++ b/mods/cnc/maps/funpark01/map.yaml @@ -532,6 +532,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index b59a8322f0..af588faf74 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -557,6 +557,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index bca4a37666..5fcfcb7c84 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -785,6 +785,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 8e942fee38..644b86f523 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -850,6 +850,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index c44a639607..ab4fff85e4 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -538,6 +538,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index f04db7258a..c08a680261 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -612,6 +612,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 3860eb6c61..51dbf068ac 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -844,6 +844,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml index 191f56c0c3..e3f02f783f 100644 --- a/mods/cnc/maps/gdi05a/map.yaml +++ b/mods/cnc/maps/gdi05a/map.yaml @@ -947,6 +947,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml index bd3f42f74a..cdce475c7d 100644 --- a/mods/cnc/maps/gdi05b/map.yaml +++ b/mods/cnc/maps/gdi05b/map.yaml @@ -780,6 +780,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 6590f58336..e61626d083 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -342,6 +342,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml index 6ca8a6161a..51b2d150b7 100644 --- a/mods/cnc/maps/nod02a/map.yaml +++ b/mods/cnc/maps/nod02a/map.yaml @@ -358,6 +358,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml index 73ce9dd527..af959340ff 100644 --- a/mods/cnc/maps/nod02b/map.yaml +++ b/mods/cnc/maps/nod02b/map.yaml @@ -400,6 +400,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 8aafa2c4eb..d8c2bb1ea7 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -568,6 +568,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 692986b93d..e3a1a22f11 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -612,6 +612,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml index 61a5c3c3dc..507b330c24 100644 --- a/mods/cnc/maps/nod04a/map.yaml +++ b/mods/cnc/maps/nod04a/map.yaml @@ -700,6 +700,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index d3d811be25..39fc9046ee 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/mods/cnc/maps/nod04b/map.yaml @@ -560,6 +560,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml index 7c202a329f..874e4b45e8 100644 --- a/mods/cnc/maps/nod05/map.yaml +++ b/mods/cnc/maps/nod05/map.yaml @@ -521,6 +521,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml index 8f27e1ab12..ab12b29d6c 100644 --- a/mods/cnc/maps/nod06a/map.yaml +++ b/mods/cnc/maps/nod06a/map.yaml @@ -727,6 +727,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml index 04a471d6e5..3470eac537 100644 --- a/mods/cnc/maps/nod06b/map.yaml +++ b/mods/cnc/maps/nod06b/map.yaml @@ -665,6 +665,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml index 91832caf9e..194d9d52d6 100644 --- a/mods/cnc/maps/nod06c/map.yaml +++ b/mods/cnc/maps/nod06c/map.yaml @@ -636,6 +636,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index acf5eb080e..695c379821 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/mods/cnc/maps/shellmap/map.yaml @@ -1011,6 +1011,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index c7dd149d35..619827bd0e 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/mods/cnc/maps/the-hot-box/map.yaml @@ -251,6 +251,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index eccf635409..4051884d12 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -154,3 +154,4 @@ EditorWorld: Inherits: ^BaseWorld EditorActorLayer: EditorResourceLayer: + diff --git a/mods/cnc/tilesets/desert.yaml b/mods/cnc/tilesets/desert.yaml index 749bfdde62..51155646a9 100644 --- a/mods/cnc/tilesets/desert.yaml +++ b/mods/cnc/tilesets/desert.yaml @@ -2148,3 +2148,4 @@ Templates: 3: Clear 4: Clear 5: Clear + diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml index 3ab9966ef1..d793b1cb39 100644 --- a/mods/d2k/cursors.yaml +++ b/mods/d2k/cursors.yaml @@ -243,7 +243,6 @@ Cursors: Start: 236 X: 24 Y: 24 - # Cursors that need minimap variants deploy: Start: 96 diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index bf687a2639..63a2d5364b 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/mods/d2k/maps/atreides-01a/map.yaml @@ -175,6 +175,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index 320b164de4..45f0e363a5 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/mods/d2k/maps/atreides-01b/map.yaml @@ -174,6 +174,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml index aea0a8b2db..c523f5da51 100644 --- a/mods/d2k/maps/atreides-02a/map.yaml +++ b/mods/d2k/maps/atreides-02a/map.yaml @@ -232,6 +232,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml index 1debf9dcd3..94259547d8 100644 --- a/mods/d2k/maps/atreides-02b/map.yaml +++ b/mods/d2k/maps/atreides-02b/map.yaml @@ -207,6 +207,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/mount-idaho/map.yaml b/mods/d2k/maps/mount-idaho/map.yaml index adcc2007a3..5ca57c10d9 100644 --- a/mods/d2k/maps/mount-idaho/map.yaml +++ b/mods/d2k/maps/mount-idaho/map.yaml @@ -102,6 +102,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/oasis-conquest/map.yaml b/mods/d2k/maps/oasis-conquest/map.yaml index 1193681df4..5d523b9b6e 100644 --- a/mods/d2k/maps/oasis-conquest/map.yaml +++ b/mods/d2k/maps/oasis-conquest/map.yaml @@ -169,6 +169,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/pasty-mesa/map.yaml b/mods/d2k/maps/pasty-mesa/map.yaml index 991fd4985b..9cc1a02d55 100644 --- a/mods/d2k/maps/pasty-mesa/map.yaml +++ b/mods/d2k/maps/pasty-mesa/map.yaml @@ -99,6 +99,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index 71b5f9daf7..070f8076fe 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/mods/d2k/maps/shellmap/map.yaml @@ -137,6 +137,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index 989c5ddc26..a3eacff199 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -148,3 +148,4 @@ EditorWorld: Inherits: ^BaseWorld EditorActorLayer: D2kEditorResourceLayer: + diff --git a/mods/d2k/weapons/debris.yaml b/mods/d2k/weapons/debris.yaml index 48e5555747..cb22b55689 100644 --- a/mods/d2k/weapons/debris.yaml +++ b/mods/d2k/weapons/debris.yaml @@ -130,3 +130,4 @@ Debris4: Warhead@3Eff: CreateEffect Explosion: large_explosion ImpactSound: EXPLLG5.WAV + diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml index cc13e81cca..676792ba41 100644 --- a/mods/ra/cursors.yaml +++ b/mods/ra/cursors.yaml @@ -142,7 +142,6 @@ Cursors: Start: 130 joystick-tl-blocked: Start: 131 - # Cursors that need minimap variants deploy: Start: 59 @@ -180,7 +179,6 @@ Cursors: sell2: Start: 148 Length: 12 - nopower.shp: cursor powerdown-blocked: Start: 0 @@ -188,7 +186,6 @@ Cursors: powerdown: Start: 1 Length: 3 - attackmove.shp: cursor attackmove: Start: 0 diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index d2f33693c1..75c5a36385 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -576,6 +576,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index b3f09c81b5..cfe41089d2 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -32,8 +32,8 @@ Options: FragileAlliances: False StartingCash: 5700 ConfigurableStartingUnits: False - ShortGame: False Difficulties: Easy, Normal, Hard, Real tough guy + ShortGame: False Players: PlayerReference@USSR: @@ -842,6 +842,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index dfa8419897..cd9aec7d2e 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -1553,6 +1553,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index cd3b107a27..222bf37a31 100644 --- a/mods/ra/maps/allies-03b/map.yaml +++ b/mods/ra/maps/allies-03b/map.yaml @@ -1439,6 +1439,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index bdf6fd8111..d85d95c437 100644 --- a/mods/ra/maps/allies-05a/map.yaml +++ b/mods/ra/maps/allies-05a/map.yaml @@ -1839,6 +1839,8 @@ Weapons: Voices: +Music: + Notifications: Sounds: Notifications: diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 74abc0d507..6322c33296 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -973,6 +973,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/burlesca/map.yaml b/mods/ra/maps/burlesca/map.yaml index 549f558b23..860cd7c755 100644 --- a/mods/ra/maps/burlesca/map.yaml +++ b/mods/ra/maps/burlesca/map.yaml @@ -226,6 +226,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/center-of-attention-redux-2/map.yaml b/mods/ra/maps/center-of-attention-redux-2/map.yaml index 1218c71539..cae793b867 100644 --- a/mods/ra/maps/center-of-attention-redux-2/map.yaml +++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml @@ -908,6 +908,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index 799075da85..6ba003c0fe 100644 --- a/mods/ra/maps/desert-shellmap/map.yaml +++ b/mods/ra/maps/desert-shellmap/map.yaml @@ -1361,6 +1361,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 6bdc27f52a..0bf962bce0 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -368,6 +368,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index b6dd90a5ab..1dbd7a0eab 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -325,6 +325,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 5e9147b045..69ccd69d3f 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -263,6 +263,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 4544cc283a..f0d4933d17 100644 --- a/mods/ra/maps/fort-lonestar/map.yaml +++ b/mods/ra/maps/fort-lonestar/map.yaml @@ -20,10 +20,6 @@ Type: Minigame Videos: -Music: - rain: Rain (ambient) - Hidden: true - Options: Fog: True Shroud: True @@ -1004,6 +1000,10 @@ Weapons: Voices: +Music: + rain: Rain (ambient) + Hidden: true + Notifications: Translations: diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index dceee72b0e..a3a9de9f93 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -2410,6 +2410,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/koth-hopes-anchor/map.yaml b/mods/ra/maps/koth-hopes-anchor/map.yaml index 6077337b0d..3c7847cfeb 100644 --- a/mods/ra/maps/koth-hopes-anchor/map.yaml +++ b/mods/ra/maps/koth-hopes-anchor/map.yaml @@ -661,6 +661,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 025ffdd13b..62180cae31 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2407,6 +2407,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/poland-raid/map.yaml b/mods/ra/maps/poland-raid/map.yaml index 568bfa226b..709f3480a6 100644 --- a/mods/ra/maps/poland-raid/map.yaml +++ b/mods/ra/maps/poland-raid/map.yaml @@ -802,6 +802,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/snow town/map.yaml b/mods/ra/maps/snow town/map.yaml index 5fd4fca9f1..f9a4cd6311 100644 --- a/mods/ra/maps/snow town/map.yaml +++ b/mods/ra/maps/snow town/map.yaml @@ -671,9 +671,9 @@ Rules: PaticleSize: 1, 3 ScatterDirection: -1, 1 Gravity: 1.00, 2.00 - SwingOffset: 1.0, 1.5 - SwingSpeed: 0.001, 0.025 - SwingAmplitude: 1.0, 1.5 + SwingOffset: 1.0, 1.5 + SwingSpeed: 0.001, 0.025 + SwingAmplitude: 1.0, 1.5 ParticleColors: 255,236,236,236, 255,228,228,228, 255,208,208,208, 255,188,188,188 LineTailAlphaValue: 0 GlobalLightingPaletteEffect: @@ -690,6 +690,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index c12e34c9e2..12dabd5d35 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -680,6 +680,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-02a/map.yaml b/mods/ra/maps/soviet-02a/map.yaml index fb7804daa5..73d644fc6d 100644 --- a/mods/ra/maps/soviet-02a/map.yaml +++ b/mods/ra/maps/soviet-02a/map.yaml @@ -708,6 +708,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index 754368ad8b..7da8574899 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -676,6 +676,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index 1a10ad4859..6c229132af 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -1296,6 +1296,8 @@ Weapons: Voices: +Music: + Notifications: Sounds: Notifications: diff --git a/mods/ra/maps/soviet-04a/map.yaml b/mods/ra/maps/soviet-04a/map.yaml index 6eaa5394de..1c26c03b29 100644 --- a/mods/ra/maps/soviet-04a/map.yaml +++ b/mods/ra/maps/soviet-04a/map.yaml @@ -755,6 +755,8 @@ Weapons: Voices: +Music: + Notifications: -Translations: \ No newline at end of file +Translations: diff --git a/mods/ra/maps/soviet-04b/map.yaml b/mods/ra/maps/soviet-04b/map.yaml index 8658776214..d99ec33d81 100644 --- a/mods/ra/maps/soviet-04b/map.yaml +++ b/mods/ra/maps/soviet-04b/map.yaml @@ -783,6 +783,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index fe40ba13ce..8ca4a91067 100644 --- a/mods/ra/maps/soviet-05/map.yaml +++ b/mods/ra/maps/soviet-05/map.yaml @@ -741,6 +741,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-06a/map.yaml b/mods/ra/maps/soviet-06a/map.yaml index c7bb4b6ca1..f8e35663ad 100644 --- a/mods/ra/maps/soviet-06a/map.yaml +++ b/mods/ra/maps/soviet-06a/map.yaml @@ -975,6 +975,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-06b/map.yaml b/mods/ra/maps/soviet-06b/map.yaml index 27c0d43e78..60f2ed30dc 100644 --- a/mods/ra/maps/soviet-06b/map.yaml +++ b/mods/ra/maps/soviet-06b/map.yaml @@ -655,6 +655,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 60d2d9f3ee..1118319cde 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -944,6 +944,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index 551f96af77..f109b5f217 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1386,6 +1386,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index eee39055e3..b1adeba78d 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1181,6 +1181,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index abeaeb9b94..34f678adab 100644 --- a/mods/ra/maps/training-camp/map.yaml +++ b/mods/ra/maps/training-camp/map.yaml @@ -1061,6 +1061,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 2cd36b7412..58c6e5e76e 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -173,3 +173,4 @@ EditorWorld: Inherits: ^BaseWorld EditorActorLayer: EditorResourceLayer: + diff --git a/mods/ts/maps/arivruns/map.yaml b/mods/ts/maps/arivruns/map.yaml index 8835d9c724..492c554bb7 100644 --- a/mods/ts/maps/arivruns/map.yaml +++ b/mods/ts/maps/arivruns/map.yaml @@ -1314,6 +1314,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ts/maps/gdi4a/map.yaml b/mods/ts/maps/gdi4a/map.yaml index f3c53a2907..0955b5b034 100644 --- a/mods/ts/maps/gdi4a/map.yaml +++ b/mods/ts/maps/gdi4a/map.yaml @@ -1767,6 +1767,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ts/maps/rivrrad4/map.yaml b/mods/ts/maps/rivrrad4/map.yaml index 6960937394..288b161a66 100644 --- a/mods/ts/maps/rivrrad4/map.yaml +++ b/mods/ts/maps/rivrrad4/map.yaml @@ -889,6 +889,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ts/maps/springs/map.yaml b/mods/ts/maps/springs/map.yaml index 9f2931e281..20a35431a1 100644 --- a/mods/ts/maps/springs/map.yaml +++ b/mods/ts/maps/springs/map.yaml @@ -874,6 +874,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ts/maps/tread_l/map.yaml b/mods/ts/maps/tread_l/map.yaml index 4a6fe1ba1b..3deed037b6 100644 --- a/mods/ts/maps/tread_l/map.yaml +++ b/mods/ts/maps/tread_l/map.yaml @@ -1183,6 +1183,8 @@ Weapons: Voices: +Music: + Notifications: Translations: diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index bfe1196264..713db341a0 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -328,3 +328,4 @@ HUNTER: SelectionDecorations: Palette: pips ActorLostNotification: + diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index fb2e6f0dff..8d7879ad16 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -714,3 +714,4 @@ Inherits: ^TerrainOverlay CustomSelectionSize: CustomBounds: 220,220 + diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index 7aae2b8e49..49ee4e0ec7 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -211,3 +211,4 @@ TUNTOP03: TUNTOP04: Inherits: ^Tunnel + diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 5e7b9e9505..646b9cde12 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -54,7 +54,7 @@ NALASR: Offset: 298,-171,0 AttackTurreted: Armament: - Weapon: LaserFire2 + Weapon: TurretLaserFire RenderVoxels: WithVoxelTurret: Power: @@ -87,7 +87,7 @@ NAOBEL: RevealsShroud: Range: 8c0 Armament: - Weapon: LaserFire + Weapon: ObeliskLaserFire LocalOffset: 1400,200,1250 AttackCharge: ChargeAudio: obelpowr.aud diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index 5b9d61178a..b22861d3cb 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -148,3 +148,4 @@ LPST: UpgradeMinEnabledLevel: 1 Range: 18 RenderDetectionCircle: + diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 66e56be0b2..a1d7e7b726 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -175,3 +175,4 @@ EditorWorld: Inherits: ^BaseWorld EditorActorLayer: EditorResourceLayer: + diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml index 5d64bc5966..d5bfc735e0 100644 --- a/mods/ts/weapons/energyweapons.yaml +++ b/mods/ts/weapons/energyweapons.yaml @@ -124,8 +124,7 @@ Proton: ImpactSound: ssplash3.aud ValidImpactTypes: Water -# Obelisk laser -LaserFire: +ObeliskLaserFire: ReloadDelay: 120 Range: 10c512 Charges: true @@ -137,8 +136,7 @@ LaserFire: Damage: 250 DamageTypes: Prone60Percent, TriggerProne, EnergyDeath -# Laser turret -LaserFire2: +TurretLaserFire: ReloadDelay: 40 Range: 5c512 Report: LASTUR1.AUD diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index 7635d027d7..0b686b3d35 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -65,3 +65,4 @@ LargeDebris: Image: dbrislg Sequences: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Shadow: true + diff --git a/mods/ts/weapons/smallguns.yaml b/mods/ts/weapons/smallguns.yaml index 9d94ce35d0..d2ea7ac716 100644 --- a/mods/ts/weapons/smallguns.yaml +++ b/mods/ts/weapons/smallguns.yaml @@ -275,3 +275,4 @@ Sniper: Heavy: 5 Concrete: 5 DamageTypes: Prone100Percent, TriggerProne, HeadshotDeath +