diff --git a/packages/styles/oldAp/info.txt b/packages/styles/oldAp/info.txt index 9452ffa25b..b2576e4d96 100644 --- a/packages/styles/oldAp/info.txt +++ b/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" diff --git a/packages/styles/oldAp/resources/instances/50s/items/laser/catcher_center.vmf b/packages/styles/oldAp/resources/instances/50s/items/laser/catcher_center.vmf index 5f5a85d688..4b4292dc69 100644 --- a/packages/styles/oldAp/resources/instances/50s/items/laser/catcher_center.vmf +++ b/packages/styles/oldAp/resources/instances/50s/items/laser/catcher_center.vmf @@ -1024,10 +1024,33 @@ entity } } entity +{ + "id" "460" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/bee2/rosemary/underground_laser_catcher_offset.mdl" + "mode" "kv" + "rotate" "0" + "target" "catcher" + "origin" "-52 -20 -52" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "prop_laser_catcher" - "angles" "-90 270 0" + "angles" "-90 $yaw 0" "model" "models/bee2/rosemary/underground_laser_catcher_center.mdl" "renderamt" "255" "rendercolor" "255 255 255" diff --git a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center.vmf b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center.vmf index faa133c5a3..1eeb035214 100644 --- a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center.vmf +++ b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center.vmf @@ -609,10 +609,33 @@ entity } } entity +{ + "id" "3481" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/bee2/rosemary/underground_laser_emitter_offset.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-16 -16 -56" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/bee2/rosemary/underground_laser_emitter.mdl" "renderamt" "255" diff --git a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center_floor.vmf b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center_floor.vmf index 56a2b944fd..c7888244dd 100644 --- a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center_floor.vmf +++ b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_center_floor.vmf @@ -832,10 +832,33 @@ entity } } entity +{ + "id" "3481" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/bee2/rosemary/underground_laser_emitter_offset.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-16 -16 -56" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/bee2/rosemary/underground_laser_emitter.mdl" "renderamt" "255" diff --git a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_offset_floor.vmf b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_offset_floor.vmf index 4125066a3c..55bd0af468 100644 --- a/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_offset_floor.vmf +++ b/packages/styles/oldAp/resources/instances/50s/items/laser/emitter_offset_floor.vmf @@ -773,7 +773,7 @@ entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "fademindist" "-1" "fadescale" "1" diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.dx90.vtx b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.dx90.vtx new file mode 100644 index 0000000000..7714c5f00d Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.dx90.vtx differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.mdl new file mode 100644 index 0000000000..a6ea8d79bf Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.vvd b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.vvd new file mode 100644 index 0000000000..07cb02a682 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_east.vvd differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.dx90.vtx b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.dx90.vtx new file mode 100644 index 0000000000..40f5512e3e Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.dx90.vtx differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.mdl new file mode 100644 index 0000000000..59d86d0999 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.vvd b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.vvd new file mode 100644 index 0000000000..78ee1b7f74 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_north.vvd differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.dx90.vtx b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.dx90.vtx new file mode 100644 index 0000000000..bdf43f7c22 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.dx90.vtx differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.mdl new file mode 100644 index 0000000000..b3c36e029e Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.vvd b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.vvd new file mode 100644 index 0000000000..306c986a60 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_south.vvd differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.dx90.vtx b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.dx90.vtx new file mode 100644 index 0000000000..b6980be802 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.dx90.vtx differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.mdl new file mode 100644 index 0000000000..c65ddb0a7e Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.vvd b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.vvd new file mode 100644 index 0000000000..7695052ca8 Binary files /dev/null and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_center_west.vvd differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_east.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_east.mdl index b331388482..b629a84357 100644 Binary files a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_east.mdl and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_east.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_north.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_north.mdl index 15c9e80b35..37a2225c6b 100644 Binary files a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_north.mdl and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_north.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_south.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_south.mdl index 1d52f5a223..dbe36887d5 100644 Binary files a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_south.mdl and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_south.mdl differ diff --git a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_west.mdl b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_west.mdl index 71e14b8b28..e6bc0a97b8 100644 Binary files a/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_west.mdl and b/packages/styles/oldAp/resources/models/props_map_editor/bee2/retro/laser_catcher_offset_west.mdl differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_east.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_east.3ds new file mode 100644 index 0000000000..5f2de24f13 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_east.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_north.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_north.3ds new file mode 100644 index 0000000000..5f2de24f13 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_north.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_south.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_south.3ds new file mode 100644 index 0000000000..5f2de24f13 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_south.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_west.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_west.3ds new file mode 100644 index 0000000000..5f2de24f13 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_catcher_center_west.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_east.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_east.3ds new file mode 100644 index 0000000000..dbe7db6db5 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_east.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_north.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_north.3ds new file mode 100644 index 0000000000..dbe7db6db5 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_north.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_south.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_south.3ds new file mode 100644 index 0000000000..dbe7db6db5 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_south.3ds differ diff --git a/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_west.3ds b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_west.3ds new file mode 100644 index 0000000000..dbe7db6db5 Binary files /dev/null and b/packages/styles/oldAp/resources/models/puzzlemaker/selection_bee2/retro/laser_emitter_center_west.3ds differ diff --git a/packages/styles/overgrown/resources/instances/over/items/laser/catcher_center.vmf b/packages/styles/overgrown/resources/instances/over/items/laser/catcher_center.vmf index 0af6ab05f7..f29ef83e62 100644 --- a/packages/styles/overgrown/resources/instances/over/items/laser/catcher_center.vmf +++ b/packages/styles/overgrown/resources/instances/over/items/laser/catcher_center.vmf @@ -409,33 +409,6 @@ world } } entity -{ - "id" "259" - "classname" "light" - "_constant_attn" "0" - "_distance" "0" - "_fifty_percent_distance" "56" - "_hardfalloff" "0" - "_light" "179 243 255 15" - "_lightHDR" "-1 -1 -1 1" - "_lightscaleHDR" "1" - "_linear_attn" "0" - "_quadratic_attn" "1" - "_shadoworiginoffset" "0 0 0" - "_zero_percent_distance" "96" - "angles" "0 0 0" - "spawnflags" "0" - "style" "0" - "origin" "0 0 -48" - editor - { - "color" "255 255 0" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 1500]" - } -} -entity { "id" "242" "classname" "func_noportal_volume" @@ -526,10 +499,33 @@ entity } } entity +{ + "id" "460" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_catcher.mdl" + "mode" "kv" + "rotate" "0" + "target" "catcher" + "origin" "-52 -20 -52" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "prop_laser_catcher" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "drawinfastreflection" "1" "model" "models/props/laser_catcher_center.mdl" "renderamt" "255" diff --git a/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center.vmf b/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center.vmf index d9bfa486fe..d8571c177a 100644 --- a/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center.vmf +++ b/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center.vmf @@ -500,10 +500,33 @@ entity } } entity +{ + "id" "652" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_emitter.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-15.3685 -16.3765 -54" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 90 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/props/laser_emitter_center.mdl" "renderamt" "255" diff --git a/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center_floor.vmf b/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center_floor.vmf index 27c085a161..1106d5e0ec 100644 --- a/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center_floor.vmf +++ b/packages/styles/overgrown/resources/instances/over/items/laser/emitter_center_floor.vmf @@ -1288,10 +1288,33 @@ entity } } entity +{ + "id" "1150" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_emitter.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-15.3685 -16.3765 -54" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 90 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/props/laser_emitter_center.mdl" "renderamt" "255" diff --git a/packages/styles/p1_style/resources/instances/p1/items/laser/catcher_center.vmf b/packages/styles/p1_style/resources/instances/p1/items/laser/catcher_center.vmf index cfef2fe582..0d8fa4cc35 100644 --- a/packages/styles/p1_style/resources/instances/p1/items/laser/catcher_center.vmf +++ b/packages/styles/p1_style/resources/instances/p1/items/laser/catcher_center.vmf @@ -410,34 +410,32 @@ world } entity { - "id" "279" - "classname" "light" - "_constant_attn" "0" - "_distance" "0" - "_fifty_percent_distance" "56" - "_hardfalloff" "0" - "_light" "179 243 255 15" - "_lightHDR" "-1 -1 -1 1" - "_lightscaleHDR" "1" - "_linear_attn" "0" - "_quadratic_attn" "1" - "_zero_percent_distance" "96" - "spawnflags" "0" - "style" "0" - "origin" "0 0 -48" + "id" "680" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/bee2/props_p1/laser_catcher_offset.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser_catcher" + "origin" "-52 -20 -52" editor { "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" - "logicalpos" "[0 1500]" + "logicalpos" "[0 0]" } } entity { "id" "270" "classname" "prop_laser_catcher" - "angles" "-90 180 0" + "angles" "-90 $yaw 0" "model" "models/props/laser_catcher_center.mdl" "renderamt" "255" "rendercolor" "255 255 255" diff --git a/packages/styles/p1_style/resources/instances/p1/items/laser/emitter_center.vmf b/packages/styles/p1_style/resources/instances/p1/items/laser/emitter_center.vmf index 5ea83f515e..618b3224e5 100644 --- a/packages/styles/p1_style/resources/instances/p1/items/laser/emitter_center.vmf +++ b/packages/styles/p1_style/resources/instances/p1/items/laser/emitter_center.vmf @@ -840,10 +840,33 @@ entity } } entity +{ + "id" "652" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/bee2/props_p1/laser_emitter_offset.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-15.3685 -16.3765 -54" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 90 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/bee2/props_p1/laser_emitter.mdl" "renderamt" "255" diff --git a/packages/valve/dis_beams/info.txt b/packages/valve/dis_beams/info.txt index 77a4b305f0..770257f705 100644 --- a/packages/valve/dis_beams/info.txt +++ b/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" { diff --git a/packages/valve/dis_beams/items/catcher/editoritems.txt b/packages/valve/dis_beams/items/catcher/editoritems.txt index 441b5bb13e..2972a8d843 100644 --- a/packages/valve/dis_beams/items/catcher/editoritems.txt +++ b/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" } diff --git a/packages/valve/dis_beams/items/catcher/vbsp_config.cfg b/packages/valve/dis_beams/items/catcher/vbsp_config.cfg index e131f5c552..df26772422 100644 --- a/packages/valve/dis_beams/items/catcher/vbsp_config.cfg +++ b/packages/valve/dis_beams/items/catcher/vbsp_config.cfg @@ -14,7 +14,7 @@ "Condition" { "Priority" "10" - "instance" "" + "instance" "," "Condition" { "instvar" "$cube_type != 0" @@ -38,25 +38,42 @@ "3" "0" "4" "270" } - "AddOverlay" - { - "File" "" - "SilentLookup" "1" - "Rotation" "0 $yaw 0" - "Offset" "-32 0 0" - } } "Condition" { - "instvar" "$cube_type != 1" + "instance" "" + "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" "" + "SilentLookup" "1" + "Rotation" "0 $yaw 0" + "Offset" "-32 0 0" + } + } + "Else" + { + "AddOverlay" + { + "File" "" + "SilentLookup" "1" + "Rotation" "0 $yaw 0" + "Offset" "0 0 0" + } } } } diff --git a/packages/valve/dis_beams/items/emitter/editoritems.txt b/packages/valve/dis_beams/items/emitter/editoritems.txt index 0302fc3f5a..e98d0a3bfb 100644 --- a/packages/valve/dis_beams/items/emitter/editoritems.txt +++ b/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" { diff --git a/packages/valve/dis_beams/items/emitter/vbsp_config.cfg b/packages/valve/dis_beams/items/emitter/vbsp_config.cfg index 745c6da093..38ca3bba47 100644 --- a/packages/valve/dis_beams/items/emitter/vbsp_config.cfg +++ b/packages/valve/dis_beams/items/emitter/vbsp_config.cfg @@ -7,54 +7,52 @@ "Condition" { "instance" "" - "Condition" + "Orientation" "Floor" + "Result" { - "Orientation" "Floor" - "Result" - { - "ChangeInstance" "" - } + "ChangeInstance" "" } + } + "Condition"//Reoffset emitter. Should not be necessary??? + { + "instance" "" "Result" { - "SetInstVar" "$offset_mdl 0" + "OffsetInst" "-32 0 0" } } "Condition" { "instance" "" - "Condition" + "Orientation" "Floor" + "Result" { - "Orientation" "Floor" - "Result" - { - "ChangeInstance" "" - } + "ChangeInstance" "" } + } + + "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" } } diff --git a/packages/valve/dis_beams/resources/instances/clean/items/laser/catcher_center.vmf b/packages/valve/dis_beams/resources/instances/clean/items/laser/catcher_center.vmf index d60102bc0b..1e8367a97a 100644 --- a/packages/valve/dis_beams/resources/instances/clean/items/laser/catcher_center.vmf +++ b/packages/valve/dis_beams/resources/instances/clean/items/laser/catcher_center.vmf @@ -409,32 +409,6 @@ world } } entity -{ - "id" "257" - "classname" "light" - "_constant_attn" "0" - "_distance" "0" - "_fifty_percent_distance" "56" - "_hardfalloff" "0" - "_light" "179 243 255 15" - "_lightHDR" "-1 -1 -1 1" - "_lightscaleHDR" "1" - "_linear_attn" "0" - "_quadratic_attn" "1" - "_zero_percent_distance" "96" - "angles" "0 0 0" - "spawnflags" "0" - "style" "0" - "origin" "0 0 -48" - editor - { - "color" "255 255 0" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 1500]" - } -} -entity { "id" "242" "classname" "func_noportal_volume" @@ -526,10 +500,33 @@ entity } } entity +{ + "id" "460" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_catcher.mdl" + "mode" "kv" + "rotate" "0" + "target" "catcher" + "origin" "-52 -20 -52" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "prop_laser_catcher" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "model" "models/props/laser_catcher_center.mdl" "renderamt" "255" "rendercolor" "255 255 255" diff --git a/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center.vmf b/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center.vmf index fd86028fc3..81631b513e 100644 --- a/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center.vmf +++ b/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center.vmf @@ -515,10 +515,33 @@ entity } } entity +{ + "id" "652" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_emitter.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-15.3685 -16.3765 -54" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 0 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "fademindist" "-1" "fadescale" "1" diff --git a/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center_floor.vmf b/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center_floor.vmf index 71bf9b1326..2257e5eb8e 100644 --- a/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center_floor.vmf +++ b/packages/valve/dis_beams/resources/instances/clean/items/laser/emitter_center_floor.vmf @@ -1212,10 +1212,33 @@ entity } } entity +{ + "id" "1150" + "classname" "comp_kv_setter" + "angles" "0 0 0" + "conv_ang" "0" + "ctrl_type" "0" + "ctrl_value" "$offset_mdl" + "invert" "0" + "kv_name" "model" + "kv_value_global" "models/props/laser_emitter.mdl" + "mode" "kv" + "rotate" "0" + "target" "laser" + "origin" "-15.3685 -16.3765 -54" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "12" "classname" "env_portal_laser" - "angles" "-90 90 0" + "angles" "-90 $yaw 0" "AutoAimEnabled" "$autoaim" "model" "models/props/laser_emitter_center.mdl" "renderamt" "255" diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.dx90.vtx new file mode 100644 index 0000000000..4a9d38a68f Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.mdl new file mode 100644 index 0000000000..cd1af8394e Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.vvd new file mode 100644 index 0000000000..e4aada78b1 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_east.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.dx90.vtx new file mode 100644 index 0000000000..16d391d894 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.mdl new file mode 100644 index 0000000000..9d7a175b56 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.vvd new file mode 100644 index 0000000000..702176c403 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_north.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.dx90.vtx new file mode 100644 index 0000000000..13d9d01460 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.mdl new file mode 100644 index 0000000000..909df7eb11 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.vvd new file mode 100644 index 0000000000..2525b02c52 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_south.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.dx90.vtx new file mode 100644 index 0000000000..e0baac3566 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.mdl new file mode 100644 index 0000000000..e92655e062 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.vvd new file mode 100644 index 0000000000..4709566417 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_cent_west.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.dx90.vtx index dfe7d4fcbd..8060fb3239 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.mdl index 527ce4d403..f86a958227 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.vvd index f0506a4618..c0d4a158a0 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_east.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.dx90.vtx index bfcd14661f..b8811093fe 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.mdl index 82ff2687e9..4e8f3fe7ee 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.vvd index 6493ffd141..a8f213e96f 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_north.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.dx90.vtx index 3d660fb435..d1b38d21f3 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.mdl index 4a121dab06..7029a85a77 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.vvd index 459a54b1dd..045a5e2922 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_south.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.dx90.vtx index 035d11e2b8..88be00f5ac 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.mdl index 54d2538ecd..d18a557748 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.vvd index 999b0cd03e..34009600c9 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laseremit_off_west.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.dx90.vtx new file mode 100644 index 0000000000..92b0f69ae1 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.mdl new file mode 100644 index 0000000000..abd6883672 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.vvd new file mode 100644 index 0000000000..7890b06d0d Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_east.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.dx90.vtx new file mode 100644 index 0000000000..6384eef2b0 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.mdl new file mode 100644 index 0000000000..a0c023c263 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.vvd new file mode 100644 index 0000000000..3cb666946d Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_north.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.dx90.vtx new file mode 100644 index 0000000000..8bcc9ed569 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.mdl new file mode 100644 index 0000000000..01100aecbf Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.vvd new file mode 100644 index 0000000000..8bc70ac354 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_south.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.dx90.vtx new file mode 100644 index 0000000000..7d26333849 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.mdl new file mode 100644 index 0000000000..27e03cd157 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.vvd new file mode 100644 index 0000000000..c3adb7fc0e Binary files /dev/null and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_cent_west.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.dx90.vtx index b6c15306af..69428af170 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.mdl index b0ea149cc7..43a8d587d0 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.vvd index 9174cbaf3c..fc6553bcf3 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_east.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.dx90.vtx index c2cb2b6b95..365782dd10 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.mdl index 8f8660e9c6..4a76764416 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.vvd index 214fbb29dc..fb26c226cf 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_north.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.dx90.vtx index 02be01603c..d9b7c93316 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.mdl index 7ec8991bae..28ecb51a01 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.vvd index 17739c46bd..659cfe0603 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_south.vvd differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.dx90.vtx b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.dx90.vtx index 2bb32d25cc..0680035327 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.dx90.vtx and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.dx90.vtx differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.mdl b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.mdl index ee5101c873..bf986c1d35 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.mdl and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.mdl differ diff --git a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.vvd b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.vvd index efbdf2a9df..7676d20352 100644 Binary files a/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.vvd and b/packages/valve/dis_beams/resources/models/props_map_editor/bee2/clean/laserrec_off_west.vvd differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_east.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_east.3ds new file mode 100644 index 0000000000..f193dc1a7d Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_east.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_north.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_north.3ds new file mode 100644 index 0000000000..9c6c8779ad Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_north.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_south.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_south.3ds new file mode 100644 index 0000000000..a732baa077 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_south.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_west.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_west.3ds new file mode 100644 index 0000000000..b8d9bcb006 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_cent_west.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_east.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_east.3ds index 149d2a29fc..69af5ee661 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_east.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_east.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_north.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_north.3ds index 149d2a29fc..264f404ae7 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_north.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_north.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_south.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_south.3ds index 149d2a29fc..7da1a25b8d 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_south.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_south.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_west.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_west.3ds index 149d2a29fc..7db4094980 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_west.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laseremit_off_west.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_east.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_east.3ds new file mode 100644 index 0000000000..fb3938e15b Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_east.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_north.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_north.3ds new file mode 100644 index 0000000000..0c719a1629 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_north.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_south.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_south.3ds new file mode 100644 index 0000000000..e1eec12290 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_south.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_west.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_west.3ds new file mode 100644 index 0000000000..77a088ac63 Binary files /dev/null and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_cent_west.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_east.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_east.3ds index e4642320a9..450d07fa41 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_east.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_east.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_north.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_north.3ds index e4642320a9..4030bea1e8 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_north.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_north.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_south.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_south.3ds index e4642320a9..1d15aa0ca0 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_south.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_south.3ds differ diff --git a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_west.3ds b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_west.3ds index e4642320a9..061786ac70 100644 Binary files a/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_west.3ds and b/packages/valve/dis_beams/resources/models/puzzlemaker/selection_bee2/clean/laserrec_off_west.3ds differ