From ae805e753dbc00e5aec20693f32c8a3e76a7e190 Mon Sep 17 00:00:00 2001 From: TeamSpen210 Date: Thu, 3 Mar 2016 17:29:06 +1000 Subject: [PATCH] Move vbsp_config to all_config --- packages/hmw/info.txt | 1 + .../hmw/items/logic_clean/editoritems.txt | 19 +- .../hmw/items/logic_clean/vbsp_config.cfg | 45 --- packages/hmw/items/logic_gate.cfg | 42 +++ .../hmw/logic/{logic_and.vmf => and.vmf} | 0 .../hmw/logic/{logic_frame.vmf => frame.vmf} | 343 +++++++----------- .../hmw/logic/{logic_nand.vmf => nand.vmf} | 0 .../hmw/logic/{logic_nor.vmf => nor.vmf} | 0 .../items/hmw/logic/{logic_or.vmf => or.vmf} | 0 .../hmw/logic/{logic_xnor.vmf => xnor.vmf} | 0 .../hmw/logic/{logic_xor.vmf => xor.vmf} | 0 11 files changed, 192 insertions(+), 258 deletions(-) delete mode 100644 packages/hmw/items/logic_clean/vbsp_config.cfg create mode 100644 packages/hmw/items/logic_gate.cfg rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_and.vmf => and.vmf} (100%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_frame.vmf => frame.vmf} (83%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_nand.vmf => nand.vmf} (100%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_nor.vmf => nor.vmf} (100%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_or.vmf => or.vmf} (100%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_xnor.vmf => xnor.vmf} (100%) rename packages/hmw/resources/instances/clean/items/hmw/logic/{logic_xor.vmf => xor.vmf} (100%) diff --git a/packages/hmw/info.txt b/packages/hmw/info.txt index 7d9f549ab7..a146ef13aa 100644 --- 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 index 60356feada..7ed2a25ab1 100644 --- 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 deleted file mode 100644 index 3f844c4844..0000000000 --- a/packages/hmw/items/logic_clean/vbsp_config.cfg +++ /dev/null @@ -1,45 +0,0 @@ -"Conditions" - { - "Condition" - { - "instance" "" - "Result" - { - "addOverlay" - { - "File" "instances/BEE2/clean/items/hmw/logic/logic_frame.vmf" - } - "Condition" - { - "instvar" "$start_enabled 1" - "Result" - { - "Condition" - { - "instance" "instances/BEE2/clean/items/hmw/logic/logic_and.vmf" - "Result" - { - "changeinstance" "instances/BEE2/clean/items/hmw/logic/logic_nand.vmf" - } - } - "Condition" - { - "instance" "instances/BEE2/clean/items/hmw/logic/logic_or.vmf" - "Result" - { - "changeinstance" "instances/BEE2/clean/items/hmw/logic/logic_nor.vmf" - } - } - "Condition" - { - "instance" "instances/BEE2/clean/items/hmw/logic/logic_xor.vmf" - "Result" - { - "changeinstance" "instances/BEE2/clean/items/hmw/logic/logic_xnor.vmf" - } - } - } - } - } - } - } \ No newline at end of file diff --git a/packages/hmw/items/logic_gate.cfg b/packages/hmw/items/logic_gate.cfg new file mode 100644 index 0000000000..2d1e5688aa --- /dev/null +++ b/packages/hmw/items/logic_gate.cfg @@ -0,0 +1,42 @@ +"Conditions" + { + "Condition" + { + "instance" "" + "Result" + { + "addOverlay" + { + "File" "" + } + } + "Condition" + { + "instvar" "$start_enabled 1" + "Condition" + { + "instance" "" + "Result" + { + "changeinstance" "" + } + } + "Condition" + { + "instance" "" + "Result" + { + "changeinstance" "" + } + } + "Condition" + { + "instance" "" + "Result" + { + "changeinstance" "" + } + } + } + } + } \ No newline at end of file diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_and.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/and.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_and.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/and.vmf diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_frame.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/frame.vmf similarity index 83% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_frame.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/frame.vmf index 1d8499bfd3..42bfa62076 100644 --- a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_frame.vmf +++ b/packages/hmw/resources/instances/clean/items/hmw/logic/frame.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "6432" - "mapversion" "98" + "mapversion" "100" "formatversion" "100" "prefab" "0" } @@ -14,13 +14,13 @@ viewsettings "bSnapToGrid" "1" "bShowGrid" "1" "bShowLogicalGrid" "0" - "nGridSpacing" "16" + "nGridSpacing" "1" "bShow3DGrid" "0" } world { "id" "1" - "mapversion" "98" + "mapversion" "100" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -29,33 +29,22 @@ world "skyname" "sky_day01_01" solid { - "id" "1009" + "id" "1452" side { - "id" "707" - "plane" "(-36 -36 -72) (-36 36 -72) (-36 36 -68)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "706" - "plane" "(-32 -32 -64) (-32 32 -64) (-28 28 -64)" + "id" "1397" + "plane" "(28 -28 -64) (28 28 -64) (32 32 -64)" "material" "SIGNAGE/SIGNAGE_BORDER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 1 0 0] 0.25" + "rotation" "180" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "705" - "plane" "(-36 36 -72) (-36 -36 -72) (-28 -28 -72)" + "id" "1396" + "plane" "(28 28 -68) (28 -28 -68) (32 -32 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 -1 0 0] 0.25" @@ -65,21 +54,21 @@ world } side { - "id" "704" - "plane" "(-36 -36 -68) (-36 36 -68) (-32 32 -64)" - "material" "TOOLS/TOOLSNODRAW" + "id" "1395" + "plane" "(28 -28 -68) (28 28 -68) (28 28 -64)" + "material" "TOOLS/TOOLSBLACK" "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[-0.707107 0 -0.707107 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "703" - "plane" "(-28 28 -72) (-28 -28 -72) (-28 -28 -64)" - "material" "TOOLS/TOOLSBLACK" - "uaxis" "[0 1 0 0] 0.25" + "id" "1394" + "plane" "(28 28 -68) (32 32 -68) (32 32 -64)" + "material" "TOOLS/TOOLSNODRAW" + "uaxis" "[-0.707107 -0.707107 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -87,10 +76,10 @@ world } side { - "id" "702" - "plane" "(-28 -28 -72) (-36 -36 -72) (-36 -36 -68)" + "id" "1393" + "plane" "(32 -32 -68) (28 -28 -68) (28 -28 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0.707107 0.707107 0 0] 0.25" + "uaxis" "[0.707107 -0.707107 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -98,10 +87,10 @@ world } side { - "id" "701" - "plane" "(-36 36 -68) (-36 36 -72) (-28 28 -72)" + "id" "1392" + "plane" "(32 32 -68) (32 -32 -68) (32 -32 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-0.707107 0.707107 0 0] 0.25" + "uaxis" "[0 1 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -109,87 +98,75 @@ world } editor { - "color" "133 150 0" - "groupid" "1041" + "color" "0 223 252" "visgroupshown" "1" "visgroupautoshown" "1" } } solid { - "id" "1010" - side - { - "id" "727" - "plane" "(36 36 -72) (36 -36 -72) (36 -36 -68)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } + "id" "1483" side { - "id" "726" - "plane" "(32 32 -64) (32 -32 -64) (28 -28 -64)" + "id" "1445" + "plane" "(-32 -32 -64) (-28 -28 -64) (28 -28 -64)" "material" "SIGNAGE/SIGNAGE_BORDER" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 1 0 0] 0.25" - "rotation" "180" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[1 0 0 0] 0.25" + "rotation" "90" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "725" - "plane" "(36 -36 -72) (36 36 -72) (28 28 -72)" + "id" "1444" + "plane" "(32 -32 -68) (28 -28 -68) (-28 -28 -68)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[-1 0 0 0] 0.25" + "rotation" "90" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "724" - "plane" "(36 36 -68) (36 -36 -68) (32 -32 -64)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[0.707107 0 -0.707107 0] 0.25" - "rotation" "0" + "id" "1443" + "plane" "(-28 -28 -68) (28 -28 -68) (28 -28 -64)" + "material" "TOOLS/TOOLSBLACK" + "uaxis" "[0 0 1 0] 0.25" + "vaxis" "[-1 0 0 0] 0.25" + "rotation" "90" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "723" - "plane" "(28 -28 -72) (28 28 -72) (28 28 -64)" - "material" "TOOLS/TOOLSBLACK" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" + "id" "1442" + "plane" "(28 -28 -68) (32 -32 -68) (32 -32 -64)" + "material" "TOOLS/TOOLSNODRAW" + "uaxis" "[0 0 1 0] 0.25" + "vaxis" "[-0.707107 0.707107 0 0] 0.25" + "rotation" "90" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "722" - "plane" "(28 28 -72) (36 36 -72) (36 36 -68)" + "id" "1441" + "plane" "(-32 -32 -68) (-28 -28 -68) (-28 -28 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-0.707107 -0.707107 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" + "uaxis" "[0 0 1 0] 0.25" + "vaxis" "[-0.707107 -0.707107 0 0] 0.25" + "rotation" "90" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "721" - "plane" "(36 -36 -68) (36 -36 -72) (28 -28 -72)" + "id" "1440" + "plane" "(32 -32 -68) (-32 -32 -68) (-32 -32 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0.707107 -0.707107 0 0] 0.25" + "uaxis" "[1 0 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -197,129 +174,105 @@ world } editor { - "color" "133 150 0" - "groupid" "1041" + "color" "0 189 186" "visgroupshown" "1" "visgroupautoshown" "1" } } solid { - "id" "1014" - side - { - "id" "766" - "plane" "(36 -36 -72) (-36 -36 -72) (-36 -36 -68)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[1 0 0 0] 0.25" - "rotation" "90" - "lightmapscale" "16" - "smoothing_groups" "0" - } + "id" "1484" side { - "id" "765" - "plane" "(32 -32 -64) (-32 -32 -64) (-28 -28 -64)" + "id" "1451" + "plane" "(32 32 -64) (28 28 -64) (-28 28 -64)" "material" "SIGNAGE/SIGNAGE_BORDER" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[1 0 0 0] 0.25" - "rotation" "90" + "uaxis" "[0 -1 0 0] 0.25" + "vaxis" "[-1 0 0 0] 0.25" + "rotation" "270" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "764" - "plane" "(-36 -36 -72) (36 -36 -72) (28 -28 -72)" + "id" "1450" + "plane" "(-32 32 -68) (-28 28 -68) (28 28 -68)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "90" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "763" - "plane" "(36 -36 -68) (-36 -36 -68) (-32 -32 -64)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 0.707106 0.707107 0] 0.25" - "vaxis" "[1 0 0 0] 0.25" - "rotation" "90" + "id" "1449" + "plane" "(28 28 -68) (-28 28 -68) (-28 28 -64)" + "material" "TOOLS/TOOLSBLACK" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "762" - "plane" "(-28 -28 -72) (28 -28 -72) (28 -28 -64)" - "material" "TOOLS/TOOLSBLACK" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "90" + "id" "1448" + "plane" "(-28 28 -68) (-32 32 -68) (-32 32 -64)" + "material" "TOOLS/TOOLSNODRAW" + "uaxis" "[0.707107 -0.707106 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "761" - "plane" "(28 -28 -72) (36 -36 -72) (36 -36 -68)" + "id" "1447" + "plane" "(32 32 -68) (28 28 -68) (28 28 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[-0.707107 0.707107 0 0] 0.25" - "rotation" "90" + "uaxis" "[0.707107 0.707107 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "760" - "plane" "(-36 -36 -68) (-36 -36 -72) (-28 -28 -72)" + "id" "1446" + "plane" "(-32 32 -68) (32 32 -68) (32 32 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[-0.707107 -0.707107 0 0] 0.25" - "rotation" "90" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } editor { - "color" "133 150 0" - "groupid" "1041" + "color" "0 215 184" "visgroupshown" "1" "visgroupautoshown" "1" } } solid { - "id" "1017" - side - { - "id" "785" - "plane" "(-36 36 -72) (36 36 -72) (36 36 -68)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } + "id" "1485" side { - "id" "784" - "plane" "(-32 32 -64) (32 32 -64) (28 28 -64)" + "id" "1457" + "plane" "(-32 -32 -64) (-32 32 -64) (-28 28 -64)" "material" "SIGNAGE/SIGNAGE_BORDER" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "270" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "783" - "plane" "(36 36 -72) (-36 36 -72) (-28 28 -72)" + "id" "1456" + "plane" "(-32 -32 -68) (-28 -28 -68) (-28 28 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 -1 0 0] 0.25" @@ -329,21 +282,21 @@ world } side { - "id" "782" - "plane" "(-36 36 -68) (36 36 -68) (32 32 -64)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 0.707107 -0.707107 0] 0.25" + "id" "1455" + "plane" "(-28 28 -68) (-28 -28 -68) (-28 -28 -64)" + "material" "TOOLS/TOOLSBLACK" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" } side { - "id" "781" - "plane" "(28 28 -72) (-28 28 -72) (-28 28 -64)" - "material" "TOOLS/TOOLSBLACK" - "uaxis" "[1 0 0 0] 0.25" + "id" "1454" + "plane" "(-28 -28 -68) (-32 -32 -68) (-32 -32 -64)" + "material" "TOOLS/TOOLSNODRAW" + "uaxis" "[0.707107 0.707107 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -351,10 +304,10 @@ world } side { - "id" "780" - "plane" "(-28 28 -72) (-36 36 -72) (-36 36 -68)" + "id" "1453" + "plane" "(-32 32 -68) (-28 28 -68) (-28 28 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0.707107 -0.707106 0 0] 0.25" + "uaxis" "[-0.707107 0.707107 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -362,10 +315,10 @@ world } side { - "id" "779" - "plane" "(36 36 -68) (36 36 -72) (28 28 -72)" + "id" "1452" + "plane" "(-32 -32 -68) (-32 32 -68) (-32 32 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0.707107 0.707107 0 0] 0.25" + "uaxis" "[0 1 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" "rotation" "0" "lightmapscale" "16" @@ -373,8 +326,7 @@ world } editor { - "color" "133 150 0" - "groupid" "1041" + "color" "0 157 146" "visgroupshown" "1" "visgroupautoshown" "1" } @@ -396,7 +348,7 @@ world side { "id" "400" - "plane" "(-28 28 -72) (-28 -28 -72) (28 -28 -72)" + "plane" "(-28 28 -70) (-28 -28 -70) (28 -28 -70)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 -1 0 0] 0.25" @@ -407,7 +359,7 @@ world side { "id" "401" - "plane" "(-28 -28 -72) (-28 28 -72) (-28 28 -68)" + "plane" "(-28 -28 -70) (-28 28 -70) (-28 28 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[0 -1 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -418,7 +370,7 @@ world side { "id" "402" - "plane" "(28 28 -72) (28 -28 -72) (28 -28 -68)" + "plane" "(28 28 -70) (28 -28 -70) (28 -28 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[0 1 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -429,7 +381,7 @@ world side { "id" "403" - "plane" "(-28 28 -72) (28 28 -72) (28 28 -68)" + "plane" "(-28 28 -70) (28 28 -70) (28 28 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -440,7 +392,7 @@ world side { "id" "404" - "plane" "(28 -28 -72) (-28 -28 -72) (-28 -28 -68)" + "plane" "(28 -28 -70) (-28 -28 -70) (-28 -28 -68)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[1 0 0 0] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -450,18 +402,7 @@ world } editor { - "color" "133 150 0" - "groupid" "1041" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - group - { - "id" "1041" - editor - { - "color" "133 150 0" + "color" "0 189 230" "visgroupshown" "1" "visgroupautoshown" "1" } @@ -786,25 +727,12 @@ entity entity { "id" "1432" - "classname" "func_brush" - "disableflashlight" "0" - "disablereceiveshadows" "0" - "disableshadowdepth" "0" - "disableshadows" "0" - "drawinfastreflection" "0" - "InputFilter" "0" - "invert_exclusion" "0" - "origin" "0 0 -65" - "renderamt" "255" - "rendercolor" "255 255 255" - "renderfx" "0" - "rendermode" "0" - "shadowdepthnocache" "0" - "solidbsp" "0" - "Solidity" "0" - "spawnflags" "2" - "StartDisabled" "0" - "vrad_brush_cast_shadows" "0" + "classname" "func_detail" + "disableX360" "0" + "maxcpulevel" "0" + "maxgpulevel" "0" + "mincpulevel" "0" + "mingpulevel" "0" solid { "id" "1430" @@ -876,14 +804,14 @@ entity } editor { - "color" "220 30 220" + "color" "0 180 0" "visgroupshown" "1" "visgroupautoshown" "1" } } editor { - "color" "220 30 220" + "color" "0 180 0" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 -11768]" @@ -1107,6 +1035,7 @@ entity { "id" "242" "classname" "func_noportal_volume" + "origin" "0 0 -64.5" "spawnflags" "0" solid { @@ -1125,7 +1054,7 @@ entity side { "id" "265" - "plane" "(-32 32 -72) (-32 -32 -72) (32 -32 -72)" + "plane" "(-32 32 -66) (-32 -32 -66) (32 -32 -66)" "material" "TOOLS/TOOLSINVISIBLE" "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 -1 0 0] 0.25" @@ -1136,7 +1065,7 @@ entity side { "id" "264" - "plane" "(-32 -32 -72) (-32 32 -72) (-32 32 -63)" + "plane" "(-32 -32 -66) (-32 32 -66) (-32 32 -63)" "material" "TOOLS/TOOLSINVISIBLE" "uaxis" "[0 1 0 0] 0.25" "vaxis" "[0 0 -1 -28] 0.25" @@ -1147,7 +1076,7 @@ entity side { "id" "263" - "plane" "(32 32 -72) (32 -32 -72) (32 -32 -63)" + "plane" "(32 32 -66) (32 -32 -66) (32 -32 -63)" "material" "TOOLS/TOOLSINVISIBLE" "uaxis" "[0 1 0 0] 0.25" "vaxis" "[0 0 -1 -28] 0.25" @@ -1158,7 +1087,7 @@ entity side { "id" "262" - "plane" "(-32 32 -72) (32 32 -72) (32 32 -63)" + "plane" "(-32 32 -66) (32 32 -66) (32 32 -63)" "material" "TOOLS/TOOLSINVISIBLE" "uaxis" "[1 0 0 0] 0.25" "vaxis" "[0 0 -1 -28] 0.25" @@ -1169,7 +1098,7 @@ entity side { "id" "261" - "plane" "(32 -32 -72) (-32 -32 -72) (-32 -32 -63)" + "plane" "(32 -32 -66) (-32 -32 -66) (-32 -32 -63)" "material" "TOOLS/TOOLSINVISIBLE" "uaxis" "[1 0 0 0] 0.25" "vaxis" "[0 0 -1 -28] 0.25" diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_nand.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/nand.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_nand.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/nand.vmf diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_nor.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/nor.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_nor.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/nor.vmf diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_or.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/or.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_or.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/or.vmf diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_xnor.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/xnor.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_xnor.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/xnor.vmf diff --git a/packages/hmw/resources/instances/clean/items/hmw/logic/logic_xor.vmf b/packages/hmw/resources/instances/clean/items/hmw/logic/xor.vmf similarity index 100% rename from packages/hmw/resources/instances/clean/items/hmw/logic/logic_xor.vmf rename to packages/hmw/resources/instances/clean/items/hmw/logic/xor.vmf