diff --git a/mods/ra/bits/desert/fenc.des b/mods/ra/bits/desert/fenc.des deleted file mode 100644 index 2081cbbd92..0000000000 Binary files a/mods/ra/bits/desert/fenc.des and /dev/null differ diff --git a/mods/ra/bits/desert/t04.des b/mods/ra/bits/desert/t04.des new file mode 100644 index 0000000000..d79152c650 Binary files /dev/null and b/mods/ra/bits/desert/t04.des differ diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index b8006d6e2b..c05beecec1 100644 --- a/mods/ra/rules/civilian.yaml +++ b/mods/ra/rules/civilian.yaml @@ -38,6 +38,8 @@ V01: Capturable: Type: civilianbuilding CaptureCompleteTime: 0 + EditorTilesetFilter: + ExcludeTilesets: DESERT V01.SNIPER: Inherits: V01 @@ -61,75 +63,111 @@ V01.SNIPER: SkipMakeAnims: true BecomeNeutral: true -Capturable: + EditorTilesetFilter: + ExcludeTilesets: DESERT V02: Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT V03: Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT V04: Inherits: ^CivBuilding Building: Footprint: xx xx Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT V05: Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 + EditorTilesetFilter: + ExcludeTilesets: DESERT V06: Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 + EditorTilesetFilter: + ExcludeTilesets: DESERT V07: Inherits: ^CivBuilding Building: Footprint: xx Dimensions: 2,1 + EditorTilesetFilter: + ExcludeTilesets: DESERT V08: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V09: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V10: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V11: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V12: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V13: Inherits: ^CivBuilding + EditorTilesetFilter: + ExcludeTilesets: DESERT V14: Inherits: ^CivField + EditorTilesetFilter: + ExcludeTilesets: DESERT V15: Inherits: ^CivField + EditorTilesetFilter: + ExcludeTilesets: DESERT V16: Inherits: ^CivField + EditorTilesetFilter: + ExcludeTilesets: DESERT V17: Inherits: ^CivField + EditorTilesetFilter: + ExcludeTilesets: DESERT V18: Inherits: ^CivField + EditorTilesetFilter: + ExcludeTilesets: DESERT BARL: Inherits: ^CivBuilding @@ -284,3 +322,93 @@ SBRIDGE4: Building: Footprint: ____ ____ Dimensions: 4,2 + +#Desert Terrain Expansion +V20: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx xx + Dimensions: 2,2 + +V21: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx xx + Dimensions: 2,2 + +V22: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V23: + Inherits: ^DesertCivBuilding + +V24: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx xx + Dimensions: 2,2 + +V25: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx xx + Dimensions: 2,2 + Tooltip: + Name: Church + +V26: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V27: + Inherits: ^DesertCivBuilding + +V28: + Inherits: ^DesertCivBuilding + +V29: + Inherits: ^DesertCivBuilding + +V30: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V31: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V32: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V33: + Inherits: ^DesertCivBuilding + Building: + Footprint: xx + Dimensions: 2,1 + +V34: + Inherits: ^DesertCivBuilding + +V35: + Inherits: ^DesertCivBuilding + +V36: + Inherits: ^DesertCivBuilding + +V37: + Inherits: ^DesertCivBuilding + Building: + Footprint: __xx_ ___xx + Dimensions: 5,2 \ No newline at end of file diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 77aee7aa0f..e711b52911 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -312,7 +312,7 @@ Types:Bridge AutoTargetIgnore: -#Terrain Expansion +#Temperate Terrain Expansion ^SVBridge: Tooltip: Name: Small Bridge @@ -326,6 +326,7 @@ HP: 750 ProximityCaptor: Types:Bridge + ^SHBridge: Tooltip: Name: Small Bridge @@ -339,6 +340,7 @@ HP: 750 ProximityCaptor: Types:Bridge + ^STDBridge: Tooltip: Name: Small Bridge @@ -352,6 +354,7 @@ HP: 750 ProximityCaptor: Types:Bridge + #Desert Terrain Expansion: ^Rock: Tooltip: @@ -368,3 +371,8 @@ RelativeToTopLeft: yes ProximityCaptor: Types:Tree + +^DesertCivBuilding + Inherits: ^CivBuilding + RenderBuilding: + Palette: terrain diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/trees.yaml index 35035983f8..72dbba8619 100644 --- a/mods/ra/rules/trees.yaml +++ b/mods/ra/rules/trees.yaml @@ -3,36 +3,48 @@ T01: Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T02: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T03: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T05: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T06: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T07: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T08: Inherits: ^Tree @@ -40,55 +52,69 @@ T08: Footprint: x_ Dimensions: 2,1 - T10: Inherits: ^Tree Building: Footprint: __ xx Dimensions: 2,2 - + EditorTilesetFilter: + ExcludeTilesets: DESERT T11: Inherits: ^Tree Building: Footprint: __ xx Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T12: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T13: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T14: Inherits: ^Tree Building: Footprint: ___ xx_ Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T15: Inherits: ^Tree Building: Footprint: ___ xx_ Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T16: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT T17: Inherits: ^Tree Building: Footprint: __ x_ Dimensions: 2,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT TC01: Inherits: ^Tree @@ -101,24 +127,32 @@ TC02: Building: Footprint: _x_ xx_ Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT TC03: Inherits: ^Tree Building: Footprint: xx_ xx_ Dimensions: 3,2 + EditorTilesetFilter: + ExcludeTilesets: DESERT TC04: Inherits: ^Tree Building: Footprint: ____ xxx_ x___ Dimensions: 4,3 + EditorTilesetFilter: + ExcludeTilesets: DESERT TC05: Inherits: ^Tree Building: Footprint: __x_ xxx_ _xx_ Dimensions: 4,3 + EditorTilesetFilter: + ExcludeTilesets: DESERT MINE: Inherits: ^Tree @@ -182,6 +216,8 @@ ICE01: Dimensions: 2,2 Tooltip: Name: Ice Floe + EditorTilesetFilter: + ExcludeTilesets: DESERT ICE02: Inherits: ^Tree @@ -190,6 +226,8 @@ ICE02: Dimensions: 1,2 Tooltip: Name: Ice Floe + EditorTilesetFilter: + ExcludeTilesets: DESERT ICE03: Inherits: ^Tree @@ -198,16 +236,22 @@ ICE03: Dimensions: 2,1 Tooltip: Name: Ice Floe + EditorTilesetFilter: + ExcludeTilesets: DESERT ICE04: Inherits: ^Tree Tooltip: Name: Ice Floe + EditorTilesetFilter: + ExcludeTilesets: DESERT ICE05: Inherits: ^Tree Tooltip: Name: Ice Floe + EditorTilesetFilter: + ExcludeTilesets: DESERT # Desert Terrain Expansion ROCK1: @@ -215,33 +259,45 @@ ROCK1: Building: Footprint: ___ xx_ Dimensions: 3,2 + ROCK2: Inherits: ^Rock Building: Footprint: xx_ Dimensions: 3,1 + ROCK3: Inherits: ^Rock Building: Footprint: ___ xx_ Dimensions: 3,2 + ROCK4: Inherits: ^Rock Building: Footprint: x_ Dimensions: 2,1 + ROCK5: Inherits: ^Rock Building: Footprint: x_ Dimensions: 2,1 + ROCK6: Inherits: ^Rock Building: Footprint: ___ xxx Dimensions: 3,2 + ROCK7: Inherits: ^Rock Building: Footprint: xxxx_ - Dimensions: 5,1 \ No newline at end of file + Dimensions: 5,1 + +T04: + Inherits: ^Tree + Building: + Footprint: __ x_ + Dimensions: 2,2 \ No newline at end of file diff --git a/mods/ra/sequences.yaml b/mods/ra/sequences.yaml index b803888a51..6480463623 100644 --- a/mods/ra/sequences.yaml +++ b/mods/ra/sequences.yaml @@ -2332,3 +2332,134 @@ rock6: rock7: idle: Start: 0 + +t04: + idle: + Start: 0 + burn: + Start: 1 + Length: 9 + +v20: + idle: + Start: 0 + Length: 3 + Tick: 120 + damaged-idle: + Start: 3 + Length: 3 + Tick: 120 + +v21: + idle: + Start: 0 + Length: 3 + Tick: 120 + damaged-idle: + Start: 3 + Length: 3 + Tick: 120 + +v22: + idle: + Start: 0 + Length: 3 + Tick: 120 + damaged-idle: + Start: 3 + Length: 3 + Tick: 120 + +v23: + idle: + Start: 0 + Length: 3 + Tick: 120 + damaged-idle: + Start: 3 + Length: 3 + Tick: 120 + +v24: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v25: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v26: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v27: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v28: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v29: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v30: + idle: + Start: 0 + damaged-idle: + Start: 2 + +v31: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v32: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v33: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v34: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v35: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v36: + idle: + Start: 0 + damaged-idle: + Start: 1 + +v37: + idle: + Start: 0 + damaged-idle: + Start: 1