Merge pull request #6 from ENDERZOMBI102/guns

Guns Update

.gitignore

@@ -1,4 +1,4 @@
-icon.png
 *.vmx
-desktop.ini
+*.zip
 Radelite.zip
+templates/camben/

info.txt

@@ -5,6 +5,8 @@
 {
 	"Package" "BEE2_CLEAN_STYLE"
 	"Package" "BEE2_PORTAL_1"
+	"Package" "BEE2_PORTALS"
+	"Package" "VALVE_TEST_ELEM"
 }
 
 "Item"
@@ -123,24 +125,7 @@
 		"Name" "Regular"
 		"Styles"
 			{
-			"ANY_STYLE" "gravity_gun_mk1"
-			}
-		}
-	}
-
-"Item"
-	{
-	"ID" "ITEM_GRAVITY_GUN_MARK_2"
-	"AllDescLast" "0"
-	"needsUnlock" "0"
-
-	"Version"
-		{
-		"ID"   "VER_DEFAULT"
-		"Name" "Regular"
-		"Styles"
-			{
-			"ANY_STYLE" "gravity_gun_mk2"
+			"ANY_STYLE" "gravity_gun"
 			}
 		}
 	}
@@ -157,24 +142,7 @@
 		"Name" "Regular"
 		"Styles"
 			{
-			"ANY_STYLE"  "paint_gun_mk1"
-			}
-		}
-	}
-
-"Item"
-	{
-	"ID" "ITEM_PAINT_GUN_MARK_2"
-	"AllDescLast" "0"
-	"needsUnlock" "0"
-
-	"Version"
-		{
-		"ID"   "VER_DEFAULT"
-		"Name" "Regular"
-		"Styles"
-			{
-			"ANY_STYLE" "paint_gun_mk2"
+			"ANY_STYLE"  "paint_gun"
 			}
 		}
 	}

items/gravity_gun/editoritems.txt

@@ -0,0 +1,171 @@
+"Item"
+    {
+        "Type"     		"ITEM_GRAVITY_GUN"
+		"ItemClass"		"ItemButtonFloor"
+        "Editor"
+        {
+			"SubTypeProperty"		"ButtonType"
+            "SubType"
+            {	
+                "Name"          		"Gravity Gun MK1"
+				"Model"
+				{
+					"ModelName"		"bee2_pgun_pedestal_oran.3ds"
+				}
+                "Palette"
+                {
+                    "Tooltip"      			"GRAVITY GUN MK1"
+                    "Image"         		"palette/clean/gravity_gun_mk1.png"
+                    "Position"      		"3 1 0"					// 2. Zeile, 4. Reihe (line 2, row 4)
+                }
+                "Sounds"
+                {
+                    "SOUND_CREATED"            "P2Editor.PlaceOther"
+                    "SOUND_EDITING_ACTIVATE"   "P2Editor.ExpandOther"
+                    "SOUND_EDITING_DEACTIVATE" "P2Editor.CollapseOther"
+                    "SOUND_DELETED"            "P2Editor.RemoveOther"
+                }
+            }
+            "SubType"
+            {	
+                "Name"          		"Gravity Gun MK2"
+				"Model"
+				{
+					"ModelName"		"bee2_pgun_pedestal_oran.3ds"
+				}
+                "Palette"
+                {
+                    "Tooltip"      			"GRAVITY GUN MK2"
+                    "Image"         		"palette/clean/gravity_gun_mk2.png"
+                    "Position"      		"3 1 0"	
+                }
+                "Sounds"
+                {
+                    "SOUND_CREATED"            "P2Editor.PlaceOther"
+                    "SOUND_EDITING_ACTIVATE"   "P2Editor.ExpandOther"
+                    "SOUND_EDITING_DEACTIVATE" "P2Editor.CollapseOther"
+                    "SOUND_DELETED"            "P2Editor.RemoveOther"
+                }
+            }
+            "SubType"
+            {	
+                "Name"          		"Gravity Gun MK3"
+				"Model"
+				{
+					"ModelName"		"bee2_pgun_pedestal_oran.3ds"
+				}
+                "Palette"
+                {
+                    "Tooltip"      			"GRAVITY GUN MK3"
+                    "Image"         		"palette/clean/gravity_gun_mk3.png"
+                    "Position"      		"3 1 0"	
+                }
+                "Sounds"
+                {
+                    "SOUND_CREATED"            "P2Editor.PlaceOther"
+                    "SOUND_EDITING_ACTIVATE"   "P2Editor.ExpandOther"
+                    "SOUND_EDITING_DEACTIVATE" "P2Editor.CollapseOther"
+                    "SOUND_DELETED"            "P2Editor.RemoveOther"
+                }
+            }
+            "MovementHandle"    		"HANDLE_4_DIRECTIONS"
+        }
+		"Properties"
+		{
+			"ButtonType"
+			{
+				"DefaultValue"	"0"
+				"Index"			"0"
+			}
+		}
+        "Exporting"
+        {
+            "Instances"
+            {
+                "0"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun.vmf"
+                    "EntityCount"       	"10"
+                    "BrushCount"        	"11"
+                    "BrushSideCount"    	"66"
+                }
+				"1"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun.vmf"
+                    "EntityCount"       	"10"
+                    "BrushCount"        	"11"
+                    "BrushSideCount"    	"66"
+                }
+				"2"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun_mk2.vmf"
+                    "EntityCount"       	"20"
+                    "BrushCount"        	"12"
+                    "BrushSideCount"    	"72"
+                }
+				"3"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun_mk2.vmf"
+                    "EntityCount"       	"20"
+                    "BrushCount"        	"12"
+                    "BrushSideCount"    	"72"
+                }
+				"4"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun_mk3.vmf"
+                    "EntityCount"       	"10"
+                    "BrushCount"        	"11"
+                    "BrushSideCount"    	"66"
+                }
+				"5"
+                {
+                    "Name"         		"instances/BEE2/clean/items/gravity_gun_mk3.vmf"
+                    "EntityCount"       	"10"
+                    "BrushCount"        	"11"
+                    "BrushSideCount"    	"66"
+                }
+            }
+            "Offset"            		"64 64 64"
+            "TargetName"        		"Gravity_gun"
+            "OccupiedVoxels"
+		{
+			"Voxel"
+			{
+				"Pos"		"0 0 0"
+				"Surface"
+				{
+					"Pos"	"1 1 0"
+				}
+				"Surface"
+				{
+					"Pos"	"1 2 0"
+				}
+				"Surface"
+				{
+					"Pos"	"2 1 0"
+				}
+				"Surface"
+				{
+					"Pos"	"2 2 0"
+				}
+			}
+		}
+			"EmbeddedVoxels"
+			{
+				"Voxel"
+				{
+					"Pos"		"0 0 0"
+				}
+			}
+
+			"EmbedFace"
+			{
+				"Solid"
+				{
+					"Center"		"64 64 128"
+					"Dimensions"	"128 128 4"
+					"Grid"			"Grid_default"
+				}
+			}
+        }
+    }

items/gravity_gun/properties.txt

@@ -0,0 +1,33 @@
+"Properties"
+{
+"Authors" "Radelite, Niin31, Linking-yellow, ENDERZOMBI102, Flash4433"
+"Tags" "Portal 2;Guns"
+"Description"
+{
+"" "Gravity Gun Mk1."
+"" ""
+"" "* Fire Blue Portal: Push"
+"" "* Fire Orange Portal: Pull"
+"" ""
+"" "Gravity Gun Mk2."
+"" ""
+"" "* Fire Blue Portal: Use Selected Action"
+"" "* Fire Orange Portal: Select Action"
+"" "* The MK2 can Push, Pull and Lift upwards."
+"" ""
+"" "* Don't use a Gravity Gun and a Paint Gun in the same chamber."
+"" "* It works with turrets, cubes, paint bombs and other physics objects like props."
+"" ""
+"" "* Please note that there isn't currently a mechanism to detect when you pick up a cube."
+"" "* When we figure out how to make it work, it would work like HL2."
+}
+"infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Gravity-Gun"
+"ent_count" "10"
+"Icon"
+{
+"all" "clean/gravity_gun_mk1.png"
+"0" "clean/gravity_gun_mk1.png"
+"1" "clean/gravity_gun_mk2.png"
+"2" "clean/gravity_gun_mk3.png"
+}
+}