Skip to content

Commit f3f9f15

Browse files
ywgATustcbbsywgATustcbbs
authored
Merge branch 'reactivedrop_beta' into TracePlayer
2 parents 9ec1c7a + 10466c1 commit f3f9f15

30 files changed

Lines changed: 1195 additions & 1122 deletions

‎contentsrc/mapsrc/ASI-Jac1-LandingBay_02.vmf‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ versioninfo
22
{
33
"editorversion" "400"
44
"editorbuild" "7397"
5-
"mapversion" "3603"
5+
"mapversion" "3604"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -50,7 +50,7 @@ viewsettings
5050
world
5151
{
5252
"id" "394754"
53-
"mapversion" "3603"
53+
"mapversion" "3604"
5454
"classname" "worldspawn"
5555
"detailmaterial" "detail/detailsprites"
5656
"detailvbsp" "detail.vbsp"
@@ -19656,7 +19656,7 @@ entity
1965619656
"origin" "-6512 -1488 844"
1965719657
editor
1965819658
{
19659-
"color" "0 255 0"
19659+
"color" "220 30 220"
1966019660
"visgroupshown" "1"
1966119661
"visgroupautoshown" "1"
1966219662
"logicalpos" "[0 1500]"
@@ -20791,7 +20791,7 @@ entity
2079120791
"origin" "-6608 -1448 844"
2079220792
editor
2079320793
{
20794-
"color" "0 255 0"
20794+
"color" "220 30 220"
2079520795
"visgroupshown" "1"
2079620796
"visgroupautoshown" "1"
2079720797
"logicalpos" "[0 1500]"
@@ -32230,7 +32230,7 @@ entity
3223032230
"rendercolor" "255 255 255"
3223132231
"shadowcastdist" "0"
3223232232
"skin" "2"
32233-
"spawnflags" "33025"
32233+
"spawnflags" "33801"
3223432234
"origin" "-5092.67 870.539 832.281"
3223532235
editor
3223632236
{
@@ -32264,7 +32264,7 @@ entity
3226432264
"rendercolor" "255 255 255"
3226532265
"shadowcastdist" "0"
3226632266
"skin" "2"
32267-
"spawnflags" "33025"
32267+
"spawnflags" "33801"
3226832268
"origin" "-5092.67 958.539 832.281"
3226932269
editor
3227032270
{
@@ -32298,7 +32298,7 @@ entity
3229832298
"rendercolor" "255 255 255"
3229932299
"shadowcastdist" "0"
3230032300
"skin" "2"
32301-
"spawnflags" "33025"
32301+
"spawnflags" "33801"
3230232302
"origin" "-5308.85 1375.9 832.281"
3230332303
editor
3230432304
{
@@ -32332,7 +32332,7 @@ entity
3233232332
"rendercolor" "255 255 255"
3233332333
"shadowcastdist" "0"
3233432334
"skin" "2"
32335-
"spawnflags" "33025"
32335+
"spawnflags" "33801"
3233632336
"origin" "-5308.85 1463.9 832.281"
3233732337
editor
3233832338
{
@@ -55843,7 +55843,7 @@ entity
5584355843
"origin" "-6672 -1376 844"
5584455844
editor
5584555845
{
55846-
"color" "0 255 0"
55846+
"color" "220 30 220"
5584755847
"visgroupshown" "1"
5584855848
"visgroupautoshown" "1"
5584955849
"logicalpos" "[0 1500]"
@@ -55964,7 +55964,7 @@ entity
5596455964
"origin" "-6576 -1376 844"
5596555965
editor
5596655966
{
55967-
"color" "0 255 0"
55967+
"color" "220 30 220"
5596855968
"visgroupshown" "1"
5596955969
"visgroupautoshown" "1"
5597055970
"logicalpos" "[0 1500]"
@@ -56066,7 +56066,7 @@ entity
5606656066
"origin" "-6480 -1408 844"
5606756067
editor
5606856068
{
56069-
"color" "0 255 0"
56069+
"color" "220 30 220"
5607056070
"visgroupshown" "1"
5607156071
"visgroupautoshown" "1"
5607256072
"logicalpos" "[0 1500]"
@@ -63006,7 +63006,7 @@ entity
6300663006
"origin" "-6448 -1456 844"
6300763007
editor
6300863008
{
63009-
"color" "0 255 0"
63009+
"color" "220 30 220"
6301063010
"visgroupshown" "1"
6301163011
"visgroupautoshown" "1"
6301263012
"logicalpos" "[0 1500]"
@@ -88336,8 +88336,8 @@ cameras
8833688336
"activecamera" "0"
8833788337
camera
8833888338
{
88339-
"position" "[-5433.51 5556.85 1219.01]"
88340-
"look" "[-5553.87 6842.42 -4942.78]"
88339+
"position" "[-5129.34 817.108 1017.95]"
88340+
"look" "[-4077.25 4083.93 -4259.92]"
8834188341
}
8834288342
}
8834388343
cordons

‎contentsrc/mapsrc/ASI-Jac6-SewerJunction.vmf‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ versioninfo
22
{
33
"editorversion" "400"
44
"editorbuild" "7397"
5-
"mapversion" "1268"
5+
"mapversion" "1275"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -32,7 +32,7 @@ viewsettings
3232
world
3333
{
3434
"id" "8147"
35-
"mapversion" "1268"
35+
"mapversion" "1275"
3636
"classname" "worldspawn"
3737
"detailmaterial" "detail/detailsprites"
3838
"detailvbsp" "detail.vbsp"
@@ -76344,7 +76344,7 @@ entity
7634476344
"origin" "2452 -6961 -615"
7634576345
editor
7634676346
{
76347-
"color" "0 255 0"
76347+
"color" "220 30 220"
7634876348
"visgroupshown" "1"
7634976349
"visgroupautoshown" "1"
7635076350
"logicalpos" "[16000 -10268]"
@@ -77770,7 +77770,7 @@ entity
7777077770
"origin" "2390 -6958 -615"
7777177771
editor
7777277772
{
77773-
"color" "0 255 0"
77773+
"color" "220 30 220"
7777477774
"visgroupshown" "1"
7777577775
"visgroupautoshown" "1"
7777677776
"logicalpos" "[16000 -10768]"
@@ -97688,7 +97688,7 @@ hidden
9768897688
"origin" "460 1843.3 -478"
9768997689
editor
9769097690
{
97691-
"color" "0 255 0"
97691+
"color" "220 30 220"
9769297692
"visgroupid" "19"
9769397693
"visgroupshown" "0"
9769497694
"visgroupautoshown" "1"
@@ -184060,6 +184060,7 @@ entity
184060184060
"NearDistance" "740"
184061184061
"NumAliens" "3"
184062184062
"sizescalesp" "1.0"
184063+
"SpawnerState" "1"
184063184064
"spawnflags" "0"
184064184065
"SpawnIfMarinesAreNear" "1"
184065184066
"SpawnInterval" "2"
@@ -189681,6 +189682,7 @@ entity
189681189682
"NearDistance" "740"
189682189683
"NumAliens" "1"
189683189684
"sizescalesp" "1.0"
189685+
"SpawnerState" "1"
189684189686
"spawnflags" "0"
189685189687
"SpawnIfMarinesAreNear" "1"
189686189688
"SpawnInterval" "5"
@@ -206043,7 +206045,7 @@ entity
206043206045
"teslablesp" "1"
206044206046
"UnburrowActivity" "ACT_CLIMB_OFF_RAIL_52"
206045206047
"UnburrowIdleActivity" "ACT_CLIMB_OFF_RAIL_IDLE"
206046-
"origin" "260 -2928 -552"
206048+
"origin" "262 -2928 -550"
206047206049
editor
206048206050
{
206049206051
"color" "0 0 255"
@@ -206122,7 +206124,7 @@ entity
206122206124
"teslablesp" "1"
206123206125
"UnburrowActivity" "ACT_CLIMB_OFF_RAIL_52"
206124206126
"UnburrowIdleActivity" "ACT_CLIMB_OFF_RAIL_IDLE"
206125-
"origin" "-224 -3113 -552"
206127+
"origin" "-222 -3113 -550"
206126206128
editor
206127206129
{
206128206130
"color" "0 0 255"
@@ -209989,7 +209991,7 @@ entity
209989209991
"origin" "2459 -6892 -615"
209990209992
editor
209991209993
{
209992-
"color" "0 255 0"
209994+
"color" "220 30 220"
209993209995
"visgroupshown" "1"
209994209996
"visgroupautoshown" "1"
209995209997
"logicalpos" "[16000 -9768]"
@@ -210003,7 +210005,7 @@ entity
210003210005
"origin" "2407 -6896 -615"
210004210006
editor
210005210007
{
210006-
"color" "0 255 0"
210008+
"color" "220 30 220"
210007210009
"visgroupshown" "1"
210008210010
"visgroupautoshown" "1"
210009210011
"logicalpos" "[16000 -9268]"
@@ -210097,7 +210099,7 @@ entity
210097210099
"origin" "2401 -6772 -615"
210098210100
editor
210099210101
{
210100-
"color" "0 255 0"
210102+
"color" "220 30 220"
210101210103
"visgroupshown" "1"
210102210104
"visgroupautoshown" "1"
210103210105
"logicalpos" "[16000 -13268]"
@@ -211622,7 +211624,7 @@ entity
211622211624
"origin" "2396 -7014 -615"
211623211625
editor
211624211626
{
211625-
"color" "0 255 0"
211627+
"color" "220 30 220"
211626211628
"visgroupshown" "1"
211627211629
"visgroupautoshown" "1"
211628211630
"logicalpos" "[16000 -11268]"
@@ -211636,7 +211638,7 @@ entity
211636211638
"origin" "2451 -6823 -615"
211637211639
editor
211638211640
{
211639-
"color" "0 255 0"
211641+
"color" "220 30 220"
211640211642
"visgroupshown" "1"
211641211643
"visgroupautoshown" "1"
211642211644
"logicalpos" "[16000 -12268]"
@@ -212091,7 +212093,7 @@ entity
212091212093
"origin" "2443 -7040 -615"
212092212094
editor
212093212095
{
212094-
"color" "0 255 0"
212096+
"color" "220 30 220"
212095212097
"visgroupshown" "1"
212096212098
"visgroupautoshown" "1"
212097212099
"logicalpos" "[16000 -11768]"
@@ -227786,7 +227788,7 @@ entity
227786227788
"speedscalesp" "1.0"
227787227789
"targetname" "DroneSpawn14"
227788227790
"teslablesp" "1"
227789-
"origin" "-2494.47 2993 -432"
227791+
"origin" "-2494.47 2993 -430"
227790227792
editor
227791227793
{
227792227794
"color" "0 0 255"
@@ -227825,7 +227827,7 @@ entity
227825227827
"speedscalesp" "1.0"
227826227828
"targetname" "DroneSpawn14"
227827227829
"teslablesp" "1"
227828-
"origin" "-2494 2832 -431"
227830+
"origin" "-2494 2832 -429"
227829227831
editor
227830227832
{
227831227833
"color" "0 0 255"
@@ -272551,8 +272553,8 @@ cameras
272551272553
"activecamera" "0"
272552272554
camera
272553272555
{
272554-
"position" "[-1153.64 2306.83 -346.393]"
272555-
"look" "[4456.52 2068.2 -2988.72]"
272556+
"position" "[-241.056 -3376.98 -214.69]"
272557+
"look" "[354.6 861.05 -4708.8]"
272556272558
}
272557272559
}
272558272560
cordons

‎contentsrc/mapsrc/instances/landingbay_singleplayer_part2.vmf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ versioninfo
22
{
33
"editorversion" "400"
44
"editorbuild" "7397"
5-
"mapversion" "3609"
5+
"mapversion" "3610"
66
"formatversion" "100"
77
"prefab" "0"
88
}
@@ -50,7 +50,7 @@ viewsettings
5050
world
5151
{
5252
"id" "394754"
53-
"mapversion" "3609"
53+
"mapversion" "3610"
5454
"classname" "worldspawn"
5555
"detailmaterial" "detail/detailsprites"
5656
"detailvbsp" "detail.vbsp"
@@ -31302,7 +31302,7 @@ entity
3130231302
"rendercolor" "255 255 255"
3130331303
"shadowcastdist" "0"
3130431304
"skin" "2"
31305-
"spawnflags" "33025"
31305+
"spawnflags" "34057"
3130631306
"origin" "-5092.67 870.539 832.281"
3130731307
editor
3130831308
{
@@ -31336,7 +31336,7 @@ entity
3133631336
"rendercolor" "255 255 255"
3133731337
"shadowcastdist" "0"
3133831338
"skin" "2"
31339-
"spawnflags" "33025"
31339+
"spawnflags" "34057"
3134031340
"origin" "-5092.67 958.539 832.281"
3134131341
editor
3134231342
{
@@ -31370,7 +31370,7 @@ entity
3137031370
"rendercolor" "255 255 255"
3137131371
"shadowcastdist" "0"
3137231372
"skin" "2"
31373-
"spawnflags" "33025"
31373+
"spawnflags" "34057"
3137431374
"origin" "-5308.85 1375.9 832.281"
3137531375
editor
3137631376
{
@@ -31404,7 +31404,7 @@ entity
3140431404
"rendercolor" "255 255 255"
3140531405
"shadowcastdist" "0"
3140631406
"skin" "2"
31407-
"spawnflags" "33025"
31407+
"spawnflags" "34057"
3140831408
"origin" "-5308.85 1463.9 832.281"
3140931409
editor
3141031410
{
@@ -79662,7 +79662,7 @@ entity
7966279662
"rendercolor" "255 255 255"
7966379663
"shadowcastdist" "0"
7966479664
"skin" "2"
79665-
"spawnflags" "33025"
79665+
"spawnflags" "33801"
7966679666
"origin" "-6544 896 832.281"
7966779667
editor
7966879668
{
@@ -85852,8 +85852,8 @@ cameras
8585285852
"activecamera" "0"
8585385853
camera
8585485854
{
85855-
"position" "[-5477.03 5530.91 1142.71]"
85856-
"look" "[-4983.68 8283.34 -4497.82]"
85855+
"position" "[-5222.79 1209.15 974.816]"
85856+
"look" "[-7344.12 6255.4 -2134.87]"
8585785857
}
8585885858
}
8585985859
cordons

0 commit comments

Comments
 (0)