From 03236927e54dc7e5b7b913497f85daebaa76ca12 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 10 Dec 2016 18:13:54 +0000 Subject: [PATCH] Replace TD shellmap with a fixed background. --- OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj | 1 - .../Widgets/Logic/CncMainMenuLogic.cs | 29 - mods/cnc/chrome/mainmenu.yaml | 25 +- mods/cnc/maps/blank-shellmap/map.bin | Bin 0 -> 142 bytes mods/cnc/maps/blank-shellmap/map.png | Bin 0 -> 147 bytes mods/cnc/maps/blank-shellmap/map.yaml | 35 + mods/cnc/maps/shellmap/map.bin | Bin 23057 -> 0 bytes mods/cnc/maps/shellmap/map.png | Bin 1018 -> 0 bytes mods/cnc/maps/shellmap/map.yaml | 961 ------------------ mods/cnc/maps/shellmap/rules.yaml | 19 - mods/cnc/maps/shellmap/shellmap.lua | 30 - 11 files changed, 36 insertions(+), 1064 deletions(-) delete mode 100644 OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs create mode 100644 mods/cnc/maps/blank-shellmap/map.bin create mode 100644 mods/cnc/maps/blank-shellmap/map.png create mode 100644 mods/cnc/maps/blank-shellmap/map.yaml delete mode 100644 mods/cnc/maps/shellmap/map.bin delete mode 100644 mods/cnc/maps/shellmap/map.png delete mode 100644 mods/cnc/maps/shellmap/map.yaml delete mode 100644 mods/cnc/maps/shellmap/rules.yaml delete mode 100644 mods/cnc/maps/shellmap/shellmap.lua diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index a4e7d02fea..6d004f6c4f 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -72,7 +72,6 @@ - diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs deleted file mode 100644 index 5821754de8..0000000000 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs +++ /dev/null @@ -1,29 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2016 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. For more - * information, see COPYING. - */ -#endregion - -using OpenRA.Mods.Common.Widgets; -using OpenRA.Mods.Common.Widgets.Logic; -using OpenRA.Widgets; - -namespace OpenRA.Mods.Cnc.Widgets.Logic -{ - public class CncMainMenuLogic : MainMenuLogic - { - [ObjectCreator.UseCtor] - public CncMainMenuLogic(Widget widget, World world, ModData modData) - : base(widget, world, modData) - { - var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS"); - shellmapDecorations.IsVisible = () => menuType != MenuType.None; - shellmapDecorations.Get("RECBLOCK").IsVisible = () => world.WorldTick / 25 % 2 == 0; - } - } -} diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 6c646725b3..e4e32ad134 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -1,36 +1,13 @@ Container@MENU_BACKGROUND: Width: WINDOW_RIGHT Height: WINDOW_BOTTOM - Logic: CncMainMenuLogic + Logic: MainMenuLogic Children: Container@MUSICBUTTONS: Logic: MusicControllerLogic Children: LogicKeyListener@MUSICCONTROLLER_KEYHANDLER: Container@SHELLMAP_DECORATIONS: - Children: - Image@RETICLE: - X: (WINDOW_RIGHT-WIDTH)/2 - Y: (WINDOW_BOTTOM-HEIGHT)/2 - Width: 512 - Height: 512 - ImageCollection: shellmap - ImageName: reticle - Label@REC: - X: (WINDOW_RIGHT-512)/2+10 - Y: (WINDOW_BOTTOM+512)/2-28 - Height: 18 - Font: Bold - Text: REC - Image@RECBLOCK: - X: (WINDOW_RIGHT-512)/2+40 - Y: (WINDOW_BOTTOM+512)/2-25 - Width: 16 - Height: 16 - ImageCollection: shellmapbits - ImageName: record - Container@SHELLMAP_DISABLED_DECORATIONS: - Visible: false Children: Image@NOD: X: WINDOW_RIGHT/2-384 diff --git a/mods/cnc/maps/blank-shellmap/map.bin b/mods/cnc/maps/blank-shellmap/map.bin new file mode 100644 index 0000000000000000000000000000000000000000..8d718ac90aaaf2b79880b9295a75ca64ffbaa129 GIT binary patch literal 142 vcmZQ#Wng6xWPpGeAoU*$;`-0PgCx%SpMeF8Ad30HQk+N%poTzAC4m9}`+ymo literal 0 HcmV?d00001 diff --git a/mods/cnc/maps/blank-shellmap/map.png b/mods/cnc/maps/blank-shellmap/map.png new file mode 100644 index 0000000000000000000000000000000000000000..d866c8c7b8d9eb90087fb377226b737eaa5473b9 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP(skt o#W93qW^zV%`CtCSJQkJ=rK!S2(y!hr03{hbUHx3vIVCg!0NczXhX4Qo literal 0 HcmV?d00001 diff --git a/mods/cnc/maps/blank-shellmap/map.yaml b/mods/cnc/maps/blank-shellmap/map.yaml new file mode 100644 index 0000000000..f7b2177266 --- /dev/null +++ b/mods/cnc/maps/blank-shellmap/map.yaml @@ -0,0 +1,35 @@ +MapFormat: 11 + +RequiresMod: cnc + +Title: Blank Shellmap + +Author: Paul Chote + +Tileset: DESERT + +MapSize: 5,5 + +Bounds: 1,1,1,1 + +Visibility: Shellmap + +Categories: Shellmap + +Players: + PlayerReference@Neutral: + Name: Neutral + OwnsWorld: True + NonCombatant: True + Faction: Random + +Actors: + +Rules: + World: + -SpawnMPUnits: + -MPStartLocations: + -CrateSpawner: + MusicPlaylist: + BackgroundMusic: map1 + DisableWorldSounds: true \ No newline at end of file diff --git a/mods/cnc/maps/shellmap/map.bin b/mods/cnc/maps/shellmap/map.bin deleted file mode 100644 index 91476e7ec0e577152a653a6defbba550578d5ddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23057 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 W!{XnC1{NAvXkej%g$CxQfxiH$4p|5Q diff --git a/mods/cnc/maps/shellmap/map.png b/mods/cnc/maps/shellmap/map.png deleted file mode 100644 index 0fd2bf9949def2e0aad11490e94fc170612b1388..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1018 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1CL2WK~!i%?V8PT z6fqQpHxM5Kl1(eQx$push4uM0qPj2CPAHQwMJ544%R+ofIKA4 z>%n{Qep(|bI0YK|Al?HU7N8!^p<&!lX^HD}tf3GME1}w2h=;xd^}swR>Ls%+cu&+) zC|WP!`V{1>0Nr4Xnzm$m%>dIL4%Vfb_u3@D9<+xWCeW=FVCp{wdi;9*He59@Mfcl0 zz_cDD^8j;d^7G5fc;7Rkm0_>Q=z0M(y|SPT#cA!&Xs{1xS%dj-h7O8dD# zfG34PHU;P;eIjkH&;-XvJi<6nX}>A|AO`4x)u^rWfQY_=TIWIb3J=h$@7WR_7y{Ho zE9n!=HLRz3j2VkN*l@zR>Tpbv(J`=oP* z08>~_T3n(hKppRmdgMEgV+K0q@lp!Q$2~B>QixOdnx&*Y61oQ7X9oz9xQ9}JN-~%Z za|HC?9AKJU0u7`P)f{k5=~H@d(hKYi0j7ziFr*q9U?TP18+s%@zxh|W6bw*PX&$70 zN1=YTzIlL&l9@-qy&oE2ntKFR3y_W2OvheN>$En7ui;p69j~ru%{8rPpJf5Q{CE!< zdyU*S#LqT0&`Rp}U#&)iw-((0>;UH+K-czsNObSji+F26{SN^S25(KY8S7db>&eIz zw?3(_)^u*TPrcUWwx9aZd*b6uY(^kT^)1+QuU;zN>H(fiat64NGr)zM0WRbWa3N=a z3poQ^$iDz@zZCl92s{35hcs*%)>FGgj((9aRLj8h&@U?`DzkUB*fGcXgC^j=a z`>Ez#f2nhhj2icF+qa}4UK_R2LvhX6C+NIBe3g6p@Nrm-EAIis`e${{bFtQ4uYEWs zUiYhN*b_DGThpW(>$oQGs$q@yI!^WOKPJGKo7jsr_FdcitN