diff --git a/CHANGELOG.md b/CHANGELOG.md index 04f30b55f..61aa6ab82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * #1609: Sendificators are now blocked by Closed Solid Fields. * #4415: Add additional clips underneath stair items to fix issues with items falling inside. * #4417: Fix it being possible to portal on extended Old Aperture stairs. +* #2779: Add proper hold-logic and clips to P1 vertical Exit Door. ------------------------------------------ diff --git a/packages/styles/p1_style/items/exit_door/vbsp_config.cfg b/packages/styles/p1_style/items/exit_door/vbsp_config.cfg index f07b1080c..f4ef1f1d1 100644 --- a/packages/styles/p1_style/items/exit_door/vbsp_config.cfg +++ b/packages/styles/p1_style/items/exit_door/vbsp_config.cfg @@ -13,8 +13,8 @@ "Type" "AND" "InvertVar" "$start_open" "SpawnFire" "dynamic" - "Enable_Cmd" "exit_door,Open,,0.00,-1" - "Disable_Cmd" "exit_door,Close,,0.00,-1" + "Enable_Cmd" "exit_door,TurnOn,,0.00,-1" + "Disable_Cmd" "exit_door,TurnOff,,0.00,-1" } } } diff --git a/packages/styles/p1_style/resources/instances/p1/elevator_sp/exit_door_vert.vmf b/packages/styles/p1_style/resources/instances/p1/elevator_sp/exit_door_vert.vmf index f8e4ae457..701a10da9 100644 --- a/packages/styles/p1_style/resources/instances/p1/elevator_sp/exit_door_vert.vmf +++ b/packages/styles/p1_style/resources/instances/p1/elevator_sp/exit_door_vert.vmf @@ -1,8 +1,8 @@ versioninfo { "editorversion" "400" - "editorbuild" "8997" - "mapversion" "263" + "editorbuild" "9672" + "mapversion" "279" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "263" + "mapversion" "279" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -29,12 +29,261 @@ world "skyname" "sky_day01_01" } entity +{ + "id" "63415" + "classname" "comp_relay" + "ctrl_type" "0" + "ctrl_value" "1" + "delay" "0.0" + "targetname" "exit_door" + connections + { + "OnTurnedOn" "door_trigFireUser10-1" + "OnTurnedOn" "door_close_manSetStateAFalse0-1" + "OnTurnedOff" "door_close_manSetStateATrue0-1" + } + "origin" "-64 -16 -32" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "63434" + "classname" "logic_coop_manager" + "angles" "0 0 0" + "defaultplayerstatea" "!$start_open" + "defaultplayerstateb" "1" + "targetname" "door_close_man" + connections + { + "OnChangeToAllTrue" "doorClose0-1" + "OnChangeToAllTrue" "door_clipEnable0-1" + } + "origin" "-64 0 -16" + editor + { + "color" "0 100 250" + "visgroupshown" "1" + "visgroupautoshown" "1" + "comments" "A = wants to close, B = door clear." + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "63514" + "classname" "trigger_multiple" + "origin" "-80 0 0" + "spawnflags" "9" + "startdisabled" "0" + "targetname" "close_trig" + "wait" "1" + connections + { + "OnStartTouch" "door_close_manSetStateBFalse0-1" + "OnEndTouchAll" "door_close_manSetStateBTrue0-1" + } + solid + { + "id" "63515" + side + { + "id" "3764" + "plane" "(-86 63 64) (-86 63 -64) (-74 63 -64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 34.6667] 0.375" + "vaxis" "[0 0 -1 -63.7968] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3763" + "plane" "(-74 -63 64) (-74 -63 -64) (-86 -63 -64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 34.6667] 0.375" + "vaxis" "[0 0 -1 -63.7968] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3762" + "plane" "(-86 -63 64) (-86 -63 -64) (-86 63 -64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 -36] 0.2625" + "vaxis" "[0 0 -1 -62.7968] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3761" + "plane" "(-74 63 64) (-74 63 -64) (-74 -63 -64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 -1 0 36] 0.2625" + "vaxis" "[0 0 -1 -62.7968] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3760" + "plane" "(-74 63 -64) (-86 63 -64) (-86 -63 -64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 34.6667] 0.375" + "vaxis" "[0 1 0 -36] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3759" + "plane" "(-74 -63 64) (-86 -63 64) (-86 63 64)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -34.6667] 0.375" + "vaxis" "[0 1 0 -36] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 -8768]" + } +} +entity +{ + "id" "63394" + "classname" "func_brush" + "_minlight" "0" + "disableflashlight" "0" + "disablereceiveshadows" "0" + "disableshadowdepth" "0" + "drawinfastreflection" "0" + "invert_exclusion" "0" + "origin" "-80 0 0" + "renderamt" "255" + "rendercolor" "255 255 255" + "renderfx" "0" + "rendermode" "0" + "solidbsp" "0" + "solidity" "0" + "spawnflags" "2" + "startdisabled" "0" + "targetname" "door_clip" + "vrad_brush_cast_shadows" "0" + solid + { + "id" "63392" + side + { + "id" "3752" + "plane" "(-86 -63 64) (-74 -63 64) (-74 -63 -64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[1 0 0 -42.6667] 0.375" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3751" + "plane" "(-86 63 -64) (-74 63 -64) (-74 63 64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[1 0 0 -42.6667] 0.375" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3750" + "plane" "(-86 -63 64) (-86 -63 -64) (-86 63 -64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[0 0 1 0] 0.25" + "vaxis" "[0 1 0 0] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3749" + "plane" "(-74 63 64) (-74 63 -64) (-74 -63 -64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[0 0 1 0] 0.25" + "vaxis" "[0 1 0 0] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3748" + "plane" "(-74 -63 64) (-86 -63 64) (-86 63 64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[1 0 0 -42.6667] 0.375" + "vaxis" "[0 1 0 0] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3747" + "plane" "(-74 63 -64) (-86 63 -64) (-86 -63 -64)" + "material" "TOOLS/TOOLSINVISIBLE" + "uaxis" "[1 0 0 -42.6667] 0.375" + "vaxis" "[0 1 0 0] 0.2625" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 500]" + } +} +entity { "id" "63224" "classname" "func_areaportal" "portalversion" "1" "startopen" "0" - "target" "exit_door" + "target" "door" "targetname" "door_portal" solid { @@ -121,22 +370,6 @@ entity } } entity -{ - "id" "63372" - "classname" "info_target" - "angles" "-90 180 0" - "spawnflags" "1" - "targetname" "door_light" - "origin" "-79 1.65229e-005 0" - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 8000]" - } -} -entity { "id" "63036" "classname" "trigger_once" @@ -144,14 +377,16 @@ entity "solid" "6" "spawnflags" "4097" "StartDisabled" "0" + "targetname" "door_trig" connections { - "OnTrigger" "exit_doorClose0-1" - "OnTrigger" "counterKill0-1" - "OnTrigger" "@musicKill0.01-1" - "OnTrigger" "@musicStopSound0-1" + "OnTrigger" "doorClose0.01-1" + "OnTrigger" "@music_stopTrigger0-1" "OnTrigger" "@map_wonTrigger0-1" "OnTrigger" "@voice_exitTrigger0-1" + "OnUser1" "doorOpen0-1" + "OnTrigger" "door_manClose0-1" + "OnTrigger" "door_close_manKill0-1" } solid { @@ -234,6 +469,7 @@ entity "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" + "comments" "By routing the open input through this, it is automatically cut off when locking." "logicalpos" "[0 5500]" } } @@ -244,13 +480,11 @@ entity "angles" "0 0 0" "disableshadows" "1" "drawinfastreflection" "1" - "fademindist" "-1" - "fadescale" "1" - "lightingorigin" "door_light" + "lightingorigin" "door_clip" "MaxAnimTime" "10" "MinAnimTime" "5" "model" "models/props/door_02.mdl" - "parentname" "exit_door" + "parentname" "door" "physdamagescale" "1.0" "renderamt" "255" "rendercolor" "255 255 255" @@ -293,13 +527,15 @@ entity "spawnpos" "$start_open" "speed" "250" "startclosesound" "BEE2.P1.button_up" - "targetname" "exit_door" + "targetname" "door" "unlocked_sentence" "0" "wait" "-1" connections { "OnOpen" "exit_doorSetSpeed750-1" "OnClose" "exit_doorSetSpeed2000-1" + "OnOpen" "door_clipDisable0-1" + "OnClose" "door_clipEnable0-1" } solid { @@ -307,9 +543,9 @@ entity side { "id" "3542" - "plane" "(-84 60 64) (-84 60 -64) (-76 60 -64)" + "plane" "(-86 63 64) (-86 63 -64) (-74 63 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 56] 0.25" + "uaxis" "[-1 0 0 34.6667] 0.375" "vaxis" "[0 0 -1 -63.7968] 0.25" "rotation" "0" "lightmapscale" "16" @@ -318,9 +554,9 @@ entity side { "id" "3541" - "plane" "(-76 -60 64) (-76 -60 -64) (-84 -60 -64)" + "plane" "(-74 -63 64) (-74 -63 -64) (-86 -63 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 56] 0.25" + "uaxis" "[-1 0 0 34.6667] 0.375" "vaxis" "[0 0 -1 -63.7968] 0.25" "rotation" "0" "lightmapscale" "16" @@ -329,9 +565,9 @@ entity side { "id" "3540" - "plane" "(-84 -60 64) (-84 -60 -64) (-84 60 -64)" + "plane" "(-86 -63 64) (-86 -63 -64) (-86 63 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 1 0 -36] 0.25" + "uaxis" "[0 1 0 -36] 0.2625" "vaxis" "[0 0 -1 -62.7968] 0.25" "rotation" "0" "lightmapscale" "16" @@ -340,9 +576,9 @@ entity side { "id" "3539" - "plane" "(-76 60 64) (-76 60 -64) (-76 -60 -64)" + "plane" "(-74 63 64) (-74 63 -64) (-74 -63 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[0 -1 0 36] 0.25" + "uaxis" "[0 -1 0 36] 0.2625" "vaxis" "[0 0 -1 -62.7968] 0.25" "rotation" "0" "lightmapscale" "16" @@ -351,10 +587,10 @@ entity side { "id" "3538" - "plane" "(-76 60 -64) (-84 60 -64) (-84 -60 -64)" + "plane" "(-74 63 -64) (-86 63 -64) (-86 -63 -64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[-1 0 0 56] 0.25" - "vaxis" "[0 1 0 -36] 0.25" + "uaxis" "[-1 0 0 34.6667] 0.375" + "vaxis" "[0 1 0 -36] 0.2625" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -362,10 +598,10 @@ entity side { "id" "3537" - "plane" "(-76 -60 64) (-84 -60 64) (-84 60 64)" + "plane" "(-74 -63 64) (-86 -63 64) (-86 63 64)" "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[1 0 0 -56] 0.25" - "vaxis" "[0 1 0 -36] 0.25" + "uaxis" "[1 0 0 -34.6667] 0.375" + "vaxis" "[0 1 0 -36] 0.2625" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -1082,210 +1318,12 @@ entity } } entity -{ - "id" "6850" - "classname" "trigger_multiple" - "origin" "-80 0 0" - "solid" "6" - "spawnflags" "4097" - "StartDisabled" "0" - "wait" "1" - connections - { - "OnStartTouch" "@relay_leaving_levelEnable0-1" - "OnEndTouch" "@relay_leaving_levelDisable0-1" - "OnStartTouch" "radio_soundPlaySound0-1" - } - solid - { - "id" "6851" - side - { - "id" "1920" - "plane" "(-480 64 -64) (-88 64 -64) (-88 64 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -32] 0.25" - "vaxis" "[0 0 -1 -4] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1919" - "plane" "(-88 -64.036 -64) (-480 -64.0361 -64) (-480 -64.0361 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -31.9962] 0.25" - "vaxis" "[0 0 -1 -4] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1918" - "plane" "(-88 -64.0362 64) (-480 -64.0363 64) (-480 64 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -31.9962] 0.25" - "vaxis" "[0 -1 0 63.8535] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1917" - "plane" "(-88 64 -64) (-480 64 -64) (-480 -64.037 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -31.9962] 0.25" - "vaxis" "[0 -1 0 63.8535] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1916" - "plane" "(-88 64 64) (-88 64 -64) (-88 -64.0356 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 3.85535] 0.25" - "vaxis" "[0 1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1915" - "plane" "(-480 -64.0356 64) (-480 -64.0356 -64) (-480 64 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 36] 0.25" - "vaxis" "[0 1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 5500]" - } -} -entity -{ - "id" "6483" - "classname" "trigger_multiple" - "origin" "-168 0 0" - "solid" "6" - "spawnflags" "4097" - "StartDisabled" "1" - "targetname" "@preview_restart_trigger" - "wait" "3" - connections - { - "OnTrigger" "@clientcommandCommandrestart_level2-1" - "OnTrigger" "@preview_complete_messageDisplay0-1" - } - solid - { - "id" "6468" - side - { - "id" "1908" - "plane" "(-160 64 -64) (-160 -64 -64) (-160 -64 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[0 1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1907" - "plane" "(-176 -64 -64) (-176 64 -64) (-176 64 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[0 1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1906" - "plane" "(-176 64 -64) (-176 -64 -64) (-160 -64 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1905" - "plane" "(-176 -64 64) (-176 64 64) (-160 64 64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1904" - "plane" "(-160 -64 64) (-160 -64 -64) (-176 -64 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "1903" - "plane" "(-176 64 64) (-176 64 -64) (-160 64 -64)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 0 1 0] 0.25" - "vaxis" "[-1 0 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 500]" - } -} -entity { "id" "6002" "classname" "func_instance_parms" "parm1" "$connectioncount integer 1" "parm2" "$start_open integer 0" - "origin" "-64 1.78342e-005 -16" + "origin" "-64 16 -32" editor { "color" "220 30 220"