From 0bc44d3baea42328587a712841903b60e538d01b Mon Sep 17 00:00:00 2001 From: kitsune Date: Wed, 14 Jan 2026 17:57:59 +0100 Subject: [PATCH] Fix softlocks and unreachable resource spawns Resolved multiple player softlocks and invalid resource spawn locations across several maps: - ASI-Jac4-Residential: added a clip ramp to prevent players from getting stuck. - ASI-Jac4-Residential: extended a clip wall to prevent players from getting stuck in a blocked ventilation branch. - rd-reduction3: relocated props to eliminate spots where players could get stuck. - rd-ocs2landingbay7: added a clip wall to prevent players from getting stuck. - rd-NH01_LogisticsArea: converted info_node_marine_hint to info_node in areas unreachable by players, preventing crafting resources from spawning there. Fixes: internal bug tracking tickets #234770, #237009, #236154, #239533 --- contentsrc/mapsrc/ASI-Jac4-Residential.vmf | 219 +++++++++----------- contentsrc/mapsrc/rd-NH01_LogisticsArea.vmf | 124 ++++++++--- contentsrc/mapsrc/rd-ocs2landingbay7.vmf | 100 +++++++-- contentsrc/mapsrc/rd-reduction3.vmf | 16 +- 4 files changed, 286 insertions(+), 173 deletions(-) diff --git a/contentsrc/mapsrc/ASI-Jac4-Residential.vmf b/contentsrc/mapsrc/ASI-Jac4-Residential.vmf index 944f4a20d..08e4ffea7 100644 --- a/contentsrc/mapsrc/ASI-Jac4-Residential.vmf +++ b/contentsrc/mapsrc/ASI-Jac4-Residential.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "3022" + "mapversion" "3027" "formatversion" "100" "prefab" "0" } @@ -38,13 +38,13 @@ viewsettings "bSnapToGrid" "1" "bShowGrid" "1" "bShowLogicalGrid" "0" - "nGridSpacing" "2" + "nGridSpacing" "1" "bShow3DGrid" "0" } world { "id" "394754" - "mapversion" "3022" + "mapversion" "3027" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -43990,6 +43990,71 @@ world } } solid + { + "id" "1913559" + side + { + "id" "142105" + "plane" "(-672 -4656 51) (-440 -4656 51) (-440 -5025 -56)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "142106" + "plane" "(-440 -5025 -56) (-440 -4656 -56) (-672 -4656 -56)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "142107" + "plane" "(-672 -4656 -56) (-672 -4656 51) (-672 -5025 -56)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[0 -1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "142108" + "plane" "(-440 -4656 51) (-440 -4656 -56) (-440 -5025 -56)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "142109" + "plane" "(-440 -4656 51) (-672 -4656 51) (-672 -4656 -56)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "0 178 191" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + solid { "id" "1429972" side @@ -82792,94 +82857,6 @@ entity } } entity -{ - "id" "842239" - "classname" "func_detail" - solid - { - "id" "842240" - side - { - "id" "117496" - "plane" "(-616 -5072 362) (-616 -5072 153) (-672 -5072 153)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[1 0 0 -28] 1" - "vaxis" "[0 0 -1 17] 1" - "rotation" "0" - "lightmapscale" "256" - "smoothing_groups" "0" - } - side - { - "id" "117495" - "plane" "(-616 -4536 362) (-616 -4536 153) (-616 -5072 153)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[0 1 0 0] 1" - "vaxis" "[0 0 -1 17] 1" - "rotation" "0" - "lightmapscale" "256" - "smoothing_groups" "0" - } - side - { - "id" "117494" - "plane" "(-672 -4536 362) (-672 -4536 153) (-616 -4536 153)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[-1 0 0 47] 0.4" - "vaxis" "[0 0 -1 63.5] 0.4" - "rotation" "0" - "lightmapscale" "256" - "smoothing_groups" "0" - } - side - { - "id" "117493" - "plane" "(-672 -5072 362) (-672 -5072 153) (-672 -4536 153)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[0 -1 0 5] 0.4" - "vaxis" "[0 0 -1 52.5] 0.4" - "rotation" "0" - "lightmapscale" "32" - "smoothing_groups" "0" - } - side - { - "id" "117492" - "plane" "(-616 -5072 362) (-672 -5072 362) (-672 -4536 362)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[0 1 0 0] 1" - "vaxis" "[1 0 0 -28] 1" - "rotation" "0" - "lightmapscale" "256" - "smoothing_groups" "0" - } - side - { - "id" "117491" - "plane" "(-672 -5072 153) (-616 -5072 153) (-616 -4536 153)" - "material" "TOOLS/TOOLSPLAYERCLIP" - "uaxis" "[0 1 0 0] 1" - "vaxis" "[-1 0 0 28] 1" - "rotation" "0" - "lightmapscale" "256" - "smoothing_groups" "0" - } - editor - { - "color" "0 180 0" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - editor - { - "color" "0 180 0" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[8500 -8268]" - } -} -entity { "id" "1140582" "classname" "prop_static" @@ -108582,7 +108559,7 @@ entity { "id" "223204" "classname" "prop_static" - "angles" "-0.999976 90.5001 -90.0045" + "angles" "-0.570515 90.2851 -90.0045" "disableselfshadowing" "0" "disableshadows" "1" "disablevertexlighting" "0" @@ -108594,7 +108571,7 @@ entity "screenspacefade" "0" "skin" "0" "solid" "6" - "origin" "2756 -5974 -22" + "origin" "2756 -5970.33 -22" editor { "color" "255 255 0" @@ -118206,7 +118183,7 @@ entity "renderamt" "255" "rendercolor" "255 255 255" "skin" "0" - "solid" "6" + "solid" "0" "origin" "-573.951 -4710.12 42.4678" editor { @@ -118229,7 +118206,7 @@ entity "renderamt" "255" "rendercolor" "255 255 255" "skin" "0" - "solid" "6" + "solid" "0" "origin" "-605.951 -4815.12 58.4678" editor { @@ -118252,7 +118229,7 @@ entity "renderamt" "255" "rendercolor" "255 255 255" "skin" "0" - "solid" "6" + "solid" "0" "origin" "-552.951 -4778.12 31.9978" editor { @@ -118275,7 +118252,7 @@ entity "renderamt" "255" "rendercolor" "255 255 255" "skin" "0" - "solid" "6" + "solid" "0" "origin" "-560 -4949 -47" editor { @@ -188758,7 +188735,7 @@ entity side { "id" "12333" - "plane" "(2664 -5968 24) (2752 -5968 24) (2752 -5980 24)" + "plane" "(2664 -5980 24) (2664 -5960 24) (2752 -5960 24)" "material" "TOOLS/TOOLSNOLIGHT" "uaxis" "[1 0 0 7] 0.5" "vaxis" "[0 -1 0 0] 0.5" @@ -188769,18 +188746,18 @@ entity side { "id" "12334" - "plane" "(2664 -5980 10) (2752 -5980 10) (2752 -5968 10)" - "material" "TOOLS/TOOLSNODRAW" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 -1 0 -24] 0.25" + "plane" "(2664 -5960 10) (2664 -5980 10) (2752 -5980 10)" + "material" "METAL/METALWALL045A" + "uaxis" "[-1 0 0 179] 0.35" + "vaxis" "[0 -1 0 78] 0.32" "rotation" "0" - "lightmapscale" "16" + "lightmapscale" "64" "smoothing_groups" "0" } side { "id" "12335" - "plane" "(2664 -5968 24) (2664 -5980 24) (2664 -5980 10)" + "plane" "(2664 -5980 10) (2664 -5960 10) (2664 -5960 24)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[0 1 0 24] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -188791,7 +188768,7 @@ entity side { "id" "12336" - "plane" "(2752 -5968 10) (2752 -5980 10) (2752 -5980 24)" + "plane" "(2752 -5960 10) (2752 -5980 10) (2752 -5980 24)" "material" "TOOLS/TOOLSNODRAW" "uaxis" "[0 1 0 24] 0.25" "vaxis" "[0 0 -1 0] 0.25" @@ -188802,12 +188779,12 @@ entity side { "id" "12337" - "plane" "(2752 -5968 24) (2664 -5968 24) (2664 -5968 10)" + "plane" "(2664 -5960 10) (2752 -5960 10) (2752 -5960 24)" "material" "METAL/METALWALL045A" - "uaxis" "[1 0 0 90] 0.5" - "vaxis" "[0 0 -1 0] 0.5" + "uaxis" "[-1 0 0 179] 0.35" + "vaxis" "[0 0 -1 78] 0.32" "rotation" "0" - "lightmapscale" "64" + "lightmapscale" "32" "smoothing_groups" "0" } side @@ -188815,8 +188792,8 @@ entity "id" "12338" "plane" "(2752 -5980 10) (2664 -5980 10) (2664 -5980 24)" "material" "METAL/METALWALL045A" - "uaxis" "[1 0 0 90] 0.5" - "vaxis" "[0 0 -1 0] 0.5" + "uaxis" "[1 0 0 -183] 0.35" + "vaxis" "[0 0 -1 78] 0.32" "rotation" "0" "lightmapscale" "64" "smoothing_groups" "0" @@ -189022,7 +188999,7 @@ entity side { "id" "12369" - "plane" "(2664 -5980 10) (2664 -5960 10) (2752 -5960 10)" + "plane" "(2664 -6256 24) (2664 -5960 24) (2752 -5960 24)" "material" "TOOLS/TOOLSCLIP" "uaxis" "[1 0 0 7] 0.5" "vaxis" "[0 -1 0 0] 0.5" @@ -189033,9 +189010,9 @@ entity side { "id" "12370" - "plane" "(2664 -5960 -56) (2664 -5980 -56) (2752 -5980 -56)" + "plane" "(2664 -5960 -56) (2664 -6256 -56) (2752 -6256 -56)" "material" "TOOLS/TOOLSCLIP" - "uaxis" "[1 0 0 0] 0.25" + "uaxis" "[-1 0 0 0] 0.25" "vaxis" "[0 -1 0 -24] 0.25" "rotation" "0" "lightmapscale" "16" @@ -189044,7 +189021,7 @@ entity side { "id" "12371" - "plane" "(2664 -5980 -56) (2664 -5960 -56) (2664 -5960 10)" + "plane" "(2664 -6256 -56) (2664 -5960 -56) (2664 -5960 24)" "material" "TOOLS/TOOLSCLIP" "uaxis" "[0 1 0 24] 0.25" "vaxis" "[0 0 -1 -56] 0.25" @@ -189055,7 +189032,7 @@ entity side { "id" "12372" - "plane" "(2752 -5960 -56) (2752 -5980 -56) (2752 -5980 10)" + "plane" "(2752 -5960 -56) (2752 -6256 -56) (2752 -6256 24)" "material" "TOOLS/TOOLSCLIP" "uaxis" "[0 1 0 24] 0.25" "vaxis" "[0 0 -1 -56] 0.25" @@ -189066,9 +189043,9 @@ entity side { "id" "12373" - "plane" "(2664 -5960 -56) (2752 -5960 -56) (2752 -5960 10)" + "plane" "(2664 -5960 -56) (2752 -5960 -56) (2752 -5960 24)" "material" "TOOLS/TOOLSCLIP" - "uaxis" "[1 0 0 26] 0.5" + "uaxis" "[-1 0 0 26] 0.5" "vaxis" "[0 0 -1 -28] 0.5" "rotation" "0" "lightmapscale" "64" @@ -189077,7 +189054,7 @@ entity side { "id" "12374" - "plane" "(2752 -5980 -56) (2664 -5980 -56) (2664 -5980 10)" + "plane" "(2752 -6256 -56) (2664 -6256 -56) (2664 -6256 24)" "material" "TOOLS/TOOLSCLIP" "uaxis" "[1 0 0 26] 0.5" "vaxis" "[0 0 -1 -28] 0.5" @@ -238289,8 +238266,8 @@ cameras "activecamera" "0" camera { - "position" "[136.262 -8995.63 662.189]" - "look" "[144.467 -4261.72 -6422.61]" + "position" "[-585.937 -5561.97 548.352]" + "look" "[-1708.89 161.885 -5663.07]" } } cordons diff --git a/contentsrc/mapsrc/rd-NH01_LogisticsArea.vmf b/contentsrc/mapsrc/rd-NH01_LogisticsArea.vmf index c418e1a7a..82a922653 100644 --- a/contentsrc/mapsrc/rd-NH01_LogisticsArea.vmf +++ b/contentsrc/mapsrc/rd-NH01_LogisticsArea.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "1348" + "mapversion" "1349" "formatversion" "100" "prefab" "0" } @@ -32,7 +32,7 @@ viewsettings world { "id" "1" - "mapversion" "1348" + "mapversion" "1349" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -52176,6 +52176,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -52223,6 +52224,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -52270,6 +52272,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -52306,13 +52309,12 @@ entity entity { "id" "3485" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "3" "origin" "984 696.11 97" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1000]" @@ -52321,13 +52323,12 @@ entity entity { "id" "3497" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "4" "origin" "784 1184.11 97" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1000]" @@ -52336,13 +52337,12 @@ entity entity { "id" "3517" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "5" "origin" "432 1184 89" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1500]" @@ -52419,6 +52419,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -53337,6 +53338,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -53381,6 +53383,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -53427,6 +53430,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -53471,6 +53475,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55115,6 +55120,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55160,6 +55166,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55205,6 +55212,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55346,6 +55354,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55488,6 +55497,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55850,6 +55860,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -55896,6 +55907,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -56233,6 +56245,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "1" @@ -56278,6 +56291,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "1" @@ -70404,6 +70418,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "InfiniteAliens" "1" "LongRange" "0" @@ -70448,6 +70463,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "InfiniteAliens" "1" "LongRange" "0" @@ -76468,6 +76484,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -87484,6 +87501,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "hintlimiting" "0" "physdamagescale" "1.0" "renderamt" "255" @@ -95427,6 +95445,7 @@ entity "DefaultMusic" "NH_Logistics01_battle" "FadeInTime" "1.0" "FadeOutTime" "1.0" + "InterruptCustomTrack" "1" "targetname" "finalBattle_music" "origin" "3802 2704 144" editor @@ -97008,6 +97027,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -100659,6 +100679,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -100723,6 +100744,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100758,6 +100780,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100793,6 +100816,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100828,6 +100852,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100863,6 +100888,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100898,6 +100924,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100933,6 +100960,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -100969,6 +100997,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "hintlimiting" "0" "ignoreunseenenemies" "0" "physdamagescale" "1.0" @@ -101004,6 +101033,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -101040,6 +101070,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "hintlimiting" "0" "ignoreunseenenemies" "0" "physdamagescale" "1.0" @@ -101076,6 +101107,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "hintlimiting" "0" "ignoreunseenenemies" "0" "physdamagescale" "1.0" @@ -101189,6 +101221,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -101224,6 +101257,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -101259,6 +101293,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -101294,6 +101329,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -101354,6 +101390,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -101475,6 +101512,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -101516,6 +101554,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "hintlimiting" "0" "physdamagescale" "1.0" "renderamt" "255" @@ -101552,6 +101591,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -101611,6 +101651,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -102903,6 +102944,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -102948,6 +102990,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -102987,7 +103030,7 @@ entity "origin" "1368 -1796 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 2000]" @@ -103001,7 +103044,7 @@ entity "origin" "1480 -1812 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1000]" @@ -103015,7 +103058,7 @@ entity "origin" "1416.8 -1840.34 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1500]" @@ -103029,7 +103072,7 @@ entity "origin" "1304 -1788 92" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103043,7 +103086,7 @@ entity "origin" "1392 -1756 92" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103057,7 +103100,7 @@ entity "origin" "1432 -1788 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103071,7 +103114,7 @@ entity "origin" "1280.12 -1724.13 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103085,7 +103128,7 @@ entity "origin" "1474.34 -1745.65 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103099,7 +103142,7 @@ entity "origin" "1352 -1852 88" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -103653,6 +103696,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "1" @@ -105053,6 +105097,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -105099,6 +105144,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -105145,6 +105191,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -105335,6 +105382,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "1" @@ -105957,6 +106005,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -106003,6 +106052,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -106251,13 +106301,12 @@ entity entity { "id" "605865" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "327" "origin" "1084 772.11 97" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 1000]" @@ -107146,13 +107195,12 @@ entity entity { "id" "642097" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "410" "origin" "1080 1152.11 102" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 -10768]" @@ -107161,13 +107209,12 @@ entity entity { "id" "642099" - "classname" "info_node_marine_hint" - "angles" "0 0 0" + "classname" "info_node" "nodeid" "411" "origin" "1124.02 1235.4 97" editor { - "color" "8 64 232" + "color" "232 219 8" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 -10768]" @@ -107367,6 +107414,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -107424,6 +107472,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -107459,6 +107508,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -107494,6 +107544,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -107529,6 +107580,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -107564,6 +107616,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -109441,6 +109494,7 @@ entity { "id" "761223" "classname" "asw_tech_marine_req" + "StatsMusicFailure" "asw_song.StatsFailTech" "targetname" "Tech_marines" "origin" "-1144 -952 -312" editor @@ -109898,7 +109952,7 @@ entity "origin" "4046 2736 138" editor { - "color" "220 30 220" + "color" "220 180 0" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 500]" @@ -114600,6 +114654,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "HealthScale" "1" "MaxLiveAliens" "1" "maxoffset" "0 0 0" @@ -114637,6 +114692,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "HealthScale" "1" "MaxLiveAliens" "1" "maxoffset" "0 0 0" @@ -114674,6 +114730,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "HealthScale" "1" "MaxLiveAliens" "1" "maxoffset" "0 0 0" @@ -116974,6 +117031,7 @@ entity "flammable" "1" "flinchable" "1" "freezable" "1" + "freezeresistance" "0.0" "healthbonus" "0" "hintlimiting" "0" "ignoreunseenenemies" "0" @@ -120181,6 +120239,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -120228,6 +120287,7 @@ entity "flammablesp" "1" "flinchablesp" "1" "freezablesp" "1" + "freezeresistancesp" "0.0" "healthbonussp" "0" "HealthScale" "1" "InfiniteAliens" "0" @@ -120590,8 +120650,8 @@ cameras "activecamera" "0" camera { - "position" "[-1027.72 -723.713 -248.181]" - "look" "[-1058.99 -620.136 -340.263]" + "position" "[143.694 -603.728 -359.578]" + "look" "[224.574 -535.863 -454.643]" } } cordons diff --git a/contentsrc/mapsrc/rd-ocs2landingbay7.vmf b/contentsrc/mapsrc/rd-ocs2landingbay7.vmf index 798791527..e9fbc5290 100644 --- a/contentsrc/mapsrc/rd-ocs2landingbay7.vmf +++ b/contentsrc/mapsrc/rd-ocs2landingbay7.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "64" + "mapversion" "65" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "64" + "mapversion" "65" "classname" "worldspawn" "comment" "Decompiled by BSPSource v1.3.6 from ocs_2.bsp" "detailmaterial" "detail/detailsprites" @@ -7238,6 +7238,82 @@ world "visgroupautoshown" "1" } } + solid + { + "id" "66198" + side + { + "id" "3753" + "plane" "(752 672 211) (863 672 211) (863 358 211)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3754" + "plane" "(752 358 96) (863 358 96) (863 672 96)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3755" + "plane" "(752 672 211) (752 358 211) (752 358 96)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[0 -1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3756" + "plane" "(863 672 96) (863 358 96) (863 358 211)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3757" + "plane" "(863 672 211) (752 672 211) (752 672 96)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "3758" + "plane" "(863 358 96) (752 358 96) (752 358 211)" + "material" "TOOLS/TOOLSCLIP" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "0 142 155" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } } entity { @@ -18179,7 +18255,7 @@ entity "origin" "-4731.3 -3518.9 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[4000 -10768]" @@ -20815,7 +20891,7 @@ entity "origin" "-4781.81 -3460.31 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 8500]" @@ -20829,7 +20905,7 @@ entity "origin" "-4803.35 -3578.77 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 9000]" @@ -20843,7 +20919,7 @@ entity "origin" "-4747.7 -3638.55 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 9500]" @@ -20857,7 +20933,7 @@ entity "origin" "-4651.8 -3618.23 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 10000]" @@ -20871,7 +20947,7 @@ entity "origin" "-4655.57 -3529.91 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 10500]" @@ -20885,7 +20961,7 @@ entity "origin" "-4667.46 -3452.33 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 11000]" @@ -20899,7 +20975,7 @@ entity "origin" "-4732.42 -3584.49 224" editor { - "color" "0 255 0" + "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[5500 11500]" @@ -83974,8 +84050,8 @@ cameras "activecamera" "0" camera { - "position" "[3564.68 -765.037 356.89]" - "look" "[3652.79 -641.085 138.159]" + "position" "[494.002 593.327 288.864]" + "look" "[688.164 507.652 127.831]" } camera { diff --git a/contentsrc/mapsrc/rd-reduction3.vmf b/contentsrc/mapsrc/rd-reduction3.vmf index b5585ea35..dd2c233fb 100644 --- a/contentsrc/mapsrc/rd-reduction3.vmf +++ b/contentsrc/mapsrc/rd-reduction3.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "888" + "mapversion" "889" "formatversion" "100" "prefab" "0" } @@ -278,7 +278,7 @@ viewsettings world { "id" "1" - "mapversion" "888" + "mapversion" "889" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -269893,6 +269893,7 @@ entity "damagescale" "1.0" "fireattack" "4" "firesize" "96" + "health" "30" "IgniteSound" "ASW_Flare.IgniteFlare" "ignitionpoint" "10" "LightBrightness" "1" @@ -269902,7 +269903,6 @@ entity "spawnflags" "529" "StartDisabled" "1" "targetname" "SewerFire08" - "health" "30" connections { "OnIgnited" "SewerFire08aStartFire21" @@ -329591,7 +329591,7 @@ entity "screenspacefade" "0" "skin" "0" "solid" "6" - "origin" "796.167 -1013.16 20.25" + "origin" "828 -1026 20.25" editor { "color" "255 255 0" @@ -329613,7 +329613,7 @@ entity "rendercolor" "255 255 255" "skin" "0" "solid" "6" - "origin" "745.106 -1032.84 0.250008" + "origin" "826 -1000 0.250008" editor { "color" "255 255 0" @@ -329626,7 +329626,7 @@ entity { "id" "641494" "classname" "prop_static" - "angles" "0 102 0" + "angles" "0 327 0" "disableselfshadowing" "0" "disablevertexlighting" "0" "fademaxdist" "0" @@ -329639,7 +329639,7 @@ entity "screenspacefade" "0" "skin" "0" "solid" "6" - "origin" "747.095 -1064.59 20.25" + "origin" "796 -1004 20.25" editor { "color" "255 255 0" @@ -329665,7 +329665,7 @@ entity "screenspacefade" "0" "skin" "0" "solid" "6" - "origin" "703.798 -1026.55 11.2708" + "origin" "817 -975 11.2708" editor { "color" "255 255 0"