From 496ab977fd51f20d95b7d41b5ddbcf63a288c92b Mon Sep 17 00:00:00 2001 From: kitsune Date: Sat, 29 Mar 2025 23:11:44 +0100 Subject: [PATCH 1/3] Map: rd-ocs2landingbay7: Added exit zone hints and light indicators. Fixes #752 --- contentsrc/mapsrc/rd-ocs2landingbay7.vmf | 163 ++++++++++++++++++++++- 1 file changed, 159 insertions(+), 4 deletions(-) diff --git a/contentsrc/mapsrc/rd-ocs2landingbay7.vmf b/contentsrc/mapsrc/rd-ocs2landingbay7.vmf index 993c2f77f..ab5f2ddce 100644 --- a/contentsrc/mapsrc/rd-ocs2landingbay7.vmf +++ b/contentsrc/mapsrc/rd-ocs2landingbay7.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "37" + "mapversion" "60" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "37" + "mapversion" "60" "classname" "worldspawn" "comment" "Decompiled by BSPSource v1.3.6 from ocs_2.bsp" "detailmaterial" "detail/detailsprites" @@ -8855,7 +8855,7 @@ entity entity { "id" "131" - "classname" "env_sprite_clientside" + "classname" "env_sprite" "framerate" "10.0" "GlowProxySize" "1" "HDRColorScale" "1.0" @@ -8864,6 +8864,8 @@ entity "rendercolor" "205 73 73" "rendermode" "9" "scale" ".15" + "spawnflags" "1" + "targetname" "shuttle_lamp_left" "origin" "3853.14 -430.078 86.0487" editor { @@ -8876,7 +8878,7 @@ entity entity { "id" "132" - "classname" "env_sprite_clientside" + "classname" "env_sprite" "framerate" "10.0" "GlowProxySize" "1" "HDRColorScale" "1.0" @@ -8885,6 +8887,8 @@ entity "rendercolor" "205 73 73" "rendermode" "9" "scale" ".15" + "spawnflags" "1" + "targetname" "shuttle_lamp_right" "origin" "3835.05 -470.964 86.0487" editor { @@ -11775,6 +11779,10 @@ entity "OnComputerActivated" "spwnr1StartSpawning0-1" "OnComputerHackHalfway" "spwnr2StartSpawning0-1" "OnComputerHackCompleted" "techreqDisableTechMarineReq01" + "OnComputerDataDownloaded" "hint_trigger_exit_warnAdd121" + "OnComputerDataDownloaded" "hint_trigger_exit_runAdd121" + "OnComputerDataDownloaded" "shuttle_lamp_leftColor73 205 7321" + "OnComputerDataDownloaded" "shuttle_lamp_rightColor73 205 7321" } solid { @@ -16512,6 +16520,10 @@ entity "objectiveimage" "rd_ocs2obj1" "targetname" "eggs" "Visible" "1" + connections + { + "OnObjectiveComplete" "hint_trigger_exit_runAdd101" + } "origin" "4480 -320 180" editor { @@ -21602,6 +21614,10 @@ entity "objectivetitle" "#ocs_landingbay7_1_title" "targetname" "enterbay7" "Visible" "1" + connections + { + "OnObjectiveComplete" "hint_trigger_exit_runAdd101" + } "origin" "4480 -280 180" editor { @@ -84042,6 +84058,145 @@ entity "logicalpos" "[0 4000]" } } +entity +{ + "id" "57991" + "classname" "info_target" + "angles" "0 0 0" + "spawnflags" "2" + "targetname" "hint_target_exit_run" + "origin" "3734.16 -441.92 76.0288" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "58076" + "classname" "env_instructor_hint" + "hint_allow_nodraw_target" "1" + "hint_alphaoption" "0" + "hint_caption" "#ocs_landingbay7_3_title" + "hint_color" "255 255 255" + "hint_forcecaption" "1" + "hint_icon_offscreen" "icon_run" + "hint_icon_offset" "0" + "hint_icon_onscreen" "icon_run" + "hint_local_player_only" "0" + "hint_nooffscreen" "0" + "hint_pulseoption" "0" + "hint_range" "10000" + "hint_replace_key" "test" + "hint_shakeoption" "0" + "hint_static" "0" + "hint_target" "hint_target_exit_run" + "hint_timeout" "0" + "targetname" "hint_exit_run" + "origin" "3733.19 -420.813 112.25" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "61771" + "classname" "math_counter" + "max" "3" + "min" "0" + "StartDisabled" "0" + "startvalue" "0" + "targetname" "hint_trigger_exit_run" + connections + { + "OnHitMax" "hint_trigger_exit_warnSetValue-101" + "OnHitMax" "hint_exit_runShowHint01" + } + "origin" "3734 -401 137.75" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "61874" + "classname" "env_instructor_hint" + "hint_allow_nodraw_target" "1" + "hint_alphaoption" "0" + "hint_caption" "#asw_complete_objective_first" + "hint_color" "255 255 255" + "hint_forcecaption" "1" + "hint_icon_offscreen" "icon_caution" + "hint_icon_offset" "0" + "hint_icon_onscreen" "icon_caution" + "hint_local_player_only" "0" + "hint_nooffscreen" "1" + "hint_pulseoption" "0" + "hint_range" "10000" + "hint_shakeoption" "0" + "hint_static" "0" + "hint_target" "hint_target_exit_warn" + "hint_timeout" "0" + "targetname" "hint_exit_warn" + "origin" "3754.88 -420.625 112" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "62059" + "classname" "math_counter" + "max" "1" + "min" "-1" + "StartDisabled" "0" + "startvalue" "0" + "targetname" "hint_trigger_exit_warn" + connections + { + "OnHitMax" "hint_exit_warnShowHint01" + "OnHitMin" "hint_exit_warnEndHint01" + } + "origin" "3755 -401 137.672" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity +{ + "id" "62540" + "classname" "info_target" + "angles" "0 0 0" + "spawnflags" "2" + "targetname" "hint_target_exit_warn" + "origin" "3730.43 -445.911 76.0304" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} cameras { "activecamera" "0" From dae320ea4d3a338e391852c42e52e2ac76a18a19 Mon Sep 17 00:00:00 2001 From: kitsune Date: Sun, 30 Mar 2025 20:02:19 +0200 Subject: [PATCH 2/3] Map: rd-tft1DesertOutpost: Satellite models have been repositioned so that they do not obstruct the view but remain visible in first-person mode. Fixes #845 --- contentsrc/mapsrc/rd-tft1DesertOutpost.vmf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contentsrc/mapsrc/rd-tft1DesertOutpost.vmf b/contentsrc/mapsrc/rd-tft1DesertOutpost.vmf index b8b7039ca..93078c7ca 100644 --- a/contentsrc/mapsrc/rd-tft1DesertOutpost.vmf +++ b/contentsrc/mapsrc/rd-tft1DesertOutpost.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "1079" + "mapversion" "1083" "formatversion" "100" "prefab" "0" } @@ -92,7 +92,7 @@ viewsettings world { "id" "1" - "mapversion" "1079" + "mapversion" "1083" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -217983,6 +217983,7 @@ entity "DefaultMusic" "Tarnor01.AirlockBattle" "FadeInTime" "1.0" "FadeOutTime" "5.0" + "InterruptCustomTrack" "1" "targetname" "jukebox" "origin" "-126 2762 456" editor @@ -219424,7 +219425,7 @@ entity "rendercolor" "124 116 99" "skin" "0" "solid" "6" - "origin" "-48 2496 448" + "origin" "-89 2629 448" editor { "color" "255 255 0" @@ -219437,7 +219438,7 @@ entity { "id" "106252" "classname" "prop_static" - "angles" "0 225 0" + "angles" "0 270 0" "fademindist" "-1" "fadescale" "1" "model" "models/props/utilities/satellite_dish002a.mdl" @@ -219445,7 +219446,7 @@ entity "rendercolor" "124 116 99" "skin" "0" "solid" "6" - "origin" "176.17 2496 448" + "origin" "269 2724 448" editor { "color" "255 255 0" @@ -242374,7 +242375,7 @@ entity "damagetype" "9216" "Negated" "Allow entities that match criteria" "targetname" "laser_filter" - "origin" "-68 2612 456" + "origin" "-68 2681 456" editor { "color" "220 30 220" From 6ff373a2d53caa56895ae73e7514dfe5c23bb0ad Mon Sep 17 00:00:00 2001 From: kitsune Date: Mon, 31 Mar 2025 12:09:04 +0200 Subject: [PATCH 3/3] Map: rd-reduction2: Prevented the possibility of destroying the ship dropping marines. Fixes #728 --- contentsrc/mapsrc/rd-reduction2.vmf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contentsrc/mapsrc/rd-reduction2.vmf b/contentsrc/mapsrc/rd-reduction2.vmf index 6b1d5b223..04b6d135f 100644 --- a/contentsrc/mapsrc/rd-reduction2.vmf +++ b/contentsrc/mapsrc/rd-reduction2.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "7397" - "mapversion" "1403" + "mapversion" "1404" "formatversion" "100" "prefab" "0" } @@ -230,7 +230,7 @@ viewsettings world { "id" "1" - "mapversion" "1403" + "mapversion" "1404" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -808913,7 +808913,7 @@ entity "targetname" "C3_Kaboomo_Cntr" connections { - "OnHitMax" "Failure_Relay_C3DownTrigger01" + "OnHitMax" "Failure_Relay_C3DownKill01" } "origin" "1520.01 -7147.07 2161" editor