Make Gate more independent from Building and pausable-conditional

Replace Gate IsDisabled checks with IsTraitDisabled/Paused checks
2017-11-19 17:10:29 +01:00
parent 383840135f
commit c1cba4ecc1
6 changed files with 93 additions and 37 deletions
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -707,22 +707,22 @@
 		Type: Heavy
 	LineBuildNode:
 		Types: concrete, gate
-	-Building:
 	-WithSpriteBody:
 	WithGateSpriteBody:
 	Tooltip:
 		Name: Gate
-	Gate:
-		BlocksProjectilesHeight: 0
+	Building:
 		BuildSounds: place2.aud
-		OpeningSound: cashturn.aud
-		ClosingSound: cashturn.aud
 		TerrainTypes: Clear, Road
 	RequiresBuildableArea:
 		AreaTypes: building
 		Adjacent: 4
 	EditorTilesetFilter:
 		Categories: Wall
+	Gate:
+		OpeningSound: cashturn.aud
+		ClosingSound: cashturn.aud
+		BlocksProjectilesHeight: 0

 ^TechBuilding:
 	Inherits: ^BasicBuilding
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -1912,7 +1912,7 @@ VGATE:
 		Type: Rectangle
 			TopLeft: -512, -1536
 			BottomRight: 512, 1536
-	Gate:
+	Building:
 		Footprint: x x x
 		Dimensions: 1,3
 	WithGateSpriteBody:
@@ -1929,7 +1929,7 @@ HGATE:
 		Type: Rectangle
 			TopLeft: -1536, -512
 			BottomRight: 1536, 512
-	Gate:
+	Building:
 		Footprint: xxx
 		Dimensions: 3,1
 	WithGateSpriteBody: