BEEmod · TeamSpen210 · Jun 24, 2016 · Mar 9, 2016 · Mar 9, 2016 · Mar 10, 2016
diff --git a/compile_packages.py b/compile_packages.py
@@ -6,21 +6,24 @@
 from zipfile import ZipFile, ZIP_LZMA, ZIP_DEFLATED
 from concurrent import futures
 
-# The location of the VPK.exe executable - if not found, this will be skipped.
-VPK_BIN_LOC = r'F:\SteamLibrary\SteamApps\common\Portal 2\bin\vpk.exe'
+from srctools import Property, KeyValError, VMF, conv_bool
 
-BEE2_LOCATION = '../BEE2.4/src'
-sys.path.append(BEE2_LOCATION)
+# The location of the VPK.exe executable - if not found, this will be skipped.
+try:
+	GAME_FOLDER = os.environ['PORTAL_2_LOC']
+except KeyError:
+    print('Set the PORTAL_2_LOC environment variable to the location of Portal 2 to allow VPK generating.')
+    GAME_FOLDER = ''
 
-import utils
-from property_parser import Property, KeyValError
-import vmfLib as VLib
+VPK_BIN_LOC = os.path.join(GAME_FOLDER, 'bin', 'vpk.exe')
 
 OPTIMISE = False
 
+
+
 def clean_vmf(vmf_path):
     """Optimise the VMFs, removing unneeded entities or objects."""
-    inst = VLib.VMF.parse(vmf_path)
+    inst = VMF.parse(vmf_path)
 
     for ent in itertools.chain([inst.spawn], inst.entities[:]):
         editor = ent.editor
@@ -30,7 +33,7 @@ def clean_vmf(vmf_path):
                 del editor[cat]
 
         # Remove entities that have their visgroups hidden.
-        if ent.hidden or not utils.conv_bool(editor.get('visgroupshown', '1'), True):
+        if ent.hidden or not conv_bool(editor.get('visgroupshown', '1'), True):
             print('Removing hidden ent')
             inst.remove_ent(ent)
             continue
@@ -42,17 +45,21 @@ def clean_vmf(vmf_path):
             continue
 
         # All instances must be in bee2/, so any reference outside there is a map error!
+        # It's ok if it's in p2editor and not in a subfolder though.
+        # There's also an exception needed for the Tag gun instance.
         if ent['classname'] == 'func_instance':
-            if not ent['file'].casefold().replace('\\','/').startswith('instances/bee2/'):
-                raise Exception('Invalid instance path "{}" in\n"{}"!'.format(ent['file'], vmf_path))
+            inst_loc = ent['file'].casefold().replace('\\','/')
+            if not inst_loc.startswith('instances/bee2/') and not (inst_loc.startswith('instances/p2editor/') and inst_loc.count('/') == 2) and 'alatag' not in inst_loc:
+                input('Invalid instance path "{}" in\n"{}"! Press Enter to continue..'.format(ent['file'], vmf_path))
+                yield from clean_vmf(vmf_path) # Re-run so we check again..
 
         for solid in ent.solids[:]:
             if all(face.mat.casefold() == 'tools/toolsskip' for face in solid):
                 print('Removing SKIP brush')
                 ent.solids.remove(solid)
                 continue
 
-            if solid.hidden or not utils.conv_bool(solid.editor.get('visgroupshown', '1'), True):
+            if solid.hidden or not conv_bool(solid.editor.get('visgroupshown', '1'), True):
                 print('Removing hidden brush')
                 ent.solids.remove(solid)
                 continue
@@ -193,7 +200,7 @@ def main():
 
     gen_vpks()
 
-    OPTIMISE = utils.conv_bool(input('Optimise zips? '))
+    OPTIMISE = conv_bool(input('Optimise zips? '))
 
     print('Optimising: ', OPTIMISE)
 
@@ -207,19 +214,21 @@ def main():
             print('Deleting', file)
             os.remove(os.path.join(zip_path, file))
     else:
-        os.makedirs(zip_path)
+        os.makedirs(zip_path, exist_ok=True)
 
     path = os.path.join(os.getcwd(), 'packages\\', )
 
     # A list of all the package zips.
     packages = list(search_folder(zip_path, path))
-    
+
     with futures.ThreadPoolExecutor(10) as future:
         list(future.map(build_package, packages))
 
     print('Building main zip...')
 
-    with ZipFile(os.path.join('zips', 'packages.zip'), 'w', compression=ZIP_DEFLATED) as zip_file:
+    pack_name = 'BEE{}_packages.zip'.format(input('Version: '))
+
+    with ZipFile(os.path.join('zips', pack_name), 'w', compression=ZIP_DEFLATED) as zip_file:
         for file in os.listdir(zip_path):
             zip_file.write(os.path.join(zip_path, file), os.path.join('packages/', file))
             print('.', end='', flush=True)

diff --git a/icons/items/inf_pellet.pdn b/icons/items/inf_pellet.pdn
diff --git a/icons/items/old/cube.pdn b/icons/items/old/cube.pdn
diff --git a/icons/items/old/cubes.pdn b/icons/items/old/cubes.pdn
diff --git a/icons/items/old/door.pdn b/icons/items/old/door.pdn
diff --git a/icons/items/old/rex_cube_deflector.pdn b/icons/items/old/rex_cube_deflector.pdn
diff --git a/icons/items/rex_cube_deflector.pdn b/icons/items/rex_cube_deflector.pdn
diff --git a/icons/music/the_reunion_2.png b/icons/music/the_reunion_2.png
diff --git a/packages/apTag/tagItems/info.txt b/packages/apTag/tagItems/info.txt
@@ -5,6 +5,14 @@
 "Item"
 	{
 	"ID" "ITEM_TAG_GUN_ACTIVATOR"
+	"Description"
+		{
+		"" "A special fizzler which controls the Aperture Tag Paint Gun."
+		"" ""
+		"" "* Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
+		"" "* The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
+		"" "* The settings are applied when the player moves to the side of the fizzler the sign is placed on."
+		}
 	"Version"
 		{
 		"Styles"

diff --git a/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_50s/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_70s/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt b/packages/apTag/tagItems/items/gel_fizz_80s/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt b/packages/apTag/tagItems/items/gel_fizz_clean/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagItems/items/gel_fizz_over/properties.txt b/packages/apTag/tagItems/items/gel_fizz_over/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt b/packages/apTag/tagItems/items/gel_fizz_p1/properties.txt
@@ -2,14 +2,6 @@
 	{
 	"Authors"		"Motanum, BenVlodgi, Rantis, TeamSpen210"
 	"Tags"			"Aperture Tag; Custom; Gel; Fizzlers"
-	"Description"
-		{
-		"Line"  "A special fizzler which controls the Aperture Tag Paint Gun."
-		"Line"  "Place the sign item near a 'normal' fizzler, and connect the two together. The fizzler will then be converted to a Paint Gun Activator."
-		"Line"  "The Start Enabled and Start Reversed properties toggle Repulsion and Propulsion Gel, respectively."
-		"Line"  "The settings are applied when the player moves to the side of the fizzler the sign is placed on."
-		"Line"  "Multiple signs can be attached to one fizzler, or vice-versa."
-		}
 	"Icon"
 		{
 			"0"	"tag/gel_gun.png"

diff --git a/packages/apTag/tagMusic/info.txt b/packages/apTag/tagMusic/info.txt
@@ -137,7 +137,7 @@
 	"Game"        "aptag"
 	"Icon"        "music/ap_tag/get_to_it.png"
 	"Authors"     "Harry Callaghan"
-	"Description" "A song played in some of the early Aperture Tage Chambers."
+	"Description" "A song played in some of the early Aperture Tag Chambers."
 	"SoundScript" "#*music/tag_slow_03.wav"
 	"Sample"      "ap_tag/tag_slow_03.ogg"
 	}

diff --git a/...ources/instances/voice/tag_nigel/base.vmf → ...ources/instances/voice/tag_nigel/base.vmf b/...ources/instances/voice/tag_nigel/base.vmf → ...ources/instances/voice/tag_nigel/base.vmf
diff --git a/packages/bee1/beemod/info.txt b/packages/bee1/beemod/info.txt
@@ -166,11 +166,23 @@
 "Item"
 	{
 	"ID" "DOOR"
+	"Description"	
+		{
+		"" "A placeable mid-chamber door."
+		"" ""
+		"" "* Cubes and players are able to obstruct the door, preventing it from closing."
+		"" "* Set Start Reversed to True to reverse the orientation of the door."
+		"" "* Players should always go from the Portal-figure side to the blank side!"
+		}
 	"Version"
 		{
 		"Styles"
 			{
-			"BEE2_CLEAN"	"door"
+			"BEE2_CLEAN"        "door"
+			"BEE2_PORTAL_1"     "door_p1"
+			"BEE2_1950s"        "door_50s"
+			"BEE2_1970s"        "door_70s"
+			"BEE2_1980s"        "door_80s"
 			}
 		}
 	}
@@ -242,69 +254,4 @@
 				}
 			}
 		}
-	}
-
-"EditorSound"
-	{
-	"ID" "Expand_Suction"
-	// Play regular expand/contract sounds, but also play suction loop when open
-	"Keys"
-		{
-		"channel" "CHAN_AUTO"
-		"volume" "0.5"
-		"pitch" "100"
-		"soundlevel" "SNDLVL_NONE"
-		"rndwave"
-			{
-			"wave" "ui/p2_editor_other_explo_01.wav"
-			"wave" "ui/p2_editor_other_explo_02.wav"
-			}
-		"soundentry_version" "2"
-		"operator_stacks"
-			{
-			"start_stack"
-				{
-				"play_entry"
-					{
-					"operator" "sys_start_entry"
-					"execute_once" "true"
-					"input_execute"	"1"
-					"input_start" "1"
-					"entry_name" "Portal.tube_suck"
-					}
-				}
-			}
-		}
-	}
-
-"EditorSound"
-	{
-	"ID" "Collapse_Suction"
-	"Keys"
-		{
-		"channel" "CHAN_AUTO"
-		"volume" "0.5"
-		"pitch" "100"
-		"soundlevel" "SNDLVL_NONE"
-		"rndwave"
-			{
-			"wave" "ui/p2_editor_other_collapse_01.wav"
-			"wave" "ui/p2_editor_other_collapse_02.wav"
-			}
-		"soundentry_version" "2"
-		"operator_stacks"
-			{
-			"start_stack"
-				{
-				"stop_suction"
-					{
-					"operator" "sys_stop_entries"
-					"input_max_entries" "0"
-					"match_entity" "false"
-					"match_substring" "true"
-					"match_entry" "Portal.tube_suck"
-					}
-				}
-			}
-		}
 	}
diff --git a/packages/bee1/beemod/items/60s_flamethrower/properties.txt b/packages/bee1/beemod/items/60s_flamethrower/properties.txt
@@ -1,14 +1,11 @@
 "Properties"
 	{
-	"Authors"		"BenVlodgi, Rantis, TeamSpen210"
-	"Tags"			"BEE;BEEMOD 1;Custom"
-	"Description"	
-		{
-		"Line"	"In the 1960s era, Crushers have been replaced with giant flamethrowers. They function exactly the same."
-		}
-	"InfoURL"		"http:/\/theportalwiki.com/wiki/Crusher"
+	"Authors"       "BenVlodgi, Rantis, TeamSpen210"
+	"Tags"          "BEE;BEEMOD 1;Custom; Fire"
+	"Description"   "In the 1960s era, Crushers have been replaced with giant flamethrowers. They function exactly the same."
+	"InfoURL"       "http:/\/theportalwiki.com/wiki/Crusher"
 	"Icon"
 		{
-			"0"		"60s/flamethrower.png"
+			"0"     "60s/flamethrower.png"
 		}
 	}
diff --git a/packages/bee1/beemod/items/crusher_50s/properties.txt b/packages/bee1/beemod/items/crusher_50s/properties.txt
@@ -2,7 +2,12 @@
 	{
 	"Authors"		"BenVlodgi, TeamSpen210"
 	"Tags"			"BEE;BEEMOD 1;Custom"
-	"Description"	"Large crushers, seen in coop maps and during Chapter 10 of the singleplayer campaign. These oscillate repeatedly when enabled, killing all players and destroying objects that are in its path."
+	"Description"
+		{
+		"" "Large spring-loaded crushers. These oscillate repeatedly when enabled, killing all players and destroying objects that are in its path."
+		"" ""
+		"" "* 1950s crushers spring out, and then are retracted slowly."
+		}
 	"InfoURL"		"http:/\/theportalwiki.com/wiki/Crusher"
 	"Icon"
 		{

diff --git a/packages/bee1/beemod/items/crusher_p1/properties.txt b/packages/bee1/beemod/items/crusher_p1/properties.txt
@@ -2,7 +2,12 @@
 	{
 	"Authors"		"BenVlodgi, Rantis"
 	"Tags"			"BEE;BEEMOD 1;Custom"
-	"Description"	"Large crushers, seen in coop maps and during Chapter 10 of the singleplayer campaign. These oscillate repeatedly when enabled, killing all players and destroying objects that are in its path."
+	"Description"
+		{
+		"" "Large spike-covered pistons. These oscillate repeatedly when enabled, killing all players and destroying objects that are in its path."
+		"" ""
+		"" "* These match the appearance of crushers seen in the original Portal trailer."
+		}
 	"InfoURL"		"http:/\/theportalwiki.com/wiki/Crusher"
 	"Ent_count"     "10"
 	"Icon"

diff --git a/packages/bee1/beemod/items/door/properties.txt b/packages/bee1/beemod/items/door/properties.txt
@@ -2,13 +2,6 @@
 	{
 	"Authors"		"BenVlodgi, Rantis"
 	"Tags"			"BEE;BEEMOD 1;Geometry"
-	"Description"	
-		{
-		"Line"		"A placeable mid-chamber door."
-		"Bullet"		"Cubes and players are able to obstruct the door, preventing it from closing."
-		"Bullet"		"Set Start Reversed to True to reverse the orientation of the door."
-		"Bullet"		"Players always go from the Portal-figure side to the blank side!"
-		}
 	"Icon"
 		{
 			"0"		"clean/portal_door.png"