Merge pull request #3146 from BEEmod/dev

Version 4.36.0

compile_packages.py

@@ -74,38 +74,6 @@ def clean_vmf(vmf_path):
         yield line.lstrip()
 
 
-# Text files we should clean up.
-PROP_EXT = ('.cfg', '.txt')
-CLEAN_EXT = ('.vmt', '.nut') + PROP_EXT
-def clean_text(file_path):
-    # Try and parse as a property file. If it succeeds,
-    # write that out - it removes excess whitespace between lines
-    if file_path.endswith(PROP_EXT):
-        with open(file_path, 'r') as f:
-            try: 
-                props = Property.parse(f)
-            except KeyValError:
-                pass
-            else:
-                for line in props.export():
-                    yield line.lstrip()
-                return
-
-    with open(file_path, 'r') as f:
-        for line in f:
-            if line.isspace():
-                continue
-            if line.lstrip().startswith('//'):
-                continue
-            # Remove // comments, but only if the comment doesn't have
-            # a quote char after it - it could be part of the string,
-            # so leave it just to be safe.
-            if '//' in line and '"' not in line:
-                yield line.split('//')[0] + '\n'
-            else:
-                yield line.lstrip()
-
-
 # Delete these files, if they exist in the source folders.
 # Users won't need them.
 DELETE_EXTENSIONS = ['vmx', 'log', 'bsp', 'prt', 'lin']
@@ -177,14 +145,6 @@ def build_package(package_path, pack_zip_path, zip_path):
                     data = '\r\n'.join(clean_vmf(full_path))
                     zip_file.writestr(rel_path, data)
 
-                    if hammer_path:
-                        with open(hammer_path, 'w') as f:
-                            f.write(data)
-                elif OPTIMISE and file.endswith(CLEAN_EXT):
-                    print(rel_path)
-                    data = ''.join(clean_text(full_path))
-                    zip_file.writestr(rel_path, data)
-
                     if hammer_path:
                         with open(hammer_path, 'w') as f:
                             f.write(data)

packages/bee1/pellets/info.txt

@@ -55,7 +55,9 @@
 		"" "* Direct them into catchers to activate them."
 		"" "* The timer property controls how long it will last until exploding."
 		"" "* If set to infinite, enabling the input will spawn the pellet; disabling it destroys the pellet."
-		"" "* If respawn is disabled, the launcher will permanently disabled once a catcher receives this pellet."
+		"" "* The respawn checkbox does different things depending on the timer property.  "
+		"" "    If the emitter is timed, the launcher will be permanently disabled once a catcher receives this pellet.  "
+		"" "    If the emitter is infinite, this controls whether the pellet will be replaced if destroyed and the input is still active."
 		}
 	"All_conf" "launcher.cfg"
 	"Version"

packages/bee1/pellets/items/launcher.cfg

@@ -38,11 +38,20 @@
 					"InstVar" "$start_enabled 1"
 					"Result"
 						{
-						"GlobalInput"
+						"MapInstVar"
 							{
-							"Input"  "CallScriptFunction"
-							"Target" "launcher"
-							"Param"  "invert"
+							"$disable_autorespawn" "$init_code"
+							"0" "respawn <- false; inp_on();"
+							"1" "respawn <- true; inp_on()"
+							}
+						}
+					"Else"
+						{
+						"MapInstVar"
+							{
+							"$disable_autorespawn" "$init_code"
+							"0" "respawn <- false"
+							"1" "respawn <- true"
 							}
 						}
 					}
@@ -56,18 +65,7 @@
 					"Default"   "6"
 					"ResultVar" "$refresh_time" 
 					}
-				"Condition"
-					{
-					"InstVar" "$start_enabled 1"
-					"Result"
-						{
-						"GlobalInput"
-							{
-							"Target" "launcher"
-							"Input"  "Enable"
-							}
-						}
-					}
+				"SetInstVar" "$start_disabled !$start_enabled"
 				}
 			}
 		}

packages/bee1/pellets/resources/instances/clean/items/BEE/hep/emitter_norm.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "7335"
-	"mapversion" "129"
+	"mapversion" "133"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "129"
+	"mapversion" "133"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -30,6 +30,23 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "3582"
+	"classname" "comp_kv_setter"
+	"kv_name" "4096"
+	"kv_value_global" "$start_disabled"
+	"mode" "flags"
+	"target" "launcher"
+	"origin" "48 -16 -32"
+	editor
+	{
+		"color" "220 30 220"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"logicalpos" "[0 4500]"
+	}
+}
+entity
 {
 	"id" "3566"
 	"classname" "point_energy_ball_launcher"
@@ -42,7 +59,6 @@ entity
 	"maxspeed" "$speed"
 	"MinLifeAfterPortal" "$refresh_time"
 	"minspeed" "$speed"
-	"origin" "0 0 -16"
 	"spawnflags" "0"
 	"targetname" "launcher"
 	connections
@@ -53,6 +69,7 @@ entity
 		"OnBallCaught" "branch_respawnTest0-1"
 		"OnPostSpawnBall" "!selfFireUser10-1"
 	}
+	"origin" "0 0 -16"
 	editor
 	{
 		"color" "220 30 220"
@@ -65,6 +82,7 @@ entity
 {
 	"id" "3307"
 	"classname" "logic_branch"
+	"angles" "0 0 0"
 	"InitialValue" "$disable_autorespawn"
 	"targetname" "branch_respawn"
 	connections
@@ -94,6 +112,7 @@ entity
 	"MaxAnimTime" "10"
 	"MinAnimTime" "5"
 	"model" "models/props/clean/combine_ball_launcher.mdl"
+	"physdamagescale" "1.0"
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"skin" "0"

packages/bee1/pellets/resources/instances/over/items/bee/hep/emitter_norm.vmf

@@ -2,7 +2,7 @@ versioninfo
 {
 	"editorversion" "400"
 	"editorbuild" "7335"
-	"mapversion" "130"
+	"mapversion" "132"
 	"formatversion" "100"
 	"prefab" "0"
 }
@@ -20,7 +20,7 @@ viewsettings
 world
 {
 	"id" "1"
-	"mapversion" "130"
+	"mapversion" "132"
 	"classname" "worldspawn"
 	"detailmaterial" "detail/detailsprites"
 	"detailvbsp" "detail.vbsp"
@@ -30,6 +30,23 @@ world
 	"skyname" "sky_black_nofog"
 }
 entity
+{
+	"id" "3575"
+	"classname" "comp_kv_setter"
+	"kv_name" "4096"
+	"kv_value_global" "$start_disabled"
+	"mode" "flags"
+	"target" "launcher"
+	"origin" "48 -16 -32"
+	editor
+	{
+		"color" "220 30 220"
+		"visgroupshown" "1"
+		"visgroupautoshown" "1"
+		"logicalpos" "[0 4500]"
+	}
+}
+entity
 {
 	"id" "3566"
 	"classname" "point_energy_ball_launcher"
@@ -42,7 +59,6 @@ entity
 	"maxspeed" "$speed"
 	"MinLifeAfterPortal" "$refresh_time"
 	"minspeed" "$speed"
-	"origin" "0 0 -16"
 	"spawnflags" "0"
 	"targetname" "launcher"
 	connections
@@ -53,6 +69,7 @@ entity
 		"OnBallCaught" "branch_respawnTest0-1"
 		"OnPostSpawnBall" "!selfFireUser10-1"
 	}
+	"origin" "0 0 -16"
 	editor
 	{
 		"color" "220 30 220"
@@ -65,6 +82,7 @@ entity
 {
 	"id" "3307"
 	"classname" "logic_branch"
+	"angles" "0 0 0"
 	"InitialValue" "$disable_autorespawn"
 	"targetname" "branch_respawn"
 	connections
@@ -94,6 +112,7 @@ entity
 	"MaxAnimTime" "10"
 	"MinAnimTime" "5"
 	"model" "models/props/combine_ball_launcher.mdl"
+	"physdamagescale" "1.0"
 	"renderamt" "255"
 	"rendercolor" "255 255 255"
 	"skin" "0"

packages/bee1/pellets/resources/scripts/vscripts/BEE2/inf_pellet.nut

@@ -1,7 +1,7 @@
 cur_pellet <- null; // The pellet entity.
 waiting_for_pellet <- false; // Are we waiting for it to spawn and be detected?
-is_on <- null; // Current input state. Null = false, but before initialised.
-init <- false;
+is_on <- false; // Current input state.
+// respawn: If the pellet should be replaced when killed while input is on.
 
 function pellet_launched() {
 	// If we have a pellet, kill it.
@@ -54,15 +54,6 @@ function inp_off() {
 	kill_pellet();
 }
 
-// Called on spawn, if we start on.
-// is_on is set to null, so we can handle this being
-// disabled *before* the logic_auto triggers.
-function invert() {
-	if(is_on == null) {
-		inp_on();
-	}
-}
-
 function kill_pellet() {
 	// Ignore if the pellet doesn't exist...
 	if(cur_pellet != null && cur_pellet.IsValid()) {
@@ -82,7 +73,7 @@ function Think() {
 		EntFireByHandle(self, "FireUser1", "", 0.0, self, self);
 		cur_pellet = null;
 
-		if (is_on) {
+		if (is_on && respawn) {
 			launch_pellet();
 		}
 	}

packages/blocks/items/special_marker/editoritems.txt

@@ -24,7 +24,7 @@
 				}
 			}
 		"MovementHandle"		"HANDLE_NONE"
-		"DesiredFacing"         "DESIRES_UP" // Purely visual
+		"DesiredFacing"         "DESIRES_HORIZONTAL" // Purely visual
 		}
 	"Properties"
 		{
@@ -58,4 +58,4 @@
 			}
 		"Offset"	"64 64 64"
 		}
-	}
+	}

packages/cube_color/info.txt

@@ -68,6 +68,7 @@
 			"29"  "230 230 128"
 			"30"  "32 192 32"
 			}
+		"Tooltip" "The color to use for each timer option in the coloriser item."
 		}
 	}
 
