From 7d5a84368485a8b2b6ef6c1696270d5d4bad1e04 Mon Sep 17 00:00:00 2001
From: Curtis Shmyr <cjshmyr@gmail.com>
Date: Sun, 25 Nov 2012 17:30:19 -0700
Subject: [PATCH 1/3] RA Desert - Added a missing shrub. Added building yaml
 definitions. Hide Temperate and Snow actors from Desert tileset editor.

---
 mods/ra/bits/desert/t04.des | Bin 0 -> 1007 bytes
 mods/ra/rules/civilian.yaml | 128 +++++++++++++++++++++++++++++++++++
 mods/ra/rules/defaults.yaml |  10 ++-
 mods/ra/rules/trees.yaml    |  62 ++++++++++++++++-
 mods/ra/sequences.yaml      | 131 ++++++++++++++++++++++++++++++++++++
 5 files changed, 327 insertions(+), 4 deletions(-)
 create mode 100644 mods/ra/bits/desert/t04.des

diff --git a/mods/ra/bits/desert/t04.des b/mods/ra/bits/desert/t04.des
new file mode 100644
index 0000000000000000000000000000000000000000..d79152c650aec037b4a7d1441017f9803f813972
GIT binary patch
literal 1007
zcmYLGO^6&t6n?L|dN#Y((gTWnQs$(H5*8mR&~#4^6RaNENJa^Q7m13XGOZCAWKh?x
zp4q62WPW;Q4vL^cmWX%}40wxwu;cD9I}<O#Lz*apr-0~nwR(5eF1o%~ufBS`_kBz7
z7CZ$jW_<+!F9XB|U>~58#}^Pv2vECngm<#T`%f5D@>p0<vd#UA)?xmOBmDUYZ&`V@
z|33|X0cbhB7uF+y(49UENhpif&I_P#mhRWJNgbfNUh^UJci#qGTYY4*20AF+k+|XH
zENB;wYdQH2iq*t-A>8{OCPM)1_+jYo)j<QiviA_I)@F}l<rmG1IKBr<ul@KEt{yMl
zSI2RJyC2~AW4!h`{&^kaE9i}|F+`D|=;6(T2}iT0)5R!ZZwSqV=pL&DQOow<bozyp
zEhlqCcR@J5ux-&R2;0Bmtn~}RDGN~@*sYf17>Jfy_9*4$mgA@V)S6RHxmpxTBkx<)
zHD?2P4|yB8Npz7<V}P$w4q51G7RmuvQn@Mjnx0H8)uc_7@fI-7hZg5NzLYCHH^fb*
z+)Yb)c|ctjL>;8A6}<Xn2UXWXn}1{wu~Se)o*QmpOXKo8C^gCr%YWJ)vgp`*rflE*
z-yAeELY^SsHT5;@KM#;Z-s}lzE7_PEe`sb5q4_5KblK!6n|%vOM)RvVp*sBoIzdD<
zE#QSfo+KLW{Qw=G$e*3Swxn`#QS+V0u~R-l3KlwfN9R}Il({k{X$dUh09FOJKSW^L
zUm`rPe<trE{*6VR8B;d$F||4LZ6c)_12iY10V>U|QOdTO8b!*t>`$q0#L$+_sb`s9
z%wzKZ+sdCUM3R(Ivd04ocsm!>xNy}>9go1&H=?UXY7x=l#+7-W@{BS{ZIX)AV3Fuj
zW@IIG(R8sOWR}Moql<i5WqzAAy!WkwFoHKzT#n5Y2a=vccvl)GWD1~=sObEPrlJK5
zR@$=Rm2THQ@bxl`pjy1Ej!7ivr%?ynL)?GtKnr8bGYAP$eMzg?8EgZ{%5B;ozmDgy
fe)rC0!yX&<>3`YJqOt7nv+y9^dJcd69pirh$R!Wm

literal 0
HcmV?d00001

diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index b8006d6e2b..f5d48243c1 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -38,6 +38,8 @@ V01:
 	Capturable:
 		Type: civilianbuilding
 		CaptureCompleteTime: 0
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V01.SNIPER:
 	Inherits: V01
