Merge remote-tracking branch 'refs/remotes/origin/fge_logic' into dev

BEEmod · Mar 10, 2016 · d15c727 · d15c727
2 parents e8bfec0 + 66cdee2
commit d15c727
Show file tree

Hide file tree

Showing 11 changed files with 192 additions and 258 deletions.
diff --git a/packages/hmw/info.txt b/packages/hmw/info.txt
@@ -50,6 +50,7 @@
 "Item"
 	{
 	"ID" "ITEM_LOGIC_GATE"
+	"all_conf"  "logic_gate.cfg"
 	"Version"
 		{
 		"Styles"

diff --git a/packages/hmw/items/logic_clean/editoritems.txt b/packages/hmw/items/logic_clean/editoritems.txt
@@ -90,44 +90,51 @@
 		{
 		"Instances"
 			{
+			"frame" "instances/BEE2/clean/items/hmw/logic/frame.vmf"
+
+			"nand" "instances/BEE2/clean/items/hmw/logic/nand.vmf"
+			"nor" "instances/BEE2/clean/items/hmw/logic/nor.vmf"
+			"nxor" "instances/BEE2/clean/items/hmw/logic/nxor.vmf"
+
 			"0"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_and.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/and.vmf"
 				"EntityCount"       "20"
 				"BrushCount"        "28"
 				"BrushSideCount"    "176"
 				}
 			"1"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_and.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/and.vmf"
 				"EntityCount"       "20"
 				"BrushCount"        "28"
 				"BrushSideCount"    "176"
 				}
+
 			"2"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_or.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/or.vmf"
 				"EntityCount"       "20"
 				"BrushCount"        "30"
 				"BrushSideCount"    "188"
 				}
 			"3"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_or.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/or.vmf"
 				"EntityCount"       "20"
 				"BrushCount"        "30"
 				"BrushSideCount"    "188"
 				}
 			"4"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_xor.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/xor.vmf"
 				"EntityCount"       "19"
 				"BrushCount"        "31"
 				"BrushSideCount"    "190"
 				}
 			"5"
 				{
-				"Name"          "instances/BEE2/clean/items/hmw/logic/logic_xor.vmf"
+				"Name"              "instances/BEE2/clean/items/hmw/logic/xor.vmf"
 				"EntityCount"       "19"
 				"BrushCount"        "31"
 				"BrushSideCount"    "190"

diff --git a/packages/hmw/items/logic_clean/vbsp_config.cfg b/packages/hmw/items/logic_clean/vbsp_config.cfg
diff --git a/packages/hmw/items/logic_gate.cfg b/packages/hmw/items/logic_gate.cfg
@@ -0,0 +1,42 @@
+"Conditions"
+	{
+	"Condition"
+		{
+		"instance"	"<ITEM_LOGIC_GATE>"
+		"Result"
+			{
+			"addOverlay"
+				{
+				"File"	"<ITEM_LOGIC_GATE:bee2_frame>"
+				}
+			}
+		"Condition"
+			{
+			"instvar"	"$start_enabled 1"
+			"Condition"
+				{
+				"instance"	"<ITEM_LOGIC_GATE:btn_weighted>"
+				"Result"
+					{
+					"changeinstance"  "<ITEM_LOGIC_GATE:bee2_nand>"
+					}
+				}
+			"Condition"
+				{
+				"instance"	"<ITEM_LOGIC_GATE:btn_cube>"
+				"Result"
+					{
+					"changeinstance"  "<ITEM_LOGIC_GATE:bee2_nor>"
+					}
+				}
+			"Condition"
+				{
+				"instance"	"<ITEM_LOGIC_GATE:btn_sphere>"
+				"Result"
+					{
+					"changeinstance"  "<ITEM_LOGIC_GATE:bee2_nor>"
+					}
+				}
+			}
+		}
+	}
diff --git a/...ances/clean/items/hmw/logic/logic_and.vmf → ...s/instances/clean/items/hmw/logic/and.vmf b/...ances/clean/items/hmw/logic/logic_and.vmf → ...s/instances/clean/items/hmw/logic/and.vmf