@@ -299,4 +300,4 @@
 		"" "materials/BEE2/models/cube_color/hmw_laser_cube/laser_cube_tint_speed.vmt"
 		"" "materials/BEE2/models/cube_color/hmw_laser_cube/laser_cube_tint_glass.vmt"
 		}
-	}
+	}

packages/extra/voice_line/voice/wheatley.cfg

@@ -30,6 +30,7 @@
 			{
 			"Line"
 				{
+				"ID"	 "KILLING_YOU"
 				"Name"   "They're Killing You"
 				"Trans"  "Are they killing you? They're killing you, aren't they?" 
 				"choreo" "npc/sphere03/bw_a4_finale02_turrettrap_nags01.vcd"
@@ -39,24 +40,28 @@
 			{
 			"Line"
 				{
+				"ID"	 "IS_DISAPPOINTING"
 				"Name"   "Disappointing"
 				"Trans"  "Oh. Disappointing."
 				"choreo" "npc/sphere03/bw_sp_a4_tb_wall_button_solve06.vcd"
 				}
 			"Line"
 				{
+				"ID"	 "PLEASE_CONTINUE"
 				"Name"   "Please Continue"
 				"Trans"  "Well, on with the test." 
 				"choreo" "npc/sphere03/bw_sp_a4_tb_catch_intro13.vcd"
 				}
 			"Line"
 				{
+				"ID"     "IS_SOLUTION"
 				"Name"   "Is That The Solution?"
 				"Trans"  "Are you... are you sure you're solving these correctly?"
 				"choreo" "npc/sphere03/bw_sp_a4_stop_the_box_solve01.vcd"
 				}
 			"Line"
 				{
+				"ID"     "COME_BACK"
 				"Name"   "Come Back"
 				"Trans"  "Come back!"
 				"choreo" "npc/sphere03/bw_finale04_no_nags09.vcd"
@@ -200,7 +205,7 @@
 			"Line"
 				{
 				"Name"   "One word. Button."
-				"ID"     "MOAT_1"
+				"ID"     "BUTTON_HINT"
 				"Trans"  "I'll give you a hint. Button. That's all I'm gonna say. One word. Button." 
 				"choreo" "npc/sphere03/bw_a4_2nd_first_test_solve_nags03.vcd"
 				}
@@ -221,10 +226,11 @@
 		"Quote"
 			{
 			"Priority"  "4"
-			"Name"       "Laser"
+			"Name"      "Laser"
 			"Has"       "Laser"
 			"Line"
 				{
+				"ID"		"HUM_LASER"
 				"Name"      "Gentle Hum"
 				"Trans"     "Just getting a test ready... For you. Obviously. Who else would I be doing it for? No one."
 				"Trans"     "Though it does give me an idea: WHAT if we stand here and let the gentle hum of the laser transport us to a state of absolute relaxation. Might help us think of a way to open the door."

packages/fr_fizzlers/info.txt

@@ -218,6 +218,7 @@
 					"Disable_Cmd"   "clip,Disable,,0.00,-1"
 					"Enable_Cmd"    "mat_mod,StartFloatLerp,0 1.7 0.75 0,0.00,-1"
 					"Disable_Cmd"   "mat_mod,StartFloatLerp,1.7 0 0.75 0,0.00,-1"
+					"SpawnFire"     "always"
 					}
 				}
 			}