@@ -61,75 +63,111 @@ V01.SNIPER:
 		SkipMakeAnims: true
 		BecomeNeutral: true
 	-Capturable:
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V02:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V03:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V04:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V05:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V06:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V07:
 	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V08:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V09:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V10:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V11:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V12:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V13:
 	Inherits: ^CivBuilding
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V14:
 	Inherits: ^CivField
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V15:
 	Inherits: ^CivField
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V16:
 	Inherits: ^CivField
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V17:
 	Inherits: ^CivField
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 V18:
 	Inherits: ^CivField
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 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..cb734be01c 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:
+		RequireTilesets: TEMPERAT,SNOW
 
 T02:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T03:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T05:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T06:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T07:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T08:
 	Inherits: ^Tree
@@ -40,55 +52,69 @@ T08:
 		Footprint: x_
 		Dimensions: 2,1
 	
-
 T10:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
 		Dimensions: 2,2
-	
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T11:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T12:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T13:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T14:
 	Inherits: ^Tree
 	Building:
 		Footprint: ___ xx_
 		Dimensions: 3,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T15:
 	Inherits: ^Tree
 	Building:
 		Footprint: ___ xx_
 		Dimensions: 3,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T16:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 T17:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 TC01:
 	Inherits: ^Tree
@@ -101,24 +127,32 @@ TC02:
 	Building:
 		Footprint: _x_ xx_
 		Dimensions: 3,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 TC03:
 	Inherits: ^Tree
 	Building:
 		Footprint: xx_ xx_
 		Dimensions: 3,2
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 TC04:
 	Inherits: ^Tree
 	Building:
 		Footprint: ____ xxx_ x___
 		Dimensions: 4,3
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 TC05:
 	Inherits: ^Tree
 	Building:
 		Footprint: __x_ xxx_ _xx_
 		Dimensions: 4,3
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 MINE:
 	Inherits: ^Tree
@@ -182,6 +216,8 @@ ICE01:
 		Dimensions: 2,2
 	Tooltip:
 		Name: Ice Floe
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 ICE02:
 	Inherits: ^Tree
@@ -190,6 +226,8 @@ ICE02:
 		Dimensions: 1,2
 	Tooltip:
 		Name: Ice Floe
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 ICE03:
 	Inherits: ^Tree
@@ -198,16 +236,22 @@ ICE03:
 		Dimensions: 2,1
 	Tooltip:
 		Name: Ice Floe
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 ICE04:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Ice Floe
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 ICE05:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Ice Floe
+	EditorTilesetFilter:
+		RequireTilesets: TEMPERAT,SNOW
 
 # 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

From f3e796e972d91f5409f1efe38c2fcc4b6bd38f37 Mon Sep 17 00:00:00 2001
From: Curtis Shmyr <cjshmyr@gmail.com>
Date: Sun, 25 Nov 2012 17:33:29 -0700
Subject: [PATCH 2/3] RA Desert - Removed fenc.des which was another barbed
 wire shp

---
 mods/ra/bits/desert/fenc.des | Bin 4707 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 mods/ra/bits/desert/fenc.des

