Merge pull request #5044 from Mailaender/better-rule-naming

Renamed old system.yaml descendened files

CHANGELOG

@@ -173,7 +173,7 @@ NEW:
 		Added SDL 2 as a dependency for the RPM package.
 	Mod / Custom map compatibility:
 		Altitude is no longer parsed from actor templates in maps. Specify CenterPosition instead.
-		system.yaml has been split into four files for all mods: system-actor.yaml, system-ai.yaml, system-player.yaml and system-world.yaml.
+		system.yaml has been split into four files for all mods: misc.yaml, ai.yaml, player.yaml and world.yaml.
 		Run `OpenRA.Utility.exe --upgrade-mod <mod> 20131223` to automatically upgrade mod rules.
 		Run `OpenRA.Utility.exe --upgrade-map <map path> 20131223` to automatically upgrade custom map rules.
 		Added a new trait Demolishable for buildings to handle the C4 demolition.

mods/cnc/mod.yaml

@@ -34,10 +34,10 @@ Packages:
 	~transit.mix
 
 Rules:
-	mods/cnc/rules/system-actors.yaml
-	mods/cnc/rules/system-ai.yaml
-	mods/cnc/rules/system-player.yaml
-	mods/cnc/rules/system-world.yaml
+	mods/cnc/rules/misc.yaml
+	mods/cnc/rules/ai.yaml
+	mods/cnc/rules/player.yaml
+	mods/cnc/rules/world.yaml
 	mods/cnc/rules/defaults.yaml
 	mods/cnc/rules/structures.yaml
 	mods/cnc/rules/infantry.yaml

mods/d2k/mod.yaml

@@ -24,10 +24,10 @@ Packages:
 	SOUND.RS
 
 Rules:
-	mods/d2k/rules/system-actors.yaml
-	mods/d2k/rules/system-ai.yaml
-	mods/d2k/rules/system-player.yaml
-	mods/d2k/rules/system-world.yaml
+	mods/d2k/rules/misc.yaml
+	mods/d2k/rules/ai.yaml
+	mods/d2k/rules/player.yaml
+	mods/d2k/rules/world.yaml
 	mods/d2k/rules/defaults.yaml
 	mods/d2k/rules/vehicles.yaml
 	mods/d2k/rules/structures.yaml

mods/ra/mod.yaml

@@ -34,17 +34,17 @@ Packages:
 	~movies2.mix
 
 Rules:
-	mods/ra/rules/system-actors.yaml
-	mods/ra/rules/system-ai.yaml
-	mods/ra/rules/system-player.yaml
-	mods/ra/rules/system-world.yaml
+	mods/ra/rules/misc.yaml
+	mods/ra/rules/ai.yaml
+	mods/ra/rules/player.yaml
+	mods/ra/rules/world.yaml
 	mods/ra/rules/defaults.yaml
 	mods/ra/rules/vehicles.yaml
 	mods/ra/rules/husks.yaml
 	mods/ra/rules/structures.yaml
 	mods/ra/rules/infantry.yaml
 	mods/ra/rules/civilian.yaml
-	mods/ra/rules/trees.yaml
+	mods/ra/rules/decoration.yaml
 	mods/ra/rules/aircraft.yaml
 	mods/ra/rules/ships.yaml
 

mods/ra/rules/decoration.yaml

@@ -22,6 +22,12 @@ T03:
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
 
+T04:
+	Inherits: ^Tree
+	Building:
+		Footprint: __ x_
+		Dimensions: 2,2
+
 T05:
 	Inherits: ^Tree
 	Building:
@@ -154,45 +160,6 @@ TC05:
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
 
-MINE:
-	Tooltip:
-		Name: Ore Mine
-	RenderBuilding:
-		Palette: terrain
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	AppearsOnRadar:
-	RadarColorFromTerrain:
-		Terrain: Ore
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: yes
-	AutoTargetIgnore:
-	BodyOrientation:
-	SeedsResource:
-	BelowUnits:
-
-RAILMINE:
-	Tooltip:
-		Name: Gem Mine
-	RenderBuilding:
-		Palette: terrain
-	Building:
-		Footprint: xx
-		Dimensions: 2,1
-	AppearsOnRadar:
-	RadarColorFromTerrain:
-		Terrain: Gems
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: yes
-	AutoTargetIgnore:
-	BodyOrientation:
-	SeedsResource:
-		ResourceType: Gems
-	BelowUnits:
-
 BOXES01:
 	Inherits: ^Tree
 	Tooltip:
@@ -324,12 +291,6 @@ ROCK7:
 		Footprint: xxxx_
 		Dimensions: 5,1
 
-T04:
-	Inherits: ^Tree
-	Building:
-		Footprint: __ x_
-		Dimensions: 2,2
-
 UTILPOL1:
 	Inherits: ^Tree
 	Tooltip:
@@ -356,50 +317,3 @@ TANKTRAP2:
 	Tooltip:
 		Name: Tank Trap
 
-QUEE:
-	Tooltip:
-		Name: Queen Ant
-	Building:
-		Footprint: xx
-		Dimensions: 2,1
-	RenderBuilding:
-	AppearsOnRadar:
-	BodyOrientation:
-	EditorTilesetFilter:
-		RequireTilesets: INTERIOR
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: true
-
-LAR1:
-	Tooltip:
-		Name: Ant Larva
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	RenderBuilding:
-		Palette: terrain
-	AppearsOnRadar:
-	BodyOrientation:
-	EditorTilesetFilter:
-		RequireTilesets: INTERIOR
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: true
-
-LAR2:
-	Tooltip:
-		Name: Ant Larvae
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	RenderBuilding:
-		Palette: terrain
-	AppearsOnRadar:
-	BodyOrientation:
-	EditorTilesetFilter:
-		RequireTilesets: INTERIOR
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: true
-

mods/ra/rules/misc.yaml

@@ -153,6 +153,92 @@ FLARE:
 		Types: Flare
 	BodyOrientation:
 
+MINE:
+	Tooltip:
+		Name: Ore Mine
+	RenderBuilding:
+		Palette: terrain
+	Building:
+		Footprint: x
+		Dimensions: 1,1
+	AppearsOnRadar:
+	RadarColorFromTerrain:
+		Terrain: Ore
+	EditorAppearance:
+		RelativeToTopLeft: yes
+		UseTerrainPalette: yes
+	AutoTargetIgnore:
+	BodyOrientation:
+	SeedsResource:
+	BelowUnits:
+
+RAILMINE:
+	Tooltip:
+		Name: Gem Mine
+	RenderBuilding:
+		Palette: terrain
+	Building:
+		Footprint: xx
+		Dimensions: 2,1
+	AppearsOnRadar:
+	RadarColorFromTerrain:
+		Terrain: Gems
+	EditorAppearance:
+		RelativeToTopLeft: yes
+		UseTerrainPalette: yes
+	AutoTargetIgnore:
+	BodyOrientation:
+	SeedsResource:
+		ResourceType: Gems
+	BelowUnits:
+
+QUEE:
+	Tooltip:
+		Name: Queen Ant
+	Building:
+		Footprint: xx
+		Dimensions: 2,1
+	RenderBuilding:
+	AppearsOnRadar:
+	BodyOrientation:
+	EditorTilesetFilter:
+		RequireTilesets: INTERIOR
+	EditorAppearance:
+		RelativeToTopLeft: yes
+		UseTerrainPalette: true
+
+LAR1:
+	Tooltip:
+		Name: Ant Larva
+	Building:
+		Footprint: x
+		Dimensions: 1,1
+	RenderBuilding:
+		Palette: terrain
+	AppearsOnRadar:
+	BodyOrientation:
+	EditorTilesetFilter:
+		RequireTilesets: INTERIOR
+	EditorAppearance:
+		RelativeToTopLeft: yes
+		UseTerrainPalette: true
+
+LAR2:
+	Tooltip:
+		Name: Ant Larvae
+	Building:
+		Footprint: x
+		Dimensions: 1,1
+	RenderBuilding:
+		Palette: terrain
+	AppearsOnRadar:
+	BodyOrientation:
+	EditorTilesetFilter:
+		RequireTilesets: INTERIOR
+	EditorAppearance:
+		RelativeToTopLeft: yes
+		UseTerrainPalette: true
+
 powerproxy.parabombs:
 	AirstrikePower:
 		Icon: parabombs

mods/ts/mod.yaml

@@ -63,10 +63,10 @@ Packages:
 PackageContents:
 
 Rules:
-	mods/ts/rules/system-actors.yaml
-	mods/ts/rules/system-ai.yaml
-	mods/ts/rules/system-player.yaml
-	mods/ts/rules/system-world.yaml
+	mods/ts/rules/misc.yaml
+	mods/ts/rules/ai.yaml
+	mods/ts/rules/player.yaml
+	mods/ts/rules/world.yaml
 	mods/ts/rules/aircraft.yaml
 	mods/ts/rules/defaults.yaml
 	mods/ts/rules/infantry.yaml