Merge pull request #28 from ENDERZOMBI102/paint-gun_autodisable

Guns AutoDisable and overall improvements
ENDERZOMBI102 · Apr 9, 2020 · 49a4721 · 49a4721
2 parents d67fa6a + 56d39c7
commit 49a4721
Show file tree

Hide file tree

Showing 16 changed files with 890 additions and 304 deletions.
diff --git a/items/gravity_gun/properties.txt b/items/gravity_gun/properties.txt
@@ -7,9 +7,6 @@
 "" "Gravity Gun."
 "" ""
 "" "* **Start Reversed** makes the gun work for Co-Op. Uncheck for AtLAS, check for P-Body. Useless in SP."
-"" ""
-"" ""
-"" "> To-Do: Add Auto Disable when picking up another gun."
 }
 "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Gravity-Gun"
 "ent_count" "26"

diff --git a/items/gravity_gun/vbsp_config.cfg b/items/gravity_gun/vbsp_config.cfg
@@ -3,6 +3,16 @@
 	"Condition"
 		{
 		"instance" "<ITEM_GRAVITY_GUN>"
+		"Result"
+			{
+			"GlobalInput"
+				{
+				"Name" "@disable_gravity_gun"
+				"Target" "shutdown"
+				"Input" "Trigger"
+				"Output" "OnTrigger"
+				}
+			}
 		"Condition"
 			{
 			"posIsSolid"
@@ -49,4 +59,36 @@
 				}
 			}
 		}
+	"Condition"
+		{
+		"instance" "<ITEM_BEE2_PORTALGUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_PAINT_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_PORTIVITY_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_WEAPON_STRIP>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
+			}
+		}
 	}
diff --git a/items/living_panel_large/editoritems.txt b/items/living_panel_large/editoritems.txt
@@ -11,7 +11,6 @@
 				"Model"
 				{
 					"ModelName"		"piston_lift_grate.3ds"
-					"TextureName"		"pistonlift.png"
 				}
 				"Palette"
 				{

diff --git a/items/paint_gun/editoritems.txt b/items/paint_gun/editoritems.txt
@@ -82,42 +82,42 @@
                 "0"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_weighted_white.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }
 				"1"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_weighted_black.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }
 				"2"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_cube_white.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }
 				"3"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_cube_black.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }
 				"4"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_ball_white.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }
 				"5"
                 {
                     "Name"         		"instances/BEE2/clean/items/pg_ball_black.vmf"
-                    "EntityCount"       	"8"
+                    "EntityCount"       	"7"
                     "BrushCount"        	"11"
                     "BrushSideCount"    	"70"
                 }

diff --git a/items/paint_gun/properties.txt b/items/paint_gun/properties.txt
@@ -33,10 +33,10 @@
 "" "* **Paint can get stuck on Portals if shot in specific directions.**"
 "" ""
 "" ""
-"" "> To-Do: Add the Start Enabled, Auto Disable when picking up another gun."
+"" "> To-Do: Add Start Enabled."
 }
 "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Paint-Gun"
-"ent_count" "8"
+"ent_count" "7"
 "Icon"
 {
 "0" "clean/paint_gun.png"

diff --git a/items/paint_gun/vbsp_config.cfg b/items/paint_gun/vbsp_config.cfg
@@ -26,6 +26,13 @@
 					"0" "stop"
 					"1" "start"
 				}
+			"GlobalInput"
+				{
+				"Name" "@disable_radelite_paintgun"
+				"Target" "Paintui"
+				"Input" "Deactivate"
+				"Output" "OnTrigger"
+				}
 			}
 		"Condition"
 			{
@@ -94,4 +101,36 @@
 				}
 			}
 		}
+	"Condition"
+		{
+		"instance" "<ITEM_BEE2_PORTALGUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_GRAVITY_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_PORTIVITY_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_WEAPON_STRIP>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
+			}
+		}
 	}