diff --git a/mods/ra/bits/desert/fenc.des b/mods/ra/bits/desert/fenc.des
deleted file mode 100644
index 2081cbbd92ea9f7c33ed462834744eaec7971625..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4707
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
XPd4r(o5yhe|MU3)`FZ$%&$9mlj?W@;


From 87a2817234a037b3d87b2b65e37e69c4c072c6e6 Mon Sep 17 00:00:00 2001
From: Curtis Shmyr <cjshmyr@gmail.com>
Date: Sun, 25 Nov 2012 18:16:08 -0700
Subject: [PATCH 3/3] RA Desert - Use ExcludeTileset instead of RequiresTileset
 for specific tileset actors (looks cleaner)

---
 mods/ra/rules/civilian.yaml | 38 +++++++++++++++---------------
 mods/ra/rules/trees.yaml    | 46 ++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml
index f5d48243c1..c05beecec1 100644
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -39,7 +39,7 @@ V01:
 		Type: civilianbuilding
 		CaptureCompleteTime: 0
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V01.SNIPER:
 	Inherits: V01
@@ -64,7 +64,7 @@ V01.SNIPER:
 		BecomeNeutral: true
 	-Capturable:
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V02:
 	Inherits: ^CivBuilding
@@ -72,7 +72,7 @@ V02:
 		Footprint: xx xx
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V03:
 	Inherits: ^CivBuilding
@@ -80,7 +80,7 @@ V03:
 		Footprint: xx xx
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V04:
 	Inherits: ^CivBuilding
@@ -88,7 +88,7 @@ V04:
 		Footprint: xx xx
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V05:
 	Inherits: ^CivBuilding
@@ -96,7 +96,7 @@ V05:
 		Footprint: xx
 		Dimensions: 2,1
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V06:
 	Inherits: ^CivBuilding
@@ -104,7 +104,7 @@ V06:
 		Footprint: xx
 		Dimensions: 2,1
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V07:
 	Inherits: ^CivBuilding
@@ -112,62 +112,62 @@ V07:
 		Footprint: xx
 		Dimensions: 2,1
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V08:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V09:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V10:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V11:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V12:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V13:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V14:
 	Inherits: ^CivField
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V15:
 	Inherits: ^CivField
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V16:
 	Inherits: ^CivField
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V17:
 	Inherits: ^CivField
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 V18:
 	Inherits: ^CivField
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 BARL:
 	Inherits: ^CivBuilding
diff --git a/mods/ra/rules/trees.yaml b/mods/ra/rules/trees.yaml
index cb734be01c..72dbba8619 100644
--- a/mods/ra/rules/trees.yaml
+++ b/mods/ra/rules/trees.yaml
@@ -4,7 +4,7 @@ T01:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T02:
 	Inherits: ^Tree
@@ -12,7 +12,7 @@ T02:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T03:
 	Inherits: ^Tree
@@ -20,7 +20,7 @@ T03:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T05:
 	Inherits: ^Tree
@@ -28,7 +28,7 @@ T05:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T06:
 	Inherits: ^Tree
@@ -36,7 +36,7 @@ T06:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T07:
 	Inherits: ^Tree
@@ -44,7 +44,7 @@ T07:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T08:
 	Inherits: ^Tree
@@ -58,7 +58,7 @@ T10:
 		Footprint: __ xx
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T11:
 	Inherits: ^Tree
@@ -66,7 +66,7 @@ T11:
 		Footprint: __ xx
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T12:
 	Inherits: ^Tree
@@ -74,7 +74,7 @@ T12:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T13:
 	Inherits: ^Tree
@@ -82,7 +82,7 @@ T13:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T14:
 	Inherits: ^Tree
@@ -90,7 +90,7 @@ T14:
 		Footprint: ___ xx_
 		Dimensions: 3,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T15:
 	Inherits: ^Tree
@@ -98,7 +98,7 @@ T15:
 		Footprint: ___ xx_
 		Dimensions: 3,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T16:
 	Inherits: ^Tree
@@ -106,7 +106,7 @@ T16:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 T17:
 	Inherits: ^Tree
@@ -114,7 +114,7 @@ T17:
 		Footprint: __ x_
 		Dimensions: 2,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 TC01:
 	Inherits: ^Tree
@@ -128,7 +128,7 @@ TC02:
 		Footprint: _x_ xx_
 		Dimensions: 3,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 TC03:
 	Inherits: ^Tree
@@ -136,7 +136,7 @@ TC03:
 		Footprint: xx_ xx_
 		Dimensions: 3,2
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 TC04:
 	Inherits: ^Tree
@@ -144,7 +144,7 @@ TC04:
 		Footprint: ____ xxx_ x___
 		Dimensions: 4,3
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 TC05:
 	Inherits: ^Tree
@@ -152,7 +152,7 @@ TC05:
 		Footprint: __x_ xxx_ _xx_
 		Dimensions: 4,3
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 MINE:
 	Inherits: ^Tree
@@ -217,7 +217,7 @@ ICE01:
 	Tooltip:
 		Name: Ice Floe
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 ICE02:
 	Inherits: ^Tree
@@ -227,7 +227,7 @@ ICE02:
 	Tooltip:
 		Name: Ice Floe
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 ICE03:
 	Inherits: ^Tree
@@ -237,21 +237,21 @@ ICE03:
 	Tooltip:
 		Name: Ice Floe
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 ICE04:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Ice Floe
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 ICE05:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Ice Floe
 	EditorTilesetFilter:
-		RequireTilesets: TEMPERAT,SNOW
+		ExcludeTilesets: DESERT
 
 # Desert Terrain Expansion
 ROCK1: