From 6e978db1da2eb1b265a410db30cebae015b79c1b Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 27 Jul 2019 10:09:56 +0100
Subject: [PATCH] Extract a ^Box template to reduce duplication.

---
 mods/ra/rules/decoration.yaml | 72 +++++------------------------------
 mods/ra/rules/defaults.yaml   |  9 +++++
 2 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/mods/ra/rules/decoration.yaml b/mods/ra/rules/decoration.yaml
index ef94184110..d1f6581040 100644
--- a/mods/ra/rules/decoration.yaml
+++ b/mods/ra/rules/decoration.yaml
@@ -214,85 +214,31 @@ TC05:
 		Actor: TC05.Husk
 
 BOXES01:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES02:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES03:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES04:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES05:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES06:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES07:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES08:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 BOXES09:
-	Inherits: ^Tree
-	RenderSprites:
-		Palette: player
-	Tooltip:
-		Name: Boxes
-	MapEditorData:
-		Categories: Decoration
+	Inherits: ^Box
 
 ICE01:
 	Inherits: ^Tree
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 7074b44868..c722c43f74 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -970,6 +970,15 @@
 	RequiresSpecificOwners:
 		ValidOwnerNames: Neutral
 
+^Box:
+	Inherits: ^Tree
+	RenderSprites:
+		Palette: player
+	Tooltip:
+		Name: Boxes
+	MapEditorData:
+		Categories: Decoration
+
 ^BasicHusk:
 	Inherits@1: ^SpriteActor
 	Interactable: