diff --git a/CHANGELOG b/CHANGELOG index 114c2c0b0d..94b2f7f999 100644 --- a/CHANGELOG +++ b/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 20131223` to automatically upgrade mod rules. Run `OpenRA.Utility.exe --upgrade-map 20131223` to automatically upgrade custom map rules. Added a new trait Demolishable for buildings to handle the C4 demolition. diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 3f7e760d48..a4b85d32b1 100644 --- a/mods/cnc/mod.yaml +++ b/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 diff --git a/mods/cnc/rules/system-ai.yaml b/mods/cnc/rules/ai.yaml similarity index 100% rename from mods/cnc/rules/system-ai.yaml rename to mods/cnc/rules/ai.yaml diff --git a/mods/cnc/rules/system-actors.yaml b/mods/cnc/rules/misc.yaml similarity index 100% rename from mods/cnc/rules/system-actors.yaml rename to mods/cnc/rules/misc.yaml diff --git a/mods/cnc/rules/system-player.yaml b/mods/cnc/rules/player.yaml similarity index 100% rename from mods/cnc/rules/system-player.yaml rename to mods/cnc/rules/player.yaml diff --git a/mods/cnc/rules/system-world.yaml b/mods/cnc/rules/world.yaml similarity index 100% rename from mods/cnc/rules/system-world.yaml rename to mods/cnc/rules/world.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index bf17bc3331..a3cf63a300 100644 --- a/mods/d2k/mod.yaml +++ b/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 diff --git a/mods/d2k/rules/system-ai.yaml b/mods/d2k/rules/ai.yaml similarity index 100% rename from mods/d2k/rules/system-ai.yaml rename to mods/d2k/rules/ai.yaml diff --git a/mods/d2k/rules/system-actors.yaml b/mods/d2k/rules/misc.yaml similarity index 100% rename from mods/d2k/rules/system-actors.yaml rename to mods/d2k/rules/misc.yaml diff --git a/mods/d2k/rules/system-player.yaml b/mods/d2k/rules/player.yaml similarity index 100% rename from mods/d2k/rules/system-player.yaml rename to mods/d2k/rules/player.yaml diff --git a/mods/d2k/rules/system-world.yaml b/mods/d2k/rules/world.yaml similarity index 100% rename from mods/d2k/rules/system-world.yaml rename to mods/d2k/rules/world.yaml diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 766e38c084..82aaa851eb 100644 --- a/mods/ra/mod.yaml +++ b/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 diff --git a/mods/ra/rules/system-ai.yaml b/mods/ra/rules/ai.yaml similarity index 100% rename from mods/ra/rules/system-ai.yaml rename to mods/ra/rules/ai.yaml diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/decoration.yaml similarity index 75% rename from mods/ra/rules/trees.yaml rename to mods/ra/rules/decoration.yaml index a5826a433e..e0639ffe1c 100644 --- a/mods/ra/rules/trees.yaml +++ b/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 - diff --git a/mods/ra/rules/system-actors.yaml b/mods/ra/rules/misc.yaml similarity index 69% rename from mods/ra/rules/system-actors.yaml rename to mods/ra/rules/misc.yaml index 4a71b389bb..ba8c2109f7 100644 --- a/mods/ra/rules/system-actors.yaml +++ b/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 diff --git a/mods/ra/rules/system-player.yaml b/mods/ra/rules/player.yaml similarity index 100% rename from mods/ra/rules/system-player.yaml rename to mods/ra/rules/player.yaml diff --git a/mods/ra/rules/system-world.yaml b/mods/ra/rules/world.yaml similarity index 100% rename from mods/ra/rules/system-world.yaml rename to mods/ra/rules/world.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index e5030780e7..4c63838675 100644 --- a/mods/ts/mod.yaml +++ b/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 diff --git a/mods/ts/rules/system-ai.yaml b/mods/ts/rules/ai.yaml similarity index 100% rename from mods/ts/rules/system-ai.yaml rename to mods/ts/rules/ai.yaml diff --git a/mods/ts/rules/system-actors.yaml b/mods/ts/rules/misc.yaml similarity index 100% rename from mods/ts/rules/system-actors.yaml rename to mods/ts/rules/misc.yaml diff --git a/mods/ts/rules/system-player.yaml b/mods/ts/rules/player.yaml similarity index 100% rename from mods/ts/rules/system-player.yaml rename to mods/ts/rules/player.yaml diff --git a/mods/ts/rules/system-world.yaml b/mods/ts/rules/world.yaml similarity index 100% rename from mods/ts/rules/system-world.yaml rename to mods/ts/rules/world.yaml