Skip to content

Fixes: Maps #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 3 commits into from
Mar 31, 2025
Merged

Fixes: Maps #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
496ab97
Map: rd-ocs2landingbay7: Added exit zone hints and light indicators. …
Kitsune44 Mar 29, 2025
dae320e
Map: rd-tft1DesertOutpost: Satellite models have been repositioned so…
Kitsune44 Mar 30, 2025
6ff373a
Map: rd-reduction2: Prevented the possibility of destroying the ship …
Kitsune44 Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 159 additions & 4 deletions contentsrc/mapsrc/rd-ocs2landingbay7.vmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "7397"
"mapversion" "37"
"mapversion" "60"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -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"
Expand Down Expand Up @@ -8855,7 +8855,7 @@ entity
entity
{
"id" "131"
"classname" "env_sprite_clientside"
"classname" "env_sprite"
"framerate" "10.0"
"GlowProxySize" "1"
"HDRColorScale" "1.0"
Expand All @@ -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
{
Expand All @@ -8876,7 +8878,7 @@ entity
entity
{
"id" "132"
"classname" "env_sprite_clientside"
"classname" "env_sprite"
"framerate" "10.0"
"GlowProxySize" "1"
"HDRColorScale" "1.0"
Expand All @@ -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
{
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -16512,6 +16520,10 @@ entity
"objectiveimage" "rd_ocs2obj1"
"targetname" "eggs"
"Visible" "1"
connections
{
"OnObjectiveComplete" "hint_trigger_exit_runAdd101"
}
"origin" "4480 -320 180"
editor
{
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions contentsrc/mapsrc/rd-reduction2.vmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "7397"
"mapversion" "1403"
"mapversion" "1404"
"formatversion" "100"
"prefab" "0"
}
Expand Down Expand Up @@ -230,7 +230,7 @@ viewsettings
world
{
"id" "1"
"mapversion" "1403"
"mapversion" "1404"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand Down Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions contentsrc/mapsrc/rd-tft1DesertOutpost.vmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ versioninfo
{
"editorversion" "400"
"editorbuild" "7397"
"mapversion" "1079"
"mapversion" "1083"
"formatversion" "100"
"prefab" "0"
}
Expand Down Expand Up @@ -92,7 +92,7 @@ viewsettings
world
{
"id" "1"
"mapversion" "1079"
"mapversion" "1083"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand Down Expand Up @@ -217983,6 +217983,7 @@ entity
"DefaultMusic" "Tarnor01.AirlockBattle"
"FadeInTime" "1.0"
"FadeOutTime" "5.0"
"InterruptCustomTrack" "1"
"targetname" "jukebox"
"origin" "-126 2762 456"
editor
Expand Down Expand Up @@ -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"
Expand All @@ -219437,15 +219438,15 @@ 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"
"renderamt" "255"
"rendercolor" "124 116 99"
"skin" "0"
"solid" "6"
"origin" "176.17 2496 448"
"origin" "269 2724 448"
editor
{
"color" "255 255 0"
Expand Down Expand Up @@ -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"
Expand Down