diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 14ac69d2e4..89f6a2aabf 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -1,4 +1,4 @@ - + Debug @@ -115,7 +115,6 @@ - diff --git a/OpenRA.Game/Traits/Modifiers/ForcedPalette.cs b/OpenRA.Game/Traits/Modifiers/ForcedPalette.cs deleted file mode 100644 index 58c9262672..0000000000 --- a/OpenRA.Game/Traits/Modifiers/ForcedPalette.cs +++ /dev/null @@ -1,43 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford. - * This file is part of OpenRA. - * - * OpenRA is free software: you can redistribute it and/or modify - * it 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. - * - * OpenRA is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with OpenRA. If not, see . - */ -#endregion - -using System.Collections.Generic; -using System.Linq; - -namespace OpenRA.Traits -{ - class ForcedPaletteInfo : ITraitInfo - { - public readonly string Palette = null; - public object Create(Actor self) { return new ForcedPalette(this); } - } - - class ForcedPalette : IRenderModifier - { - string palette; - - public ForcedPalette(ForcedPaletteInfo info) { palette = info.Palette; } - - public IEnumerable ModifyRender(Actor self, IEnumerable r) - { - return r.Select(rr => rr.WithPalette(palette)); - } - } -} diff --git a/mods/ra/merge-rules.yaml b/mods/ra/merge-rules.yaml deleted file mode 100644 index 1d03e703ad..0000000000 --- a/mods/ra/merge-rules.yaml +++ /dev/null @@ -1,160 +0,0 @@ -Player: - ProductionQueue: - PlaceBuilding: - GpsPower: - Image: gpssicon - OneShot: yes - ChargeTime: 8 - Description: GPS Satellite - LongDesc: Reveals the entire map - Prerequisites: ATEK - TechLevel: 12 - RevealDelay: 15 - ChronoshiftPower: - Image: warpicon - ChargeTime: 7 - Description: Chronoshift - LongDesc: Temporarily teleports a vehicle across \nthe map. - Prerequisites: PDOX - TechLevel: 12 - Duration: 3 - KillCargo: yes - IronCurtainPower: - Image: infxicon - ChargeTime: 11 - Description: Invulnerability - LongDesc: Makes a single unit invulnerable for a \nshort time. - Prerequisites: IRON - TechLevel: 12 - Duration: .75 - SpyPlanePower: - Image: smigicon - ChargeTime: 3 - Description: Spy Plane - LongDesc: Reveals an area of the map. - Prerequisites: AFLD - TechLevel: 5 - ParatroopersPower: - Image: pinficon - ChargeTime: 6 - Description: Paratroopers - LongDesc: A Badger drops a squad of Riflemen \n anywhere on the map - Prerequisites: AFLD - TechLevel: 5 - DropItems: E1,E1,E1,E3,E3 - NukePower: - Image: atomicon - ChargeTime: 13 - Description: Atom Bomb - LongDesc: Launches a nuclear missile at a target location. - Prerequisites: MSLO - TechLevel: 12 - SonarPulsePower: - Image: sonricon - ChargeTime: 10 - Description: Sonar Pulse - LongDesc: Reveals all submarines on the map for a \nshort time. - TechLevel: 5 - GivenAuto: no - OneShot: yes - CrateSpawnPower: - Image: 4tnkicon - ChargeTime: 0.001 - Description: Spawn Crate - LongDesc: Spawns a crate at a target location - Prerequisites: POWR - TechLevel: 12 -World: - WaterPaletteRotation: - ChronoshiftPaletteEffect: - LightPaletteRotator: - BuildingInfluence: - UnitInfluence: - -MGG: - GeneratesGap: - Range: 10 - -GAP: - RequiresPower: - CanPowerDown: - GeneratesGap: - Range: 10 - -MRJ: - JamsRadar: - Range: 10 - -MINP: - Mine: - Damage: 1000 - Warhead: APMine - TriggeredBy: Foot, Wheel, Track - AvoidFriendly: yes - -MINV: - Mine: - Damage: 1200 - Warhead: ATMine - TriggeredBy: Wheel, Track - AvoidFriendly: yes - -BR1: - Bridge: - SouthOffset:0,2 -BR2: - Bridge: - NorthOffset:3,0 -BR3: - Bridge: - Long: yes - NorthOffset: 2,0 - SouthOffset: 0,1 - -BRIDGE1: - Bridge: - UseAlternateNames: yes - -BRIDGE2: - Bridge: - UseAlternateNames: yes - -MSLO: - NukeSilo: - -SPEN: - InfiltrateForSonarPulse: - -SYRD: - InfiltrateForSonarPulse: -IRON: - RequiresPower: - CanPowerDown: -PDOX: - RequiresPower: - CanPowerDown: -TSLA: - RequiresPower: - CanPowerDown: -AGUN: - RequiresPower: - CanPowerDown: -DOME: - RequiresPower: - CanPowerDown: - -CRATE: - Crate: - Lifetime: 5 - SpeedUpgradeCrateAction: - Multiplier: 1.7 - SelectionShares: 10 - Unit: - HP: 1 - RenderUnit: - BelowUnits: - -BADR: - ParaDrop: - LZRange: 4 - -Selectable: \ No newline at end of file