Add offset center lasers

packages/styles/oldAp/info.txt

@@ -2631,19 +2631,19 @@
 							}
 						"1"
 							{
-							"Model" "bee2/retro/laser_catcher_center.mdl"
+							"Model" "bee2/retro/laser_catcher_center_west.mdl"
 							}
 						"2"
 							{
-							"Model" "bee2/retro/laser_catcher_center.mdl"
+							"Model" "bee2/retro/laser_catcher_center_north.mdl"
 							}
 						"3"
 							{
-							"Model" "bee2/retro/laser_catcher_center.mdl"
+							"Model" "bee2/retro/laser_catcher_center_east.mdl"
 							}
 						"4"
 							{
-							"Model" "bee2/retro/laser_catcher_center.mdl"
+							"Model" "bee2/retro/laser_catcher_center_south.mdl"
 							}
 						}
 					"Instances"

packages/valve/dis_beams/info.txt

@@ -42,7 +42,7 @@
 		"" "* It ignites turrets and kills the player after prolonged contact."
 		"" "* It can be redirected using redirection cubes, portals and Reflection Gel." 
 		"" "* The Laser activates Relays and Catchers."
-		"" "* When offset to the side of a voxel, Cube Type can be used to select an alternate emitter which is closer to the ground for hitting laser cubes and relays."
+		"" "* Cube Type can be used to select an alternate emitter which is closer to the ground for hitting laser cubes and relays."
 		}
 	"all_conf"	"laser_emitter.cfg"
 	"Version"
@@ -60,7 +60,7 @@
 		{
 		"" "This sensor detects when a Discouragement Beam is pointed into it."
 		"" ""
-		"" "* When offset to the side of a voxel, Cube Type can be used to select an alternate emitter which is closer to the ground for reciving lasers from cubes."
+		"" "* Cube Type can be used to select an alternate emitter which is closer to the ground for receiving lasers from cubes."
 		}
 	"Version"
 		{

packages/valve/dis_beams/items/catcher/editoritems.txt

@@ -3,6 +3,7 @@
 	"Type"		"ITEM_LASER_CATCHER_CENTER"
 	"Editor"
 		{
+		"SubTypeProperty" "CubeType"
 		"SubType"
 			{
 			"Name"  "PORTAL2_PuzzleEditor_Item_laser_catcher"
@@ -13,26 +14,25 @@
 				"Image"		"palette/laser_catcher.png"
 				}
 			}
-		// Additional dummies, so swapping works.
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_catcher"
-			"Model" "laserrecc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_catcher"
+			"Model" "bee2/clean/laserrec_cent_west.mdl"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_catcher"
-			"Model" "laserrecc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_catcher"
+			"Model" "bee2/clean/laserrec_cent_north.mdl"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_catcher"
-			"Model" "laserrecc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_catcher"
+			"Model" "bee2/clean/laserrec_cent_east.mdl"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_catcher"
-			"Model" "laserrecc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_catcher"
+			"Model" "bee2/clean/laserrec_cent_south.mdl"
 			}
 		"MovementHandle"		"HANDLE_5_POSITIONS"
 		}

packages/valve/dis_beams/items/catcher/vbsp_config.cfg

@@ -14,7 +14,7 @@
 	"Condition"
 		{
 		"Priority" "10"
-		"instance"	"<ITEM_LASER_CATCHER_OFFSET>"
+		"instance"	"<ITEM_LASER_CATCHER_OFFSET>,<ITEM_LASER_CATCHER_CENTER>"
 		"Condition"
 			{
 			"instvar" "$cube_type != 0"
@@ -38,25 +38,42 @@
 				"3" "0"
 				"4" "270"
 				}
-			"AddOverlay"
-				{
-				"File" "<ITEM_LASER_CATCHER_OFFSET:bee2_targpos>"
-				"SilentLookup" "1"
-				"Rotation" "0 $yaw 0"
-				"Offset" "-32 0 0"
-				}
 			}
 		"Condition"
 			{
-			"instvar" "$cube_type != 1"
+			"instance"	"<ITEM_LASER_CATCHER_OFFSET>"
+			"Condition"
+				{
+				"instvar" "$cube_type != 1"
+				"Result"
+					{
+					// On offset catchers, the offset-side of the model has a
+					// thinner border. IF that's on the outermost side of the
+					// instance, we need the squarebeam brush visible to fill the
+					// gap. But for all other orientations, we can add a nodraw
+					// brush to make the visleaf not diagonal.
+					"addOverlay" "instances/bee2/clean/items/laser/catcher_offset_seal.vmf"
+					}
+				}
 			"Result"
 				{
-				// On offset catchers, the offset-side of the model has a
-				// thinner border. IF that's on the outermost side of the
-				// instance, we need the squarebeam brush visible to fill the
-				// gap. But for all other orientations, we can add a nodraw
-				// brush to make the visleaf not diagonal.
-				"addOverlay" "instances/bee2/clean/items/laser/catcher_offset_seal.vmf"
+				"AddOverlay"
+					{
+					"File" "<ITEM_LASER_CATCHER_OFFSET:bee2_targpos>"
+					"SilentLookup" "1"
+					"Rotation" "0 $yaw 0"
+					"Offset" "-32 0 0"
+					}
+				}
+			"Else"
+				{
+				"AddOverlay"
+					{
+					"File" "<ITEM_LASER_CATCHER_OFFSET:bee2_targpos>"
+					"SilentLookup" "1"
+					"Rotation" "0 $yaw 0"
+					"Offset" "0 0 0"
+					}
 				}
 			}
 		}

