Fix BEEmod/BEE2.4#1854: Add delay to inverted logic items

BEEmod · Jul 29, 2022 · ef25de4 · ef25de4
1 parent 2317eb5
commit ef25de4
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 342 deletions.
diff --git a/packages/logic/items/logic_gate_visible/editoritems.txt b/packages/logic/items/logic_gate_visible/editoritems.txt
@@ -139,10 +139,12 @@
 		"Offset"        "64 64 64"
 		"Inputs"
 			{
-			"CONNECTION_STANDARD"
+			"BEE2"
 				{
-				"Activate"      "instance:in;FireUser2"
-				"Deactivate"    "instance:in;FireUser1"
+				"Type"        "DEFAULT" // Pass every enable/disable directly.
+				"InvertVar"   "0"
+				"Enable_Cmd"  "in,FireUser2,,0,-1"
+				"Disable_Cmd" "in,FireUser1,,0,-1"
 				}
 			}
 		"Outputs"

diff --git a/packages/logic/resources/instances/50s/items/hmw/logic/and.vmf b/packages/logic/resources/instances/50s/items/hmw/logic/and.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "105"
+	"editorbuild" "8997"
+	"mapversion" "107"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "1"
+	"nGridSpacing" "8"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "105"
+	"mapversion" "107"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -29,31 +29,12 @@ world
 	"skyname" "sky_day01_01"
 }
 entity
