merged ra-ng into ra base mod

OpenRA.Mods.RA-NG/OpenRA.Mods.RA_NG.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,7 +45,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CrateDrop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

OpenRA.Mods.RA/CrateDrop.cs

@@ -20,24 +20,18 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Mods.RA;
+using OpenRA.GameRules;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
-using OpenRA.GameRules;
 
-namespace OpenRA.Mods.RA_NG
+namespace OpenRA.Mods.RA
 {
-	public class CrateDropInfo : ITraitInfo
+	public class CrateDropInfo : TraitInfo<CrateDrop>
 	{
 		public readonly int Minimum = 1; // Minumum number of crates
 		public readonly int Maximum = 255; // Maximum number of crates
 		public readonly int SpawnInterval = 180; // Average time (seconds) between crate spawn
 		public readonly float WaterChance = .2f; // Chance of generating a water crate instead of a land crate
-
-		public object Create(Actor self)
-		{
-			return new CrateDrop();
-		}
 	}
 
 	public class CrateDrop : ITick

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -57,6 +57,7 @@
     <Compile Include="C4Demolition.cs" />
     <Compile Include="CarpetBomb.cs" />
     <Compile Include="Chronoshiftable.cs" />
+    <Compile Include="CrateDrop.cs" />
     <Compile Include="Crates\SupportPowerCrateAction.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Activities\Harvest.cs" />

mods/ra-ng/crate-drop.yaml

@@ -1,7 +0,0 @@
-World:
-	-CrateSpawner:
-	CrateDrop:
-		Minimum: 1
-		Maximum: 3
-		SpawnInterval: 20
-		WaterChance: .2

mods/ra-ng/defense-queue.yaml

@@ -1,36 +0,0 @@
-IRON:
-	Category: Defense
-PDOX:
-	Category: Defense
-PBOX:
-	Category: Defense
-HBOX:
-	Category: Defense
-TSLA:
-	Category: Defense
-GUN:
-	Category: Defense
-AGUN:
-	Category: Defense
-FTUR:
-	Category: Defense
-GAP:
-	Category: Defense
-SAM:
-	Category: Defense
-MSLO:
-	Category: Defense
-	
-BRIK:
-	Category: Defense
-SBAG:
-	Category: Defense
-CYCL:
-	Category: Defense
-WOOD:
-	Category: Defense
-BARB:
-	Category: Defense
-FENC:
-	Category: Defense
-

mods/ra-ng/mod.yaml

@@ -1,13 +0,0 @@
-# Red Alert: Next Generation - Rules Manifest
-
-Packages:
-
-Rules:
-	mods/ra-ng/crate-drop.yaml
-	mods/ra-ng/defense-queue.yaml
-
-Sequences:
-
-Assemblies:
-	mods/ra-ng/OpenRA.Mods.RA_NG.dll:
-	mods/ra/OpenRA.Mods.RA.dll:

mods/ra/structures.yaml

@@ -1,4 +1,5 @@
 MSLO:
+	Category: Defense
 	NukeSilo:
 	Inherits: ^Building
 	Buildable:
@@ -19,6 +20,7 @@ MSLO:
 	IronCurtainable:
 
 GAP:
+	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	GeneratesGap:
@@ -96,6 +98,7 @@ SYRD:
 	-EmitInfantryOnSell:
 
 IRON:
+	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
@@ -120,6 +123,7 @@ IRON:
 	IronCurtain:
 
 PDOX:
+	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
@@ -144,6 +148,7 @@ PDOX:
 	IronCurtainable:
 
 TSLA:
+	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
@@ -172,6 +177,7 @@ TSLA:
 	RenderRangeCircle:
 
 AGUN:
+	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
@@ -228,6 +234,7 @@ DOME:
 	IronCurtainable:
 
 PBOX:
+	Category: Defense
 	Inherits: ^Building
 	Buildable:
 		TechLevel: 2
@@ -249,6 +256,7 @@ PBOX:
 	RenderRangeCircle:
 
 HBOX:
+	Category: Defense
 	Inherits: ^Building
 	Buildable:
 		TechLevel: 3
@@ -270,6 +278,7 @@ HBOX:
 	RenderRangeCircle:
 
 GUN:
+	Category: Defense
 	Inherits: ^Building
 	Buildable:
 		TechLevel: 4
@@ -296,6 +305,7 @@ GUN:
 	RenderRangeCircle:
 
 FTUR:
+	Category: Defense
 	Inherits: ^Building
 	Buildable:
 		TechLevel: 2
@@ -318,6 +328,7 @@ FTUR:
 	RenderRangeCircle:
 
 SAM:
+	Category: Defense
 	Inherits: ^Building
 	Buildable:
 		TechLevel: 9
@@ -792,6 +803,7 @@ DOMF:
 	Fake:
 
 SBAG:
+	Category: Defense
 	Inherits: ^Wall
 	Buildable:
 		TechLevel: 2
@@ -806,6 +818,7 @@ SBAG:
 		Armor: none
 
 FENC:
+	Category: Defense
 	Inherits: ^Wall
 	Buildable:
 		TechLevel: 2
@@ -820,6 +833,7 @@ FENC:
 		Armor: none
 
 BRIK:
+	Category: Defense
 	Inherits: ^Wall
 	Buildable:
 		TechLevel: 8

mods/ra/system.yaml

@@ -90,10 +90,10 @@ World:
 	UnitInfluence:
 	ChoosePaletteOnSelect:
 	BridgeLayer:
-	CrateSpawner:
+	CrateDrop:
 		Minimum: 1
 		Maximum: 3
-		SpawnInterval: 30
+		SpawnInterval: 20
 		WaterChance: .2
 	PaletteFromFile@terrain_temperat:
 		Name: terrain

packaging/windows/OpenRA.nsi

@@ -134,10 +134,6 @@ SectionGroup /e "Mods"
 			Delete aftermath-packages.zip
 		SectionEnd
 	SectionGroupEnd
-	Section "Red Alert: Next Generation" RA_NG
-		SetOutPath "$INSTDIR\mods\ra-ng"
-		File "..\..\mods\ra-ng\*.*"
-	SectionEnd
 SectionGroupEnd
 
 ;***************************
@@ -237,14 +233,12 @@ LangString DESC_Client ${LANG_ENGLISH} "OpenRA client and dependencies"
 LangString DESC_RA ${LANG_ENGLISH} "Base Red Alert mod"
 LangString DESC_CNC ${LANG_ENGLISH} "Base Command and Conquer mod"
 LangString DESC_Aftermath ${LANG_ENGLISH} "Red Alert: Aftermath expansion mod (depends on base Red Alert mod)"
-LangString DESC_RA_NG ${LANG_ENGLISH} "Next-gen Red Alert mod (depends on base Red Alert mod)"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${Client} $(DESC_Client)
 	!insertmacro MUI_DESCRIPTION_TEXT ${RA} $(DESC_RA)
 	!insertmacro MUI_DESCRIPTION_TEXT ${CNC} $(DESC_CNC)
 	!insertmacro MUI_DESCRIPTION_TEXT ${Aftermath} $(DESC_Aftermath)
-	!insertmacro MUI_DESCRIPTION_TEXT ${RA_NG} $(DESC_RA_NG)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;***************************