packages/valve/dis_beams/items/emitter/editoritems.txt

@@ -4,6 +4,7 @@
 	"ItemClass"	"ItemLaserEmitter"
 	"Editor"
 		{
+		"SubTypeProperty" "CubeType"
 		"SubType"
 			{
 			"Name"  "PORTAL2_PuzzleEditor_Item_laser_emitter"
@@ -14,26 +15,25 @@
 				"Image"		"palette/laser_emitter.png"
 				}
 			}
-		// Additional dummies, so swapping works.
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_emitter"
-			"Model" "laseremitc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_emitter"
+			"Model" "bee2/clean/laseremit_cent_west.3ds"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_emitter"
-			"Model" "laseremitc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_emitter"
+			"Model" "bee2/clean/laseremit_cent_north.3ds"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_emitter"
-			"Model" "laseremitc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_emitter"
+			"Model" "bee2/clean/laseremit_cent_east.3ds"
 			}
 		"SubType"
 			{
-			"Name"  "PORTAL2_PuzzleEditor_Item_laser_emitter"
-			"Model" "laseremitc.3ds"
+			"Name"	"PORTAL2_PuzzleEditor_Item_laser_emitter"
+			"Model" "bee2/clean/laseremit_cent_south.3ds"
 			}
 		"MovementHandle"		"HANDLE_5_POSITIONS"
 		}
@@ -44,15 +44,15 @@
 			"DefaultValue"		"0"
 			"Index"		"1"
 			}
-		"CubeType"
-			{
-			"DefaultValue" "0"
-			"Index" "2"
-			}
 		"StartEnabled"
 			{
 			"DefaultValue"		"1"
-			"Index"		"3"
+			"Index"		"2"
+			}
+		"CubeType"
+			{
+			"DefaultValue" "0"
+			"Index" "3"
 			}
 		}
 	"Exporting"
@@ -80,9 +80,6 @@
 				"InvertVar"         "$start_enabled"
 				"Enable_Cmd"        "laser,TurnOn,,0.00,-1"
 				"Disable_Cmd"       "laser,TurnOff,,0.00,-1"
-
-				"Enable_Cmd"        "light,TurnOn,,0.00,-1"
-				"Disable_Cmd"       "light,TurnOff,,0.00,-1"
 				}
 			}
 		"Offset"		"64 64 64"
@@ -263,16 +260,16 @@
 			"DefaultValue"		"0"
 			"Index"		"1"
 			}
-		"CubeType"
-			{
-			"DefaultValue" "0"
-			"Index" "2"
-			}
 		"StartEnabled"
 			{
 			"DefaultValue"		"1"
 			"Index"		"2"
 			}
+		"CubeType"
+			{
+			"DefaultValue" "0"
+			"Index" "3"
+			}
 		}
 	"Exporting"
 		{

packages/valve/dis_beams/items/emitter/vbsp_config.cfg

@@ -7,54 +7,52 @@
 		"Condition"
 			{
 			"instance"	"<ITEM_LASER_EMITTER_CENTER>"
-			"Condition"
+			"Orientation" "Floor"
+			"Result"
 				{
-				"Orientation" "Floor"
-				"Result"
-					{
-					"ChangeInstance" "<ITEM_LASER_EMITTER_CENTER:bee2_floor>"
-					}
+				"ChangeInstance" "<ITEM_LASER_EMITTER_CENTER:bee2_floor>"
 				}
+			}
+		"Condition"//Reoffset emitter. Should not be necessary???
+			{
+			"instance"	"<ITEM_LASER_EMITTER_OFFSET>"
 			"Result"
 				{
-				"SetInstVar" "$offset_mdl 0"
+				"OffsetInst" "-32 0 0"
 				}
 			}
 		"Condition"
 			{
 			"instance"	"<ITEM_LASER_EMITTER_OFFSET>"
-			"Condition"
+			"Orientation" "Floor"
+			"Result"
 				{
-				"Orientation" "Floor"
-				"Result"
-					{
-					"ChangeInstance" "<ITEM_LASER_EMITTER_OFFSET:bee2_floor>"
-					}
+				"ChangeInstance" "<ITEM_LASER_EMITTER_OFFSET:bee2_floor>"
 				}
+			}
+
+		"Result"
+			{
+			"MapInstVar"
+				{
+				"$cube_type" "$yaw"
+				"0" "0" // Doesn't matter
+				"1" "180" 
+				"2" "90"
+				"3" "0"
+				"4" "270"
+				}
+			}
+		"Condition"
+			{
+			"instvar" "$cube_type != 0"
 			"Result"
 				{
-				"OffsetInst" "-32 0 0"
-				"MapInstVar"
-					{
-					"$cube_type" "$yaw"
-					"0" "0" // Doesn't matter
-					"1" "180" 
-					"2" "90"
-					"3" "0"
-					"4" "270"
-					}
+				"SetInstVar" "$offset_mdl 1"
 				}
-			"Condition"
+			"Else"
 				{
-				"instvar" "$cube_type != 0"
-				"Result"
-					{
-					"SetInstVar" "$offset_mdl 1"
-					}
-				"Else"
-					{
-					"SetInstVar" "$offset_mdl 0"
-					}
+				"SetInstVar" "$offset_mdl 0"
 				}
 			}