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 0000000000..8d718ac90a Binary files /dev/null and b/mods/cnc/maps/blank-shellmap/map.bin differ diff --git a/mods/cnc/maps/blank-shellmap/map.png b/mods/cnc/maps/blank-shellmap/map.png new file mode 100644 index 0000000000..d866c8c7b8 Binary files /dev/null and b/mods/cnc/maps/blank-shellmap/map.png differ 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 91476e7ec0..0000000000 Binary files a/mods/cnc/maps/shellmap/map.bin and /dev/null differ diff --git a/mods/cnc/maps/shellmap/map.png b/mods/cnc/maps/shellmap/map.png deleted file mode 100644 index 0fd2bf9949..0000000000 Binary files a/mods/cnc/maps/shellmap/map.png and /dev/null differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml deleted file mode 100644 index 01029aaf48..0000000000 --- a/mods/cnc/maps/shellmap/map.yaml +++ /dev/null @@ -1,961 +0,0 @@ -MapFormat: 11 - -RequiresMod: cnc - -Title: shellmap - -Author: Chris Forbes - -Tileset: WINTER - -MapSize: 96,48 - -Bounds: 8,1,80,45 - -Visibility: Shellmap - -Categories: Shellmap - -Players: - PlayerReference@Nod: - Name: Nod - Faction: nod - Color: FE1100 - Allies: Nod - Enemies: GDI, Creeps - PlayerReference@GDI: - Name: GDI - Faction: gdi - Color: F5D378 - Allies: GDI - Enemies: Nod, Creeps - PlayerReference@Neutral: - Name: Neutral - OwnsWorld: True - NonCombatant: True - Faction: gdi - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: Random - Enemies: Nod, GDI - -Actors: - Actor4: fix - Location: 59,44 - Owner: GDI - Actor5: tran - Location: 60,45 - Owner: GDI - Actor6: cycl - Location: 64,44 - Owner: GDI - Actor7: cycl - Location: 64,43 - Owner: GDI - Actor8: cycl - Location: 63,43 - Owner: GDI - Actor9: cycl - Location: 62,43 - Owner: GDI - Actor10: cycl - Location: 61,43 - Owner: GDI - Actor11: cycl - Location: 60,43 - Owner: GDI - Actor12: cycl - Location: 59,43 - Owner: GDI - Actor13: cycl - Location: 58,43 - Owner: GDI - Actor14: cycl - Location: 57,43 - Owner: GDI - Actor15: cycl - Location: 56,43 - Owner: GDI - Actor16: cycl - Location: 56,44 - Owner: GDI - Actor17: atwr - Location: 55,42 - Owner: GDI - Actor18: nuke - Location: 70,45 - Owner: GDI - Actor19: nuke - Location: 72,45 - Owner: GDI - Actor20: hq - Location: 54,42 - Owner: GDI - Actor21: t07 - Location: 53,42 - Owner: GDI - Actor22: tc01 - Location: 53,43 - Owner: GDI - Actor23: e1 - Location: 57,44 - Owner: GDI - Actor24: e2 - Location: 65,44 - Owner: GDI - Actor25: e2 - Location: 64,45 - Owner: GDI - Actor26: atwr - Location: 66,42 - Owner: GDI - Actor27: tc02 - Location: 65,42 - Owner: GDI - Actor28: fact - Location: 11,3 - Owner: Nod - Actor29: nuke - Location: 14,1 - Owner: Nod - Actor30: nuke - Location: 16,1 - Owner: Nod - Actor31: silo - Location: 19,1 - Owner: Nod - Actor32: silo - Location: 19,2 - Owner: Nod - Actor33: proc - Location: 15,3 - Owner: Nod - Actor34: tc04 - Location: 11,0 - Owner: Neutral - Actor37: tc05 - Location: 8,0 - Owner: Neutral - Actor38: tc02 - Location: 8,2 - Owner: Neutral - Actor39: tc04 - Location: 8,3 - Owner: Neutral - Actor40: t06 - Location: 8,6 - Owner: Neutral - Actor43: afld - Location: 9,7 - Owner: Nod - Actor42: hq - Location: 10,4 - Owner: Nod - Actor45: sam - Location: 25,6 - Owner: Nod - Actor46: sam - Location: 29,6 - Owner: Nod - Actor47: sam - Location: 53,2 - Owner: Nod - Actor48: sam - Location: 79,5 - Owner: Nod - Actor49: hand - Location: 15,8 - Owner: Nod - Actor50: cycl - Location: 13,11 - Owner: Nod - Actor51: cycl - Location: 13,10 - Owner: Nod - Actor52: cycl - Location: 12,10 - Owner: Nod - Actor53: cycl - Location: 12,11 - Owner: Nod - Actor54: cycl - Location: 11,11 - Owner: Nod - Actor55: cycl - Location: 10,11 - Owner: Nod - Actor56: cycl - Location: 9,11 - Owner: Nod - Actor57: cycl - Location: 8,11 - Owner: Nod - Actor58: cycl - Location: 8,10 - Owner: Nod - Actor59: cycl - Location: 8,9 - Owner: Nod - Actor60: cycl - Location: 8,8 - Owner: Nod - Actor61: cycl - Location: 8,7 - Owner: Nod - Actor62: brik - Location: 15,14 - Owner: Nod - Actor63: brik - Location: 14,14 - Owner: Nod - Actor64: brik - Location: 14,13 - Owner: Nod - Actor65: brik - Location: 15,13 - Owner: Nod - Actor66: brik - Location: 13,14 - Owner: Nod - Actor67: brik - Location: 12,14 - Owner: Nod - Actor68: brik - Location: 12,15 - Owner: Nod - Actor69: brik - Location: 11,15 - Owner: Nod - Actor70: brik - Location: 10,15 - Owner: Nod - Actor71: brik - Location: 9,15 - Owner: Nod - Actor72: brik - Location: 8,15 - Owner: Nod - Actor73: brik - Location: 19,9 - Owner: Nod - Actor74: brik - Location: 19,10 - Owner: Nod - Actor75: brik - Location: 18,10 - Owner: Nod - Actor76: brik - Location: 18,9 - Owner: Nod - Actor77: brik - Location: 19,8 - Owner: Nod - Actor78: brik - Location: 19,7 - Owner: Nod - Actor79: brik - Location: 20,7 - Owner: Nod - Actor80: brik - Location: 20,6 - Owner: Nod - Actor81: brik - Location: 20,5 - Owner: Nod - Actor82: brik - Location: 21,5 - Owner: Nod - Actor83: brik - Location: 22,5 - Owner: Nod - Actor84: brik - Location: 23,5 - Owner: Nod - Actor85: brik - Location: 24,5 - Owner: Nod - Actor91: brik - Location: 27,5 - Owner: Nod - Actor90: brik - Location: 28,5 - Owner: Nod - Actor89: brik - Location: 29,5 - Owner: Nod - Actor88: brik - Location: 30,5 - Owner: Nod - Actor87: brik - Location: 31,5 - Owner: Nod - Actor35: gun - Location: 20,11 - Owner: Nod - TurretFacing: 160 - Actor36: gun - Location: 16,14 - Owner: Nod - TurretFacing: 184 - Actor41: brik - Location: 32,5 - Owner: Nod - Actor44: brik - Location: 32,4 - Owner: Nod - Actor86: brik - Location: 31,4 - Owner: Nod - Actor96: gun - Location: 33,5 - Owner: Nod - TurretFacing: 144 - Actor97: gun - Location: 39,3 - Owner: Nod - TurretFacing: 128 - Actor98: nuke - Location: 22,1 - Owner: Nod - Actor99: nuke - Location: 24,1 - Owner: Nod - Actor100: tc04 - Location: 26,0 - Owner: Neutral - Actor101: tc05 - Location: 41,0 - Owner: Neutral - Actor102: t17 - Location: 40,0 - Owner: Neutral - Actor103: tc01 - Location: 51,1 - Owner: Neutral - Actor104: tc03 - Location: 55,1 - Owner: Neutral - Actor105: tc05 - Location: 60,1 - Owner: Neutral - Actor106: t08 - Location: 61,4 - Owner: Neutral - Actor107: tc05 - Location: 67,3 - Owner: Neutral - Actor109: tc04 - Location: 80,0 - Owner: Neutral - Actor110: tc04 - Location: 83,1 - Owner: Neutral - Actor111: tc05 - Location: 85,3 - Owner: Neutral - Actor112: tc02 - Location: 86,6 - Owner: Neutral - Actor92: brik - Location: 26,5 - Owner: Nod - Actor93: brik - Location: 25,5 - Owner: Nod - Actor94: brik - Location: 39,1 - Owner: Nod - Actor95: brik - Location: 39,2 - Owner: Nod - Actor113: brik - Location: 38,2 - Owner: Nod - Actor114: brik - Location: 38,1 - Owner: Nod - Actor115: tc02 - Location: 36,0 - Owner: Neutral - Actor116: proc - Location: 57,4 - Owner: Nod - Actor117: silo - Location: 54,5 - Owner: Nod - Actor118: silo - Location: 54,6 - Owner: Nod - Actor119: e1 - Location: 12,5 - Owner: Nod - Actor120: e1 - Location: 11,6 - Owner: Nod - Actor121: e6 - Location: 14,4 - Owner: Nod - Actor122: e3 - Location: 18,4 - Owner: Nod - Actor123: e3 - Location: 38,3 - Owner: Nod - Actor124: e3 - Location: 59,8 - Owner: Nod - Actor125: e3 - Location: 58,9 - Owner: Nod - Actor126: ltnk - Location: 21,4 - Owner: Nod - Actor127: ltnk - Location: 22,4 - Owner: Nod - Actor128: ltnk - Location: 23,4 - Owner: Nod - Actor129: bggy - Location: 11,10 - Owner: Nod - Actor130: bggy - Location: 10,10 - Owner: Nod - Actor131: gun - Location: 13,16 - Owner: Nod - TurretFacing: 160 - Actor132: gun - Location: 12,16 - Owner: Nod - TurretFacing: 160 - Actor133: brik - Location: 9,16 - Owner: Nod - Actor134: brik - Location: 8,16 - Owner: Nod - Actor135: tc01 - Location: 10,16 - Owner: Neutral - Actor136: v07 - Location: 8,17 - Owner: Neutral - Actor138: v01 - Location: 36,16 - Owner: Neutral - Actor139: v02 - Location: 37,19 - Owner: Neutral - Actor140: v03 - Location: 31,18 - Owner: Neutral - Actor141: v11 - Location: 33,19 - Owner: Neutral - Actor142: v04 - Location: 34,16 - Owner: Neutral - Actor143: v06 - Location: 40,17 - Owner: Neutral - Actor144: c1 - Location: 34,18 - Owner: Neutral - Actor145: c4 - Location: 37,21 - Owner: Neutral - Actor146: c9 - Location: 40,15 - Owner: Neutral - Actor147: c5 - Location: 39,16 - Owner: Neutral - Actor148: cycl - Location: 31,20 - Owner: Neutral - Actor149: cycl - Location: 32,20 - Owner: Neutral - Actor150: cycl - Location: 33,20 - Owner: Neutral - Actor151: cycl - Location: 34,20 - Owner: Neutral - Actor152: cycl - Location: 34,21 - Owner: Neutral - Actor153: cycl - Location: 34,22 - Owner: Neutral - Actor154: cycl - Location: 35,22 - Owner: Neutral - Actor155: cycl - Location: 35,23 - Owner: Neutral - Actor156: gun - Location: 34,23 - Owner: Nod - TurretFacing: 96 - Actor157: sam - Location: 32,22 - Owner: Nod - Actor158: e1 - Location: 32,21 - Owner: Nod - Actor159: e1 - Location: 33,21 - Owner: Nod - Actor160: e1 - Location: 40,12 - Owner: Nod - Actor161: e1 - Location: 39,13 - Owner: Nod - Actor162: cycl - Location: 50,5 - Owner: Nod - Actor163: cycl - Location: 51,5 - Owner: Nod - Actor167: cycl - Location: 51,8 - Owner: Nod - Actor165: cycl - Location: 51,6 - Owner: Nod - Actor166: cycl - Location: 51,7 - Owner: Nod - Actor168: cycl - Location: 51,9 - Owner: Nod - Actor169: cycl - Location: 51,10 - Owner: Nod - Actor170: cycl - Location: 52,10 - Owner: Nod - Actor171: cycl - Location: 52,9 - Owner: Nod - Actor172: tc04 - Location: 47,4 - Owner: Neutral - Actor173: v02 - Location: 49,6 - Owner: Neutral - Actor174: v04 - Location: 49,7 - Owner: Neutral - Actor175: v10 - Location: 47,7 - Owner: Neutral - Actor176: v08 - Location: 47,10 - Owner: Neutral - Actor177: c3 - Location: 48,9 - Owner: Neutral - Actor178: c4 - Location: 44,12 - Owner: Neutral - Actor179: v09 - Location: 44,10 - Owner: Neutral - Actor180: wood - Location: 71,12 - Owner: Neutral - Actor181: wood - Location: 71,13 - Owner: Neutral - Actor182: wood - Location: 71,14 - Owner: Neutral - Actor183: wood - Location: 71,15 - Owner: Neutral - Actor184: wood - Location: 71,16 - Owner: Neutral - Actor185: wood - Location: 71,17 - Owner: Neutral - Actor186: wood - Location: 71,18 - Owner: Neutral - Actor187: wood - Location: 71,19 - Owner: Neutral - Actor188: wood - Location: 47,16 - Owner: Neutral - Actor189: wood - Location: 48,16 - Owner: Neutral - Actor190: wood - Location: 49,16 - Owner: Neutral - Actor191: wood - Location: 50,16 - Owner: Neutral - Actor192: wood - Location: 51,16 - Owner: Neutral - Actor193: wood - Location: 52,16 - Owner: Neutral - Actor194: wood - Location: 52,15 - Owner: Neutral - Actor195: wood - Location: 52,14 - Owner: Neutral - Actor196: wood - Location: 52,13 - Owner: Neutral - Actor197: v18 - Location: 51,15 - Owner: Neutral - Actor198: v18 - Location: 51,14 - Owner: Neutral - Actor199: v18 - Location: 50,14 - Owner: Neutral - Actor200: v18 - Location: 50,15 - Owner: Neutral - Actor201: v16 - Location: 49,14 - Owner: Neutral - Actor202: v16 - Location: 49,15 - Owner: Neutral - Actor203: v16 - Location: 48,15 - Owner: Neutral - Actor204: v16 - Location: 48,14 - Owner: Neutral - Actor205: v16 - Location: 47,14 - Owner: Neutral - Actor206: v16 - Location: 47,15 - Owner: Neutral - Actor207: v14 - Location: 50,13 - Owner: Neutral - Actor208: v14 - Location: 51,13 - Owner: Neutral - Actor212: v06 - Location: 48,13 - Owner: Neutral - Actor213: v07 - Location: 41,20 - Owner: Neutral - Actor211: v15 - Location: 47,13 - Owner: Neutral - Actor215: c1 - Location: 42,21 - Owner: Neutral - Actor216: c7 - Location: 43,20 - Owner: Neutral - Actor217: c10 - Location: 45,22 - Owner: Neutral - Actor218: c9 - Location: 44,21 - Owner: Neutral - Actor219: e1 - Location: 45,27 - Owner: Nod - Actor220: e1 - Location: 46,28 - Owner: Nod - Actor222: v01 - Location: 69,19 - Owner: Neutral - Actor223: t03 - Location: 72,18 - Owner: Neutral - Actor224: tc05 - Location: 61,10 - Owner: Neutral - Actor225: tc04 - Location: 60,12 - Owner: Neutral - Actor226: tc01 - Location: 59,16 - Owner: Neutral - Actor227: tc03 - Location: 57,16 - Owner: Neutral - Actor228: tc04 - Location: 57,17 - Owner: Neutral - Actor229: v04 - Location: 58,19 - Owner: Neutral - Actor230: tc04 - Location: 75,10 - Owner: Neutral - Actor231: tc02 - Location: 75,16 - Owner: Neutral - Actor232: tc05 - Location: 79,17 - Owner: Neutral - Actor233: tc04 - Location: 79,12 - Owner: Neutral - Actor234: tc01 - Location: 83,14 - Owner: Neutral - Actor235: wood - Location: 81,20 - Owner: Neutral - Actor236: wood - Location: 81,21 - Owner: Neutral - Actor237: wood - Location: 81,22 - Owner: Neutral - Actor238: t17 - Location: 82,22 - Owner: Neutral - Actor239: c4 - Location: 84,17 - Owner: Neutral - Actor240: e1 - Location: 79,9 - Owner: Nod - Actor241: e1 - Location: 78,10 - Owner: Nod - Actor242: e3 - Location: 58,1 - Owner: Nod - Actor243: e3 - Location: 52,8 - Owner: Nod - Actor244: cycl - Location: 52,27 - Owner: Nod - Actor245: cycl - Location: 52,26 - Owner: Nod - Actor246: cycl - Location: 51,26 - Owner: Nod - Actor247: cycl - Location: 51,27 - Owner: Nod - Actor248: cycl - Location: 62,26 - Owner: Nod - Actor249: cycl - Location: 62,27 - Owner: Nod - Actor250: cycl - Location: 63,27 - Owner: Nod - Actor251: cycl - Location: 63,26 - Owner: Nod - Actor252: gun - Location: 53,27 - Owner: Nod - TurretFacing: 128 - Actor253: gun - Location: 50,27 - Owner: Nod - TurretFacing: 128 - Actor254: gun - Location: 61,27 - Owner: Nod - TurretFacing: 128 - Actor255: gun - Location: 64,27 - Owner: Nod - TurretFacing: 128 - Actor256: v03 - Location: 68,21 - Owner: Neutral - Actor257: v02 - Location: 67,19 - Owner: Neutral - Actor258: tc05 - Location: 70,21 - Owner: Neutral - Actor259: v07 - Location: 69,23 - Owner: Neutral - Actor260: c3 - Location: 67,21 - Owner: Neutral - Actor262: c9 - Location: 65,22 - Owner: Neutral - Actor263: c7 - Location: 66,20 - Owner: Neutral - Actor264: e2 - Location: 70,43 - Owner: GDI - Actor265: e2 - Location: 71,43 - Owner: GDI - Actor266: tc04 - Location: 47,42 - Owner: Neutral - Actor267: tc05 - Location: 73,42 - Owner: Neutral - Actor268: tc05 - Location: 44,42 - Owner: Neutral - Actor269: tc01 - Location: 75,44 - Owner: Neutral - Actor270: t11 - Location: 43,44 - Owner: Neutral - Actor271: t01 - Location: 41,41 - Owner: Neutral - Actor272: tc04 - Location: 40,41 - Owner: Neutral - Actor273: tc04 - Location: 38,43 - Owner: Neutral - Actor274: tc05 - Location: 35,42 - Owner: Neutral - Actor275: tc01 - Location: 32,44 - Owner: Neutral - Actor276: tc04 - Location: 30,42 - Owner: Neutral - Actor277: tc05 - Location: 23,42 - Owner: Neutral - Actor278: v03 - Location: 26,44 - Owner: Neutral - Actor279: tc04 - Location: 17,41 - Owner: Neutral - Actor280: tc01 - Location: 18,44 - Owner: Neutral - Actor281: tc04 - Location: 14,43 - Owner: Neutral - Actor282: tc04 - Location: 12,41 - Owner: Neutral - Actor283: tc04 - Location: 9,43 - Owner: Neutral - Actor284: tc04 - Location: 77,41 - Owner: Neutral - Actor285: tc04 - Location: 79,43 - Owner: Neutral - Actor286: tc01 - Location: 82,42 - Owner: Neutral - Actor287: tc05 - Location: 82,43 - Owner: Neutral - Actor288: tc05 - Location: 85,42 - Owner: Neutral - Actor289: wood - Location: 72,26 - Owner: Neutral - Actor290: wood - Location: 71,26 - Owner: Neutral - Actor291: wood - Location: 70,26 - Owner: Neutral - Actor292: wood - Location: 69,26 - Owner: Neutral - Actor293: wood - Location: 68,26 - Owner: Neutral - Actor294: c4 - Location: 71,25 - Owner: Neutral - Actor295: v05 - Location: 72,20 - Owner: Neutral - Actor164: nuke - Location: 8,12 - Owner: Nod - Actor209: nuke - Location: 10,12 - Owner: Nod - Actor210: nuke - Location: 53,45 - Owner: GDI - Actor214: nuke - Location: 55,45 - Owner: GDI - Actor221: jeep - Location: 57,45 - Owner: GDI - boat1: boat - Location: 45,33 - Owner: GDI - boat2: boat - Location: 39,37 - Owner: GDI - boat3: boat - Location: 70,33 - Owner: GDI - boat4: boat - Location: 79,37 - Owner: GDI - lst1: lst - Location: 53,35 - Owner: GDI - Facing: 64 - lst2: lst - Location: 58,35 - Owner: GDI - Facing: 64 - lst3: lst - Location: 63,35 - Owner: GDI - Facing: 64 - ftnk1: ftnk - Location: 67,22 - Owner: Nod - Facing: 228 - ftnk2: ftnk - Location: 65,20 - Owner: Nod - Facing: 192 - Actor300: split3 - Owner: Neutral - Location: 13,21 - Actor299: split3 - Owner: Neutral - Location: 73,6 - -Rules: cnc|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/cnc/maps/shellmap/rules.yaml b/mods/cnc/maps/shellmap/rules.yaml deleted file mode 100644 index dcd2b78e81..0000000000 --- a/mods/cnc/maps/shellmap/rules.yaml +++ /dev/null @@ -1,19 +0,0 @@ -World: - -SpawnMPUnits: - -MPStartLocations: - -CrateSpawner: - MenuPaletteEffect: - Effect: Desaturated - LuaScript: - Scripts: shellmap.lua - MusicPlaylist: - BackgroundMusic: map1 - DisableWorldSounds: true - -LST: - Mobile: - Speed: 42 - -BOAT: - Mobile: - Speed: 42 diff --git a/mods/cnc/maps/shellmap/shellmap.lua b/mods/cnc/maps/shellmap/shellmap.lua deleted file mode 100644 index 2b72205e06..0000000000 --- a/mods/cnc/maps/shellmap/shellmap.lua +++ /dev/null @@ -1,30 +0,0 @@ - -ticks = 0 -speed = 5 - -Tick = function() - ticks = ticks + 1 - local t = (ticks + 45) % (360 * speed) * (math.pi / 180) / speed; - Camera.Position = viewportOrigin + WVec.New(-15360 * math.sin(t), 4096 * math.cos(t), 0) -end - -WorldLoaded = function() - viewportOrigin = Camera.Position - LoadTransport(lst1, "htnk") - LoadTransport(lst2, "mcv") - LoadTransport(lst3, "htnk") - local units = { boat1, boat2, boat3, boat4, lst1, lst2, lst3} - for i, unit in ipairs(units) do - LoopTrack(unit, CPos.New(8, unit.Location.Y), CPos.New(87, unit.Location.Y)) - end -end - -LoopTrack = function(actor, left, right) - actor.ScriptedMove(left) - actor.Teleport(right) - actor.CallFunc(function() LoopTrack(actor, left, right) end) -end - -LoadTransport = function(transport, passenger) - transport.LoadPassenger(Actor.Create(passenger, false, { Owner = transport.Owner, Facing = transport.Facing })) -end \ No newline at end of file