-{
-	"id" "1836"
-	"classname" "func_instance_io_proxy"
-	"targetname" "proxy"
-	connections
-	{
-		"OnProxyRelay" "inFireUser10-1"
-		"OnProxyRelay" "inFireUser20-1"
-	}
-	"origin" "16 16 -32"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 500]"
-	}
-}
-entity
 {
 	"id" "1842"
 	"classname" "func_instance_parms"
 	"parm1" "$connectioncount integer 1"
 	"parm2" "$start_enabled integer 1"
-	"origin" "-16 16 -32"
+	"origin" "0 0 -32"
 	editor
 	{
 		"color" "220 30 220"
@@ -66,6 +47,7 @@ entity
 {
 	"id" "1844"
 	"classname" "math_counter"
+	"angles" "0 0 0"
 	"max" "$connectioncount"
 	"min" "0"
 	"StartDisabled" "0"
@@ -80,10 +62,10 @@ entity
 		"OnHitMax" "outSetTextureIndex10-1"
 		"OnChangedFromMax" "outSetTextureIndex00-1"
 	}
-	"origin" "-16 -16 -32"
+	"origin" "0 -16 -32"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -93,14 +75,15 @@ entity
 {
 	"id" "1860"
 	"classname" "env_texturetoggle"
+	"angles" "0 0 0"
 	"target" "ind"
 	"targetname" "out"
 	connections
 	{
 		"OnUser2" "proxyProxyRelay0-1"
 		"OnUser1" "proxyProxyRelay0-1"
 	}
-	"origin" "16 -16 -32"
+	"origin" "0 16 -32"
 	editor
 	{
 		"color" "220 30 220"

diff --git a/packages/logic/resources/instances/50s/items/hmw/logic/nand.vmf b/packages/logic/resources/instances/50s/items/hmw/logic/nand.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "7378"
-	"mapversion" "118"
+	"editorbuild" "8997"
+	"mapversion" "119"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "1"
+	"nGridSpacing" "4"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "118"
+	"mapversion" "119"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -32,6 +32,7 @@ entity
 {
 	"id" "2026"
 	"classname" "env_texturetoggle"
+	"angles" "0 0 0"
 	"target" "ind"
 	"targetname" "tog"
 	"origin" "0 0 -32"
@@ -1044,31 +1045,12 @@ entity
 	}
 }
 entity
-{
-	"id" "1836"
-	"classname" "func_instance_io_proxy"
-	"targetname" "proxy"
-	connections
-	{
-		"OnProxyRelay" "inFireUser20-1"
-		"OnProxyRelay" "inFireUser10-1"
-	}
-	"origin" "16 16 -32"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 500]"
-	}
-}
-entity
 {
 	"id" "1842"
 	"classname" "func_instance_parms"
 	"parm1" "$connectioncount integer 1"
 	"parm2" "$start_enabled integer 1"
-	"origin" "-16 16 -32"
+	"origin" "16 0 -32"
 	editor
 	{
 		"color" "220 30 220"
@@ -1081,24 +1063,25 @@ entity
 {
 	"id" "1844"
 	"classname" "math_counter"
+	"angles" "0 0 0"
 	"max" "$connectioncount"
 	"min" "0"
 	"StartDisabled" "0"
 	"startvalue" "0"
 	"targetname" "in"
 	connections
 	{
-		"OnChangedFromMax" "outFireUser20-1"
-		"OnHitMax" "outFireUser10-1"
+		"OnChangedFromMax" "outFireUser20.1-1"
+		"OnHitMax" "outFireUser10.1-1"
 		"OnUser1" "!selfSubtract10-1"
 		"OnUser2" "!selfAdd10-1"
-		"OnHitMax" "togSetTextureIndex00-1"
-		"OnChangedFromMax" "togSetTextureIndex10-1"
+		"OnHitMax" "togSetTextureIndex00.1-1"
+		"OnChangedFromMax" "togSetTextureIndex10.1-1"
 	}
-	"origin" "-16 -16 -32"
+	"origin" "16 -16 -32"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -1108,6 +1091,7 @@ entity
 {
 	"id" "1860"
 	"classname" "logic_relay"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"StartDisabled" "0"
 	"targetname" "out"
@@ -1118,10 +1102,10 @@ entity
 		"OnSpawn" "!selfFireUser211"
 		"OnSpawn" "togSetTextureIndex101"
 	}
-	"origin" "16 -16 -32"
+	"origin" "16 16 -32"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"

diff --git a/packages/logic/resources/instances/50s/items/hmw/logic/nor.vmf b/packages/logic/resources/instances/50s/items/hmw/logic/nor.vmf
@@ -1,8 +1,8 @@
 versioninfo
 {
 	"editorversion" "400"
-	"editorbuild" "6432"
-	"mapversion" "112"
+	"editorbuild" "8997"
+	"mapversion" "113"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -14,13 +14,13 @@ viewsettings
 	"bSnapToGrid" "1"
 	"bShowGrid" "1"
 	"bShowLogicalGrid" "0"
-	"nGridSpacing" "1"
+	"nGridSpacing" "8"
 	"bShow3DGrid" "0"
 }
 world
 {
 	"id" "1"
-	"mapversion" "112"
+	"mapversion" "113"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -32,6 +32,7 @@ entity
 {
 	"id" "2040"
 	"classname" "env_texturetoggle"
+	"angles" "0 0 0"
 	"target" "ind"
 	"targetname" "tog"
 	"origin" "0 0 -32"
@@ -1196,31 +1197,12 @@ entity
 	}
 }
 entity
-{
-	"id" "1836"
-	"classname" "func_instance_io_proxy"
-	"targetname" "proxy"
-	connections
-	{
-		"OnProxyRelay" "inFireUser20-1"
-		"OnProxyRelay" "inFireUser10-1"
-	}
-	"origin" "16 16 -32"
-	editor
-	{
-		"color" "220 30 220"
-		"visgroupshown" "1"
-		"visgroupautoshown" "1"
-		"logicalpos" "[0 500]"
-	}
-}
-entity
 {
 	"id" "1842"
 	"classname" "func_instance_parms"
 	"parm1" "$connectioncount integer 1"
 	"parm2" "$start_enabled integer 1"
-	"origin" "-16 16 -32"
+	"origin" "16 0 -32"
 	editor
 	{
 		"color" "220 30 220"
@@ -1233,24 +1215,25 @@ entity
 {
 	"id" "1844"
 	"classname" "math_counter"
+	"angles" "0 0 0"
 	"max" "$connectioncount"
 	"min" "0"
 	"StartDisabled" "0"
 	"startvalue" "0"
 	"targetname" "in"
 	connections
 	{
-		"OnHitMin" "outFireUser20-1"
-		"OnChangedFromMin" "outFireUser10-1"
+		"OnHitMin" "outFireUser20.1-1"
+		"OnChangedFromMin" "outFireUser10.1-1"
 		"OnUser1" "!selfSubtract10-1"
 		"OnUser2" "!selfAdd10-1"
-		"OnChangedFromMin" "togSetTextureIndex00-1"
-		"OnHitMin" "togSetTextureIndex10-1"
+		"OnChangedFromMin" "togSetTextureIndex00.1-1"
+		"OnHitMin" "togSetTextureIndex10.1-1"
 	}
-	"origin" "-16 -16 -32"
+	"origin" "16 16 -32"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"
@@ -1260,6 +1243,7 @@ entity
 {
 	"id" "1860"
 	"classname" "logic_relay"
+	"angles" "0 0 0"
 	"spawnflags" "0"
 	"StartDisabled" "0"
 	"targetname" "out"
@@ -1273,7 +1257,7 @@ entity
 	"origin" "16 -16 -32"
 	editor
 	{
-		"color" "220 30 220"
+		"color" "0 100 250"
 		"visgroupshown" "1"
 		"visgroupautoshown" "1"
 		"logicalpos" "[0 0]"