Merge pull request #7747 from reaperrr/ra-tent-fix

Made RA tent art tileset-specific again
2015-03-28 16:22:40 +01:00
parent c32631de9b 2a6f69345d
commit 2cf53f0e13
9 changed files with 6 additions and 3 deletions
--- a/mods/ra/bits/desert/barb.des
+++ b/mods/ra/bits/desert/barb.des
--- a/mods/ra/bits/desert/brik.des
+++ b/mods/ra/bits/desert/brik.des
--- a/mods/ra/bits/desert/cycl.des
+++ b/mods/ra/bits/desert/cycl.des
--- a/mods/ra/bits/desert/sbag.des
+++ b/mods/ra/bits/desert/sbag.des
--- a/mods/ra/bits/desert/wood.des
+++ b/mods/ra/bits/desert/wood.des
--- a/mods/ra/bits/tent.tem
+++ b/mods/ra/bits/tent.tem
--- a/mods/ra/bits/tentmake.tem
+++ b/mods/ra/bits/tentmake.tem
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -171,6 +171,7 @@ moveflsh:
 		UseTilesetExtension: true
 		TilesetOverrides:
 			DESERT: TEMPERAT
+
 select:
 	repair:
 		Start: 2
--- a/mods/ra/sequences/structures.yaml
+++ b/mods/ra/sequences/structures.yaml
@@ -154,6 +154,10 @@ barr:
 	icon: barricon

 tent:
+	Defaults:
+		UseTilesetExtension: true
+		TilesetOverrides:
+			INTERIOR: TEMPERAT
 	idle:
 		Length: 10
 	damaged-idle:
@@ -163,10 +167,8 @@ tent:
 		Length: *
 	bib: bib3
 		Length: *
-		UseTilesetExtension: true
-		TilesetOverrides:
-			INTERIOR: TEMPERAT
 	icon: tenticon
+		UseTilesetExtension: false

 kenn:
 	idle: