diff -ur /tmp/rao/missions.yaml rao/missions.yaml --- /tmp/rao/missions.yaml 2017-01-23 07:32:10.000000000 +0100 +++ rao/missions.yaml 2017-02-04 16:46:52.609473812 +0100 @@ -1,18 +1,18 @@ Allied Campaign: - ./mods/rao/maps/allies-01 - ./mods/rao/maps/allies-02 - ./mods/rao/maps/allies-03a - ./mods/rao/maps/allies-03b - ./mods/rao/maps/allies-04 - ./mods/rao/maps/allies-05a + rao|maps/allies-01 + rao|maps/allies-02 + rao|maps/allies-03a + rao|maps/allies-03b + rao|maps/allies-04 + rao|maps/allies-05a Soviet Campaign: - ./mods/rao/maps/soviet-01 - ./mods/rao/maps/soviet-02a - ./mods/rao/maps/soviet-02b - ./mods/rao/maps/soviet-03 - ./mods/rao/maps/soviet-04a - ./mods/rao/maps/soviet-04b - ./mods/rao/maps/soviet-05 - ./mods/rao/maps/soviet-06a - ./mods/rao/maps/soviet-06b - ./mods/rao/maps/soviet-07 + rao|maps/soviet-01 + rao|maps/soviet-02a + rao|maps/soviet-02b + rao|maps/soviet-03 + rao|maps/soviet-04a + rao|maps/soviet-04b + rao|maps/soviet-05 + rao|maps/soviet-06a + rao|maps/soviet-06b + rao|maps/soviet-07 diff -ur /tmp/rao/mod.yaml rao/mod.yaml --- /tmp/rao/mod.yaml 2017-01-26 10:06:44.000000000 +0100 +++ rao/mod.yaml 2017-02-04 16:43:39.333645328 +0100 @@ -15,6 +15,7 @@ . $ra: ra $cnc: cnc + $rao: rao ./mods/common: common ~main.mix ~conquer.mix @@ -32,157 +33,156 @@ ~expand2.mix ~hires1.mix ~desert.mix - ./mods/rao/bits - ./mods/rao/bits/desert - ./mods/rao/uibits - ./mods/rao/overhaul/z_new_graphics_and_sounds.mix - $rao: rao + rao|bits + rao|bits/desert + rao|uibits + rao|overhaul/z_new_graphics_and_sounds.mix MapFolders: ./mods/ra/maps: System ~^maps/ra/release-20161019: User Rules: - ./mods/rao/rules/misc.yaml - ./mods/rao/rules/ai.yaml - ./mods/rao/rules/player.yaml - ./mods/rao/rules/palettes.yaml - ./mods/rao/rules/world.yaml - ./mods/rao/rules/defaults.yaml - ./mods/rao/rules/vehicles.yaml - ./mods/rao/rules/husks.yaml - ./mods/rao/rules/structures.yaml - ./mods/rao/rules/infantry.yaml - ./mods/rao/rules/civilian.yaml - ./mods/rao/rules/decoration.yaml - ./mods/rao/rules/aircraft.yaml - ./mods/rao/rules/ships.yaml - ./mods/rao/rules/fakes.yaml - ./mods/rao/overhaul/(mod-rules).yaml - ./mods/rao/overhaul/_other_changes_rules.yaml - ./mods/rao/overhaul/_other_changes_rules_buildingrework.yaml - ./mods/rao/overhaul/_other_changes_rules_buildingrework-units.yaml - ./mods/rao/overhaul/_other_changes_rules_civbuildings.yaml - ./mods/rao/overhaul/ships.yaml - ./mods/rao/overhaul/structures.yaml - ./mods/rao/overhaul/newfaction_structures.yaml - ./mods/rao/overhaul/newfaction_misc.yaml - ./mods/rao/overhaul/newfaction_aircraft.yaml - ./mods/rao/overhaul/newfaction_vehicles.yaml - ./mods/rao/overhaul/newfaction_ships.yaml - ./mods/rao/overhaul/newfaction_infantry.yaml - ./mods/rao/overhaul/_other_changes_ai.yaml - ./mods/rao/weather.yaml + rao|rules/misc.yaml + rao|rules/ai.yaml + rao|rules/player.yaml + rao|rules/palettes.yaml + rao|rules/world.yaml + rao|rules/defaults.yaml + rao|rules/vehicles.yaml + rao|rules/husks.yaml + rao|rules/structures.yaml + rao|rules/infantry.yaml + rao|rules/civilian.yaml + rao|rules/decoration.yaml + rao|rules/aircraft.yaml + rao|rules/ships.yaml + rao|rules/fakes.yaml + rao|overhaul/(mod-rules).yaml + rao|overhaul/_other_changes_rules.yaml + rao|overhaul/_other_changes_rules_buildingrework.yaml + rao|overhaul/_other_changes_rules_buildingrework-units.yaml + rao|overhaul/_other_changes_rules_civbuildings.yaml + rao|overhaul/ships.yaml + rao|overhaul/structures.yaml + rao|overhaul/newfaction_structures.yaml + rao|overhaul/newfaction_misc.yaml + rao|overhaul/newfaction_aircraft.yaml + rao|overhaul/newfaction_vehicles.yaml + rao|overhaul/newfaction_ships.yaml + rao|overhaul/newfaction_infantry.yaml + rao|overhaul/_other_changes_ai.yaml + rao|weather.yaml Sequences: - ./mods/rao/sequences/ships.yaml - ./mods/rao/sequences/vehicles.yaml - ./mods/rao/sequences/structures.yaml - ./mods/rao/sequences/infantry.yaml - ./mods/rao/sequences/aircraft.yaml - ./mods/rao/sequences/misc.yaml - ./mods/rao/sequences/decorations.yaml - ./mods/rao/overhaul/_other_changes_sequences.yaml - ./mods/rao/overhaul/_other_changes_sequences_buildingrework.yaml - ./mods/rao/overhaul/_other_changes_sequences_buildingrework-units.yaml - ./mods/rao/overhaul/newfaction_sequences-structures.yaml - ./mods/rao/overhaul/newfaction_sequences-ships.yaml - ./mods/rao/overhaul/newfaction_sequences-infantry.yaml - ./mods/rao/overhaul/newfaction_sequences-aircraft.yaml - ./mods/rao/overhaul/newfaction_sequences-vehicles.yaml - ./mods/rao/overhaul/newfaction_sequences-misc.yaml + rao|sequences/ships.yaml + rao|sequences/vehicles.yaml + rao|sequences/structures.yaml + rao|sequences/infantry.yaml + rao|sequences/aircraft.yaml + rao|sequences/misc.yaml + rao|sequences/decorations.yaml + rao|overhaul/_other_changes_sequences.yaml + rao|overhaul/_other_changes_sequences_buildingrework.yaml + rao|overhaul/_other_changes_sequences_buildingrework-units.yaml + rao|overhaul/newfaction_sequences-structures.yaml + rao|overhaul/newfaction_sequences-ships.yaml + rao|overhaul/newfaction_sequences-infantry.yaml + rao|overhaul/newfaction_sequences-aircraft.yaml + rao|overhaul/newfaction_sequences-vehicles.yaml + rao|overhaul/newfaction_sequences-misc.yaml TileSets: - ./mods/rao/tilesets/snow.yaml - ./mods/rao/tilesets/interior.yaml - ./mods/rao/tilesets/temperat.yaml - ./mods/rao/tilesets/desert.yaml + rao|tilesets/snow.yaml + rao|tilesets/interior.yaml + rao|tilesets/temperat.yaml + rao|tilesets/desert.yaml Cursors: - ./mods/rao/cursors.yaml + rao|cursors.yaml Chrome: - ./mods/rao/chrome.yaml - ./mods/rao/overhaul/(mod-chrome).yaml + rao|chrome.yaml + rao|overhaul/(mod-chrome).yaml Assemblies: ./mods/common/OpenRA.Mods.Common.dll - ./mods/rao/OpenRA.Mods.RA.dll + rao|OpenRA.Mods.RA.dll ./mods/cnc/OpenRA.Mods.Cnc.dll ChromeLayout: - ./mods/rao/chrome/ingame.yaml - ./mods/rao/chrome/ingame-chat.yaml - ./mods/rao/chrome/ingame-fmvplayer.yaml - ./mods/rao/chrome/ingame-info.yaml - ./mods/rao/chrome/ingame-infoscripterror.yaml - ./mods/rao/chrome/ingame-infobriefing.yaml - ./mods/rao/chrome/ingame-infoobjectives.yaml - ./mods/rao/chrome/ingame-infostats.yaml - ./mods/rao/chrome/ingame-menu.yaml - ./mods/rao/chrome/ingame-observer.yaml - ./mods/rao/chrome/ingame-observerstats.yaml - ./mods/rao/chrome/ingame-player.yaml - ./mods/rao/chrome/ingame-perf.yaml - ./mods/rao/chrome/ingame-debug.yaml - # ./mods/rao/chrome/mainmenu.yaml - ./mods/rao/chrome/settings.yaml - ./mods/rao/chrome/credits.yaml - ./mods/rao/chrome/lobby.yaml - ./mods/rao/chrome/lobby-mappreview.yaml - # ./mods/rao/chrome/lobby-players.yaml - ./mods/rao/chrome/lobby-options.yaml - ./mods/rao/chrome/lobby-music.yaml - ./mods/rao/chrome/lobby-kickdialogs.yaml - ./mods/rao/chrome/lobby-globalchat.yaml - ./mods/rao/chrome/color-picker.yaml - ./mods/rao/chrome/map-chooser.yaml - ./mods/rao/chrome/multiplayer.yaml - ./mods/rao/chrome/multiplayer-browser.yaml - ./mods/rao/chrome/multiplayer-createserver.yaml - ./mods/rao/chrome/multiplayer-directconnect.yaml - ./mods/rao/chrome/multiplayer-globalchat.yaml - ./mods/rao/chrome/connection.yaml - ./mods/rao/chrome/replaybrowser.yaml - ./mods/rao/chrome/dropdowns.yaml - ./mods/rao/chrome/musicplayer.yaml - ./mods/rao/chrome/tooltips.yaml - ./mods/rao/chrome/assetbrowser.yaml - ./mods/rao/chrome/missionbrowser.yaml - ./mods/rao/chrome/confirmation-dialogs.yaml - ./mods/rao/chrome/editor.yaml - ./mods/rao/overhaul/(mod-chromelayout)_lobby-players_replacement.yaml - ./mods/rao/overhaul/(mod-chromelayout)_mainmenu_replacement.yaml + rao|chrome/ingame.yaml + rao|chrome/ingame-chat.yaml + rao|chrome/ingame-fmvplayer.yaml + rao|chrome/ingame-info.yaml + rao|chrome/ingame-infoscripterror.yaml + rao|chrome/ingame-infobriefing.yaml + rao|chrome/ingame-infoobjectives.yaml + rao|chrome/ingame-infostats.yaml + rao|chrome/ingame-menu.yaml + rao|chrome/ingame-observer.yaml + rao|chrome/ingame-observerstats.yaml + rao|chrome/ingame-player.yaml + rao|chrome/ingame-perf.yaml + rao|chrome/ingame-debug.yaml + # rao|chrome/mainmenu.yaml + rao|chrome/settings.yaml + rao|chrome/credits.yaml + rao|chrome/lobby.yaml + rao|chrome/lobby-mappreview.yaml + # rao|chrome/lobby-players.yaml + rao|chrome/lobby-options.yaml + rao|chrome/lobby-music.yaml + rao|chrome/lobby-kickdialogs.yaml + rao|chrome/lobby-globalchat.yaml + rao|chrome/color-picker.yaml + rao|chrome/map-chooser.yaml + rao|chrome/multiplayer.yaml + rao|chrome/multiplayer-browser.yaml + rao|chrome/multiplayer-createserver.yaml + rao|chrome/multiplayer-directconnect.yaml + rao|chrome/multiplayer-globalchat.yaml + rao|chrome/connection.yaml + rao|chrome/replaybrowser.yaml + rao|chrome/dropdowns.yaml + rao|chrome/musicplayer.yaml + rao|chrome/tooltips.yaml + rao|chrome/assetbrowser.yaml + rao|chrome/missionbrowser.yaml + rao|chrome/confirmation-dialogs.yaml + rao|chrome/editor.yaml + rao|overhaul/(mod-chromelayout)_lobby-players_replacement.yaml + rao|overhaul/(mod-chromelayout)_mainmenu_replacement.yaml Weapons: - ./mods/rao/weapons/explosions.yaml - ./mods/rao/weapons/largecaliber.yaml - ./mods/rao/weapons/missiles.yaml - ./mods/rao/weapons/other.yaml - ./mods/rao/weapons/smallcaliber.yaml - ./mods/rao/weapons/superweapons.yaml - ./mods/rao/overhaul/_other_changes_weapons.yaml - ./mods/rao/overhaul/missiles.yaml - ./mods/rao/overhaul/largecaliber.yaml - ./mods/rao/overhaul/other.yaml - ./mods/rao/overhaul/newfaction_largecaliber.yaml - ./mods/rao/overhaul/newfaction_weapons.yaml + rao|weapons/explosions.yaml + rao|weapons/largecaliber.yaml + rao|weapons/missiles.yaml + rao|weapons/other.yaml + rao|weapons/smallcaliber.yaml + rao|weapons/superweapons.yaml + rao|overhaul/_other_changes_weapons.yaml + rao|overhaul/missiles.yaml + rao|overhaul/largecaliber.yaml + rao|overhaul/other.yaml + rao|overhaul/newfaction_largecaliber.yaml + rao|overhaul/newfaction_weapons.yaml Voices: - ./mods/rao/audio/voices.yaml - ./mods/rao/overhaul/(mod-voices).yaml + rao|audio/voices.yaml + rao|overhaul/(mod-voices).yaml Notifications: - ./mods/rao/audio/notifications.yaml + rao|audio/notifications.yaml Music: - ./mods/rao/audio/music.yaml + rao|audio/music.yaml Translations: - ./mods/rao/languages/english.yaml + rao|languages/english.yaml LoadScreen: LogoStripeLoadScreen - Image: ./mods/rao/uibits/loadscreen.png + Image: rao|uibits/loadscreen.png Text: Filling Crates..., Charging Capacitors..., Reticulating Splines..., Planting Trees..., Building Bridges..., Aging Empires..., Compiling EVA..., Constructing Pylons..., Activating Skynet..., Splitting Atoms... ServerTraits: @@ -193,8 +193,8 @@ ChromeMetrics: ./mods/common/metrics.yaml - ./mods/rao/metrics.yaml - ./mods/rao/overhaul/(mod-chromemetrics).yaml + rao|metrics.yaml + rao|overhaul/(mod-chromemetrics).yaml Fonts: Regular: @@ -204,7 +204,7 @@ Font: ./mods/common/FreeSansBold.ttf Size:14 Title: - Font: ./mods/rao/ZoodRangmah.ttf + Font: rao|ZoodRangmah.ttf Size:48 MediumBold: Font: ./mods/common/FreeSansBold.ttf @@ -223,7 +223,7 @@ Size:10 Missions: - ./mods/rao/missions.yaml + rao|missions.yaml MapGrid: TileSize: 24,24 @@ -303,12 +303,12 @@ TestFiles: ^Content/ra/v2/expand/await.aud, ^Content/ra/v2/expand/bog.aud, ^Content/ra/v2/expand/float_v2.aud, ^Content/ra/v2/expand/gloom.aud, ^Content/ra/v2/expand/grndwire.aud, ^Content/ra/v2/expand/rpt.aud, ^Content/ra/v2/expand/search.aud, ^Content/ra/v2/expand/traction.aud, ^Content/ra/v2/expand/wastelnd.aud Sources: aftermath, aftermath-linux, ra-origin Downloads: - ./mods/rao/installer/downloads.yaml + rao|installer/downloads.yaml Sources: - ./mods/rao/installer/aftermath.yaml - ./mods/rao/installer/allies95.yaml - ./mods/rao/installer/cnc95.yaml - ./mods/rao/installer/counterstrike.yaml - ./mods/rao/installer/firstdecade.yaml - ./mods/rao/installer/origin.yaml - ./mods/rao/installer/soviet95.yaml + rao|installer/aftermath.yaml + rao|installer/allies95.yaml + rao|installer/cnc95.yaml + rao|installer/counterstrike.yaml + rao|installer/firstdecade.yaml + rao|installer/origin.yaml + rao|installer/soviet95.yaml diff -ur /tmp/rao/overhaul/(mod-chrome).yaml rao/overhaul/(mod-chrome).yaml --- /tmp/rao/overhaul/(mod-chrome).yaml 2017-01-23 10:12:14.000000000 +0100 +++ rao/overhaul/(mod-chrome).yaml 2017-02-04 17:56:55.108720376 +0100 @@ -1,2 +1,2 @@ -flags: ./mods/rao/overhaul/buttons_with_uzbekistan.png - uzbekistan: 60,157,30,15 +flags: rao|overhaul/buttons_with_uzbekistan.png + uzbekistan: 60,157,30,15