diff --git a/items/portivity_gun/editoritems.txt b/items/portivity_gun/editoritems.txt
@@ -1,14 +1,15 @@
 "Item"
     {
         "Type"     		"ITEM_PORTIVITY_GUN"
+        "ItemClass"		"ItemButtonFloor"
         "Editor"
         {
             "SubType"
             {	
                 "Name"          		"Portivity Gun"
 				"Model"
 				{
-					"ModelName"		"bee2_pgun_pedestal_oran.3ds"
+					"ModelName"		"bee2_pgun_pedestal_dual.3ds"
 				}
                 "Palette"
                 {
@@ -28,15 +29,55 @@
         }
 		"Properties"
 		{
+			"ButtonType"
+			{
+				"DefaultValue"	"0"
+				"Index"			"1"
+			}
 		}
         "Exporting"
         {
             "Instances"
             {
                 "0"
                 {
-                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun.vmf"
-                    "EntityCount"       	"31"
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun0.vmf"
+                    "EntityCount"       	"28"
+                    "BrushCount"        	"24"
+                    "BrushSideCount"    	"148"
+                }
+                "1"
+                {
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun1.vmf"
+                    "EntityCount"       	"28"
+                    "BrushCount"        	"24"
+                    "BrushSideCount"    	"148"
+                }
+                "2"
+                {
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun2.vmf"
+                    "EntityCount"       	"28"
+                    "BrushCount"        	"24"
+                    "BrushSideCount"    	"148"
+                }
+                "3"
+                {
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun3.vmf"
+                    "EntityCount"       	"28"
+                    "BrushCount"        	"24"
+                    "BrushSideCount"    	"148"
+                }
+                "4"
+                {
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun4.vmf"
+                    "EntityCount"       	"28"
+                    "BrushCount"        	"24"
+                    "BrushSideCount"    	"148"
+                }
+                "5"
+                {
+                    "Name"         		"instances/BEE2/clean/items/radelite/portivity_gun5.vmf"
+                    "EntityCount"       	"28"
                     "BrushCount"        	"24"
                     "BrushSideCount"    	"148"
                 }

diff --git a/items/portivity_gun/properties.txt b/items/portivity_gun/properties.txt
@@ -5,14 +5,16 @@
 "Description"
 {
 "" "It's a Portal Gun with a Gravity Gun. You can switch between modes with Crouch."
-"" ""
 "" "* It's very similar with the one in Into the Multiverse, the Portal 2 workshop map series."
-"" "* Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun."
 "" ""
-"" "> To-Do: Add Auto Disable when picking up another gun."
+"" "> Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun and you can't upgrade the portals."
+"" ""
+"" "* **Weighted** fires both portals"
+"" "* **Cube** is blue portal only"
+"" "* **Ball** is orange portal only"
 }
 "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Portivity-Gun"
-"ent_count" "31"
+"ent_count" "28"
 "Icon"
 {
 "0" "clean/portivity_gun.png"

diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg
@@ -10,14 +10,17 @@
 				"File" "instances/BEE2/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf"
 				"fixup_style" "2"
 				}
+			"GlobalInput"
+				{
+				"Name" "@disable_portivity_gun"
+				"Target" "shutdown"
+				"Input" "Trigger"
+				"Output" "OnTrigger"
+				}
 			}
 		"Condition"
 			{
-			"posIsSolid"
-				{
-				"Pos"  "0 0 0"
-				"type" "white"
-				}
+			"instance" "<ITEM_PORTIVITY_GUN:btn_white>"
 			"Result"
 				{
 				"TemplateBrush"
@@ -29,11 +32,7 @@
 			}
 		"Condition"
 			{
-			"posIsSolid"
-				{
-				"Pos"  "0 0 0"
-				"type" "black"
-				}
+			"instance" "<ITEM_PORTIVITY_GUN:btn_black>"
 			"Result"
 				{
 				"TemplateBrush"
@@ -43,5 +42,75 @@
 					}
 				}
 			}
+		"Condition"
+			{
+			"instance" "<ITEM_PORTIVITY_GUN:btn_weighted>"
+			"Result"
+				{
+				"setInstVar" "$portalblue 1"
+				"setInstVar" "$portalorange 1"
+				"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
+				}
+			}
+		"Condition"
+			{
+			"instance" "<ITEM_PORTIVITY_GUN:btn_cube>"
+			"Result"
+				{
+				"setInstVar" "$portalblue 1"
+				"setInstVar" "$portalorange 0"
+				"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
+				}
+			}
+		"Condition"
+			{
+			"instance" "<ITEM_PORTIVITY_GUN:btn_ball>"
+			"Result"
+				{
+				"setInstVar" "$portalblue 0"
+				"setInstVar" "$portalorange 1"
+				"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
+				}
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_BEE2_PORTALGUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_GRAVITY_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_PAINT_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_PORTIVITY_GUN>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
+			}
+		}
+	"Condition"
+		{
+		"instance" "<ITEM_WEAPON_STRIP>"
+		"Result"
+			{
+			"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
+			}
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     				"Model"
     				{
     					"ModelName"		"piston_lift_grate.3ds"
-    					"TextureName"		"pistonlift.png"
     				}
     				"Palette"
     				{
@@ Expand Down @@