From 8e8a66df7653e1a1017cf8a46bdac3bc9a40e73b Mon Sep 17 00:00:00 2001
From: Maikel de Vries <mdt.maikel@gmail.com>
Date: Mon, 28 Dec 2015 00:31:15 +0100
Subject: [PATCH] category for non-structures to C4D_None

These objects are not intended to be constructed as structures (the hammer menu) and should therefore not be structures.
---
 .../Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt    | 4 ++--
 .../Environment.ocd/Bricks.ocd/MovingBrick.ocd/Script.c       | 1 +
 planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt     | 2 +-
 planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c        | 1 +
 .../Tools.ocd/Ropebridge.ocd/BridgePost.ocd/DefCore.txt       | 2 +-
 .../Tools.ocd/Ropebridge.ocd/BridgePost.ocd/Script.c          | 1 +
 .../Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c   | 2 +-
 planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt   | 2 +-
 planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c      | 1 +
 .../Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt    | 2 +-
 .../Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c       | 1 +
 11 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt
index 860f683ee..a7c9b7104 100644
--- a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/DefCore.txt
@@ -1,10 +1,10 @@
 [DefCore]
 id=MovingBrick
 Version=6,0
-Category=C4D_Structure
+Category=C4D_None
 Width=40
 Height=8
 Offset=-20,-4
 SolidMask=0,0,40,8,0,0
 Mass=10
-Components=Wood=6;Metal=2;
+Components=Rock=2;
diff --git a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/Script.c
index a9f7bf85b..b1499415e 100644
--- a/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/Script.c
+++ b/planet/Objects.ocd/Environment.ocd/Bricks.ocd/MovingBrick.ocd/Script.c
@@ -136,3 +136,4 @@ local ActMap = {
 	},
 };
 local Name = "MovingBrick";
+local Plane = 600;
diff --git a/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt b/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt
index 12fb6dbca..83ca10f0f 100644
--- a/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Environment.ocd/Column.ocd/DefCore.txt
@@ -1,7 +1,7 @@
 [DefCore]
 id=Column
 Version=6,0
-Category=C4D_Structure
+Category=C4D_None
 Width=20
 Height=50
 Offset=-10,-50
diff --git a/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c b/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c
index a783ffd0a..bcaf4857b 100644
--- a/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c
+++ b/planet/Objects.ocd/Environment.ocd/Column.ocd/Script.c
@@ -36,3 +36,4 @@ protected func Damage()
 	return;
 }
 local Name = "$Name$";
+local Plane = 600;
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/DefCore.txt b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/DefCore.txt
index 0938da9c2..a2f40fabb 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/DefCore.txt
@@ -1,7 +1,7 @@
 [DefCore]
 id=Ropebridge_Post
 Version=6,0
-Category=C4D_Structure
+Category=C4D_None
 Picture=0,0,96,128
 Width=12
 Height=16
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/Script.c
index 9659a5bf7..9c3be377a 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/Script.c
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/BridgePost.ocd/Script.c
@@ -99,4 +99,5 @@ local ActMap = {
 };
 local Name = "$Name$";
 local Description = "$Description$";
+local Plane = 600;
 	
diff --git a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c
index ffb8907eb..fbf67d3e7 100644
--- a/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c
+++ b/planet/Objects.ocd/Items.ocd/Tools.ocd/Ropebridge.ocd/Script.c
@@ -1,5 +1,5 @@
 /**
-	Ropebridge
+	Rope bridge
 	A bridge consisting of single wooden planks tied together with ropes.
 
 	@author Randrian
diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt
index f6bff4da4..13177d037 100644
--- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/DefCore.txt
@@ -1,7 +1,7 @@
 [DefCore]
 id=StoneDoor
 Version=6,0
-Category=C4D_Structure
+Category=C4D_None
 Width=8
 Height=40
 Offset=-4,-20
diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c
index 8e53319bf..370af686a 100644
--- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c
+++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/Script.c
@@ -177,3 +177,4 @@ local ActMap = {
 };
 local Name = "$Name$";
 local EditCursorCommands = ["OpenDoor()", "CloseDoor()"];
+local Plane = 600;
diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt
index 26daa6a1a..18abf0b94 100644
--- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt
+++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/DefCore.txt
@@ -1,7 +1,7 @@
 [DefCore]
 id=SpinWheel
 Version=6,0
-Category=C4D_Structure
+Category=C4D_None
 Width=16
 Height=16
 Offset=-8,-8
diff --git a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
index 73818352b..2635473dc 100644
--- a/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
+++ b/planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
@@ -94,6 +94,7 @@ local ActMap = {
 local Name = "$Name$";
 local Touchable = 2;
 local EditCursorCommands = ["ControlUp()", "ControlDown()", "ConnectNearestDoor()"];
+local Plane = 600;
 
 func Definition(def)
 {