Skip to content

Commit f06df65

Browse files
authored
Merge pull request #1015 from Kitsune44/maps
Fix softlocks and unreachable resource spawns
2 parents 34a9526 + 0bc44d3 commit f06df65

File tree

4 files changed

+286
-173
lines changed

4 files changed

+286
-173
lines changed

contentsrc/mapsrc/ASI-Jac4-Residential.vmf

Lines changed: 98 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ versioninfo
22
{
33
"editorversion" "400"
44
"editorbuild" "7397"
5-
"mapversion" "3022"
5+
"mapversion" "3027"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -38,13 +38,13 @@ viewsettings
3838
"bSnapToGrid" "1"
3939
"bShowGrid" "1"
4040
"bShowLogicalGrid" "0"
41-
"nGridSpacing" "2"
41+
"nGridSpacing" "1"
4242
"bShow3DGrid" "0"
4343
}
4444
world
4545
{
4646
"id" "394754"
47-
"mapversion" "3022"
47+
"mapversion" "3027"
4848
"classname" "worldspawn"
4949
"detailmaterial" "detail/detailsprites"
5050
"detailvbsp" "detail.vbsp"
@@ -43990,6 +43990,71 @@ world
4399043990
}
4399143991
}
4399243992
solid
43993+
{
43994+
"id" "1913559"
43995+
side
43996+
{
43997+
"id" "142105"
43998+
"plane" "(-672 -4656 51) (-440 -4656 51) (-440 -5025 -56)"
43999+
"material" "TOOLS/TOOLSCLIP"
44000+
"uaxis" "[1 0 0 0] 0.25"
44001+
"vaxis" "[0 -1 0 0] 0.25"
44002+
"rotation" "0"
44003+
"lightmapscale" "16"
44004+
"smoothing_groups" "0"
44005+
}
44006+
side
44007+
{
44008+
"id" "142106"
44009+
"plane" "(-440 -5025 -56) (-440 -4656 -56) (-672 -4656 -56)"
44010+
"material" "TOOLS/TOOLSCLIP"
44011+
"uaxis" "[-1 0 0 0] 0.25"
44012+
"vaxis" "[0 -1 0 0] 0.25"
44013+
"rotation" "0"
44014+
"lightmapscale" "16"
44015+
"smoothing_groups" "0"
44016+
}
44017+
side
44018+
{
44019+
"id" "142107"
44020+
"plane" "(-672 -4656 -56) (-672 -4656 51) (-672 -5025 -56)"
44021+
"material" "TOOLS/TOOLSCLIP"
44022+
"uaxis" "[0 -1 0 0] 0.25"
44023+
"vaxis" "[0 0 -1 0] 0.25"
44024+
"rotation" "0"
44025+
"lightmapscale" "16"
44026+
"smoothing_groups" "0"
44027+
}
44028+
side
44029+
{
44030+
"id" "142108"
44031+
"plane" "(-440 -4656 51) (-440 -4656 -56) (-440 -5025 -56)"
44032+
"material" "TOOLS/TOOLSCLIP"
44033+
"uaxis" "[0 1 0 0] 0.25"
44034+
"vaxis" "[0 0 -1 0] 0.25"
44035+
"rotation" "0"
44036+
"lightmapscale" "16"
44037+
"smoothing_groups" "0"
44038+
}
44039+
side
44040+
{
44041+
"id" "142109"
44042+
"plane" "(-440 -4656 51) (-672 -4656 51) (-672 -4656 -56)"
44043+
"material" "TOOLS/TOOLSCLIP"
44044+
"uaxis" "[-1 0 0 0] 0.25"
44045+
"vaxis" "[0 0 -1 0] 0.25"
44046+
"rotation" "0"
44047+
"lightmapscale" "16"
44048+
"smoothing_groups" "0"
44049+
}
44050+
editor
44051+
{
44052+
"color" "0 178 191"
44053+
"visgroupshown" "1"
44054+
"visgroupautoshown" "1"
44055+
}
44056+
}
44057+
solid
4399344058
{
4399444059
"id" "1429972"
4399544060
side
@@ -82792,94 +82857,6 @@ entity
8279282857
}
8279382858
}
8279482859
entity
82795-
{
82796-
"id" "842239"
82797-
"classname" "func_detail"
82798-
solid
82799-
{
82800-
"id" "842240"
82801-
side
82802-
{
82803-
"id" "117496"
82804-
"plane" "(-616 -5072 362) (-616 -5072 153) (-672 -5072 153)"
82805-
"material" "TOOLS/TOOLSPLAYERCLIP"
82806-
"uaxis" "[1 0 0 -28] 1"
82807-
"vaxis" "[0 0 -1 17] 1"
82808-
"rotation" "0"
82809-
"lightmapscale" "256"
82810-
"smoothing_groups" "0"
82811-
}
82812-
side
82813-
{
82814-
"id" "117495"
82815-
"plane" "(-616 -4536 362) (-616 -4536 153) (-616 -5072 153)"
82816-
"material" "TOOLS/TOOLSPLAYERCLIP"
82817-
"uaxis" "[0 1 0 0] 1"
82818-
"vaxis" "[0 0 -1 17] 1"
82819-
"rotation" "0"
82820-
"lightmapscale" "256"
82821-
"smoothing_groups" "0"
82822-
}
82823-
side
82824-
{
82825-
"id" "117494"
82826-
"plane" "(-672 -4536 362) (-672 -4536 153) (-616 -4536 153)"
82827-
"material" "TOOLS/TOOLSPLAYERCLIP"
82828-
"uaxis" "[-1 0 0 47] 0.4"
82829-
"vaxis" "[0 0 -1 63.5] 0.4"
82830-
"rotation" "0"
82831-
"lightmapscale" "256"
82832-
"smoothing_groups" "0"
82833-
}
82834-
side
82835-
{
82836-
"id" "117493"
82837-
"plane" "(-672 -5072 362) (-672 -5072 153) (-672 -4536 153)"
82838-
"material" "TOOLS/TOOLSPLAYERCLIP"
82839-
"uaxis" "[0 -1 0 5] 0.4"
82840-
"vaxis" "[0 0 -1 52.5] 0.4"
82841-
"rotation" "0"
82842-
"lightmapscale" "32"
82843-
"smoothing_groups" "0"
82844-
}
82845-
side
82846-
{
82847-
"id" "117492"
82848-
"plane" "(-616 -5072 362) (-672 -5072 362) (-672 -4536 362)"
82849-
"material" "TOOLS/TOOLSPLAYERCLIP"
82850-
"uaxis" "[0 1 0 0] 1"
82851-
"vaxis" "[1 0 0 -28] 1"
82852-
"rotation" "0"
82853-
"lightmapscale" "256"
82854-
"smoothing_groups" "0"
82855-
}
82856-
side
82857-
{
82858-
"id" "117491"
82859-
"plane" "(-672 -5072 153) (-616 -5072 153) (-616 -4536 153)"
82860-
"material" "TOOLS/TOOLSPLAYERCLIP"
82861-
"uaxis" "[0 1 0 0] 1"
82862-
"vaxis" "[-1 0 0 28] 1"
82863-
"rotation" "0"
82864-
"lightmapscale" "256"
82865-
"smoothing_groups" "0"
82866-
}
82867-
editor
82868-
{
82869-
"color" "0 180 0"
82870-
"visgroupshown" "1"
82871-
"visgroupautoshown" "1"
82872-
}
82873-
}
82874-
editor
82875-
{
82876-
"color" "0 180 0"
82877-
"visgroupshown" "1"
82878-
"visgroupautoshown" "1"
82879-
"logicalpos" "[8500 -8268]"
82880-
}
82881-
}
82882-
entity
8288382860
{
8288482861
"id" "1140582"
8288582862
"classname" "prop_static"
@@ -108582,7 +108559,7 @@ entity
108582108559
{
108583108560
"id" "223204"
108584108561
"classname" "prop_static"
108585-
"angles" "-0.999976 90.5001 -90.0045"
108562+
"angles" "-0.570515 90.2851 -90.0045"
108586108563
"disableselfshadowing" "0"
108587108564
"disableshadows" "1"
108588108565
"disablevertexlighting" "0"
@@ -108594,7 +108571,7 @@ entity
108594108571
"screenspacefade" "0"
108595108572
"skin" "0"
108596108573
"solid" "6"
108597-
"origin" "2756 -5974 -22"
108574+
"origin" "2756 -5970.33 -22"
108598108575
editor
108599108576
{
108600108577
"color" "255 255 0"
@@ -118206,7 +118183,7 @@ entity
118206118183
"renderamt" "255"
118207118184
"rendercolor" "255 255 255"
118208118185
"skin" "0"
118209-
"solid" "6"
118186+
"solid" "0"
118210118187
"origin" "-573.951 -4710.12 42.4678"
118211118188
editor
118212118189
{
@@ -118229,7 +118206,7 @@ entity
118229118206
"renderamt" "255"
118230118207
"rendercolor" "255 255 255"
118231118208
"skin" "0"
118232-
"solid" "6"
118209+
"solid" "0"
118233118210
"origin" "-605.951 -4815.12 58.4678"
118234118211
editor
118235118212
{
@@ -118252,7 +118229,7 @@ entity
118252118229
"renderamt" "255"
118253118230
"rendercolor" "255 255 255"
118254118231
"skin" "0"
118255-
"solid" "6"
118232+
"solid" "0"
118256118233
"origin" "-552.951 -4778.12 31.9978"
118257118234
editor
118258118235
{
@@ -118275,7 +118252,7 @@ entity
118275118252
"renderamt" "255"
118276118253
"rendercolor" "255 255 255"
118277118254
"skin" "0"
118278-
"solid" "6"
118255+
"solid" "0"
118279118256
"origin" "-560 -4949 -47"
118280118257
editor
118281118258
{
@@ -188758,7 +188735,7 @@ entity
188758188735
side
188759188736
{
188760188737
"id" "12333"
188761-
"plane" "(2664 -5968 24) (2752 -5968 24) (2752 -5980 24)"
188738+
"plane" "(2664 -5980 24) (2664 -5960 24) (2752 -5960 24)"
188762188739
"material" "TOOLS/TOOLSNOLIGHT"
188763188740
"uaxis" "[1 0 0 7] 0.5"
188764188741
"vaxis" "[0 -1 0 0] 0.5"
@@ -188769,18 +188746,18 @@ entity
188769188746
side
188770188747
{
188771188748
"id" "12334"
188772-
"plane" "(2664 -5980 10) (2752 -5980 10) (2752 -5968 10)"
188773-
"material" "TOOLS/TOOLSNODRAW"
188774-
"uaxis" "[1 0 0 0] 0.25"
188775-
"vaxis" "[0 -1 0 -24] 0.25"
188749+
"plane" "(2664 -5960 10) (2664 -5980 10) (2752 -5980 10)"
188750+
"material" "METAL/METALWALL045A"
188751+
"uaxis" "[-1 0 0 179] 0.35"
188752+
"vaxis" "[0 -1 0 78] 0.32"
188776188753
"rotation" "0"
188777-
"lightmapscale" "16"
188754+
"lightmapscale" "64"
188778188755
"smoothing_groups" "0"
188779188756
}
188780188757
side
188781188758
{
188782188759
"id" "12335"
188783-
"plane" "(2664 -5968 24) (2664 -5980 24) (2664 -5980 10)"
188760+
"plane" "(2664 -5980 10) (2664 -5960 10) (2664 -5960 24)"
188784188761
"material" "TOOLS/TOOLSNODRAW"
188785188762
"uaxis" "[0 1 0 24] 0.25"
188786188763
"vaxis" "[0 0 -1 0] 0.25"
@@ -188791,7 +188768,7 @@ entity
188791188768
side
188792188769
{
188793188770
"id" "12336"
188794-
"plane" "(2752 -5968 10) (2752 -5980 10) (2752 -5980 24)"
188771+
"plane" "(2752 -5960 10) (2752 -5980 10) (2752 -5980 24)"
188795188772
"material" "TOOLS/TOOLSNODRAW"
188796188773
"uaxis" "[0 1 0 24] 0.25"
188797188774
"vaxis" "[0 0 -1 0] 0.25"
@@ -188802,21 +188779,21 @@ entity
188802188779
side
188803188780
{
188804188781
"id" "12337"
188805-
"plane" "(2752 -5968 24) (2664 -5968 24) (2664 -5968 10)"
188782+
"plane" "(2664 -5960 10) (2752 -5960 10) (2752 -5960 24)"
188806188783
"material" "METAL/METALWALL045A"
188807-
"uaxis" "[1 0 0 90] 0.5"
188808-
"vaxis" "[0 0 -1 0] 0.5"
188784+
"uaxis" "[-1 0 0 179] 0.35"
188785+
"vaxis" "[0 0 -1 78] 0.32"
188809188786
"rotation" "0"
188810-
"lightmapscale" "64"
188787+
"lightmapscale" "32"
188811188788
"smoothing_groups" "0"
188812188789
}
188813188790
side
188814188791
{
188815188792
"id" "12338"
188816188793
"plane" "(2752 -5980 10) (2664 -5980 10) (2664 -5980 24)"
188817188794
"material" "METAL/METALWALL045A"
188818-
"uaxis" "[1 0 0 90] 0.5"
188819-
"vaxis" "[0 0 -1 0] 0.5"
188795+
"uaxis" "[1 0 0 -183] 0.35"
188796+
"vaxis" "[0 0 -1 78] 0.32"
188820188797
"rotation" "0"
188821188798
"lightmapscale" "64"
188822188799
"smoothing_groups" "0"
@@ -189022,7 +188999,7 @@ entity
189022188999
side
189023189000
{
189024189001
"id" "12369"
189025-
"plane" "(2664 -5980 10) (2664 -5960 10) (2752 -5960 10)"
189002+
"plane" "(2664 -6256 24) (2664 -5960 24) (2752 -5960 24)"
189026189003
"material" "TOOLS/TOOLSCLIP"
189027189004
"uaxis" "[1 0 0 7] 0.5"
189028189005
"vaxis" "[0 -1 0 0] 0.5"
@@ -189033,9 +189010,9 @@ entity
189033189010
side
189034189011
{
189035189012
"id" "12370"
189036-
"plane" "(2664 -5960 -56) (2664 -5980 -56) (2752 -5980 -56)"
189013+
"plane" "(2664 -5960 -56) (2664 -6256 -56) (2752 -6256 -56)"
189037189014
"material" "TOOLS/TOOLSCLIP"
189038-
"uaxis" "[1 0 0 0] 0.25"
189015+
"uaxis" "[-1 0 0 0] 0.25"
189039189016
"vaxis" "[0 -1 0 -24] 0.25"
189040189017
"rotation" "0"
189041189018
"lightmapscale" "16"
@@ -189044,7 +189021,7 @@ entity
189044189021
side
189045189022
{
189046189023
"id" "12371"
189047-
"plane" "(2664 -5980 -56) (2664 -5960 -56) (2664 -5960 10)"
189024+
"plane" "(2664 -6256 -56) (2664 -5960 -56) (2664 -5960 24)"
189048189025
"material" "TOOLS/TOOLSCLIP"
189049189026
"uaxis" "[0 1 0 24] 0.25"
189050189027
"vaxis" "[0 0 -1 -56] 0.25"
@@ -189055,7 +189032,7 @@ entity
189055189032
side
189056189033
{
189057189034
"id" "12372"
189058-
"plane" "(2752 -5960 -56) (2752 -5980 -56) (2752 -5980 10)"
189035+
"plane" "(2752 -5960 -56) (2752 -6256 -56) (2752 -6256 24)"
189059189036
"material" "TOOLS/TOOLSCLIP"
189060189037
"uaxis" "[0 1 0 24] 0.25"
189061189038
"vaxis" "[0 0 -1 -56] 0.25"
@@ -189066,9 +189043,9 @@ entity
189066189043
side
189067189044
{
189068189045
"id" "12373"
189069-
"plane" "(2664 -5960 -56) (2752 -5960 -56) (2752 -5960 10)"
189046+
"plane" "(2664 -5960 -56) (2752 -5960 -56) (2752 -5960 24)"
189070189047
"material" "TOOLS/TOOLSCLIP"
189071-
"uaxis" "[1 0 0 26] 0.5"
189048+
"uaxis" "[-1 0 0 26] 0.5"
189072189049
"vaxis" "[0 0 -1 -28] 0.5"
189073189050
"rotation" "0"
189074189051
"lightmapscale" "64"
@@ -189077,7 +189054,7 @@ entity
189077189054
side
189078189055
{
189079189056
"id" "12374"
189080-
"plane" "(2752 -5980 -56) (2664 -5980 -56) (2664 -5980 10)"
189057+
"plane" "(2752 -6256 -56) (2664 -6256 -56) (2664 -6256 24)"
189081189058
"material" "TOOLS/TOOLSCLIP"
189082189059
"uaxis" "[1 0 0 26] 0.5"
189083189060
"vaxis" "[0 0 -1 -28] 0.5"
@@ -238289,8 +238266,8 @@ cameras
238289238266
"activecamera" "0"
238290238267
camera
238291238268
{
238292-
"position" "[136.262 -8995.63 662.189]"
238293-
"look" "[144.467 -4261.72 -6422.61]"
238269+
"position" "[-585.937 -5561.97 548.352]"
238270+
"look" "[-1708.89 161.885 -5663.07]"
238294238271
}
238295238272
}
238296238273
cordons

0 commit comments

Comments
 (0)