Skip to content

Commit

Permalink
custom sp mapents, crash fixes, bot support etc
Browse files Browse the repository at this point in the history
- add custom mapEnts for each SP map (3 dm spawns, glob intermission)
- slightly modify map exporter to export original mapEnts and not the custom ones ^
- move MP-SP logic to module "_Map"
- intercept and skip a _entity visibility_ check on SP maps
- `scr_testclients` now works on SP maps
- fix damage and respawn on SP maps
  • Loading branch information
xoxor4d committed Feb 11, 2022
1 parent a910f03 commit 0d26fc5
Show file tree
Hide file tree
Showing 35 changed files with 5,409 additions and 10,361 deletions.
31 changes: 31 additions & 0 deletions mods/spmod/mapents/ac130.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"sundiffusecolor" "0 0 0"
"suncolor" "0 0 0"
"classname" "worldspawn"
"diffusefraction" "0"
"ambient" "0"
"sunlight" "0"
"sundirection" "0 0 0"
"_color" "0 0 0"
"contrastgain" "0"
}
{
"angles" "0 235 0"
"origin" "1302 5030 36"
"classname" "mp_dm_spawn"
}
{
"angles" "0 130 0"
"origin" "1636 3603 60"
"classname" "mp_dm_spawn"
}
{
"angles" "0 40 0"
"origin" "-443 3421 60"
"classname" "mp_dm_spawn"
}
{
"origin" "349 3295 269"
"angles" "0 203 0"
"classname" "mp_global_intermission"
}
32 changes: 32 additions & 0 deletions mods/spmod/mapents/aftermath.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"contrastGain" "0.15"
"diffusefraction" "0.45"
"_color" "0.90 0.90 1"
"sunlight" "1"
"sundirection" "-35 150 0"
"sundiffusecolor" "1 1 1"
"suncolor" "1 1 1"
"ambient" ".15"
"reflection_color_correction" "aftermath"
"classname" "worldspawn"
}
{
"angles" "0 280 0"
"origin" "-671 8948 696"
"classname" "mp_dm_spawn"
}
{
"angles" "0 0 0"
"origin" "-997 8631 699"
"classname" "mp_dm_spawn"
}
{
"angles" "0 280 0"
"origin" "-781 9402 692"
"classname" "mp_dm_spawn"
}
{
"origin" "-695 8511 717"
"angles" "0 90 0"
"classname" "mp_global_intermission"
}
34 changes: 34 additions & 0 deletions mods/spmod/mapents/airlift.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"bouncefraction" ".7"
"ambient" ".05"
"diffusefraction" "0.25"
"sunlight" "1.5"
"sundiffusecolor" ".9 0.75 .88"
"suncolor" "1 0.92 0.88"
"sundirection" "-17 56.333 0"
"_color" ".8 .9 1"
"contrastgain" "0.425"
"classname" "worldspawn"
"sunradiosity" "1.5"
"radiosityscale" "1.2"
}
{
"angles" "0 270 0"
"origin" "-948 -3807 4"
"classname" "mp_dm_spawn"
}
{
"angles" "0 70 0"
"origin" "-1328 -4788 144"
"classname" "mp_dm_spawn"
}
{
"angles" "0 0 0"
"origin" "-2190 -4231 -1"
"classname" "mp_dm_spawn"
}
{
"origin" "-1717 -3673 143"
"angles" "10 297 0"
"classname" "mp_global_intermission"
}
34 changes: 34 additions & 0 deletions mods/spmod/mapents/airplane.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"ambient" ".03"
"diffusefraction" "0.01"
"bouncefraction" "2"
"sunlight" "1.5"
"fov_inner" "60"
"classname" "worldspawn"
"suncolor" ".9 .9 1"
"sundiffusecolor" "0.015 0.015 0.013"
"sundirection" "-18 100 0"
"_color" ".6 .6 .6"
"fov_outer" "120"
"reflection_color_correction" "airplane"
}
{
"angles" "0 264 0"
"origin" "-758 656 188"
"classname" "mp_dm_spawn"
}
{
"angles" "0 248 0"
"origin" "57 606 188"
"classname" "mp_dm_spawn"
}
{
"angles" "0 270 0"
"origin" "523 678 188"
"classname" "mp_dm_spawn"
}
{
"origin" "-1166 581 361"
"angles" "18 334 0"
"classname" "mp_global_intermission"
}
36 changes: 36 additions & 0 deletions mods/spmod/mapents/ambush.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"reflection_color_correction" "ambush"
"sunradiosity" "2"
"northyaw" "225"
"sunlight" "1.5"
"diffusefraction" "0.05"
"ambient" ".1"
"bouncefraction" ".1"
"radiosityscale" "1"
"contrastgain" "0.15"
"_color" "0.90 0.90 1"
"sundirection" "-146 -34 0"
"sundiffusecolor" ".43 .39 1"
"suncolor" ".9 .98 1"
"classname" "worldspawn"
}
{
"angles" "0 125 0"
"origin" "235 -2102 84"
"classname" "mp_dm_spawn"
}
{
"angles" "0 125 0"
"origin" "23 -1730 98"
"classname" "mp_dm_spawn"
}
{
"angles" "0 295 0"
"origin" "-558 -1389 78"
"classname" "mp_dm_spawn"
}
{
"origin" "-585 -1408 176"
"angles" "15 310 0"
"classname" "mp_global_intermission"
}
30 changes: 30 additions & 0 deletions mods/spmod/mapents/armada.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"_color" ".75 .84 1"
"ambient" "0"
"sunlight" "1.4"
"diffusefraction" "0.1"
"classname" "worldspawn"
"suncolor" ".85 .76 .53"
"sundiffusecolor" ".75 .84 1"
"sundirection" "-30 -340 0"
}
{
"angles" "0 123 0"
"origin" "2239 26714 70"
"classname" "mp_dm_spawn"
}
{
"angles" "0 326 0"
"origin" "1357 27676 2"
"classname" "mp_dm_spawn"
}
{
"angles" "0 38 0"
"origin" "611 26246 6"
"classname" "mp_dm_spawn"
}
{
"origin" "2239 26714 70"
"angles" "0 123 0"
"classname" "mp_global_intermission"
}
34 changes: 34 additions & 0 deletions mods/spmod/mapents/blackout.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"_color" "0.6 0.7 1.000000"
"script_flag" "blackout_lightswitch_begins"
"suncolor" "0.75 0.9 1"
"sundiffusecolor" "0.5 0.6 1"
"contrastgain" ".25"
"sunradiosity" "1"
"ambient" "0.1"
"diffusefraction" "0.35"
"sunlight" ".6"
"sundirection" "-30 42 0"
"classname" "worldspawn"
"reflection_color_correction" "hunted"
}
{
"angles" "0 20 0"
"origin" "-6309 -1935 312"
"classname" "mp_dm_spawn"
}
{
"angles" "0 295 0"
"origin" "-5211 -689 276"
"classname" "mp_dm_spawn"
}
{
"angles" "0 165 0"
"origin" "-3938 -2000 164"
"classname" "mp_dm_spawn"
}
{
"origin" "-4097 -2369 397"
"angles" "0 143 0"
"classname" "mp_global_intermission"
}
33 changes: 33 additions & 0 deletions mods/spmod/mapents/bog_a.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"northyaw" "90"
"sunradiosity" ".7"
"ambient" "0.125"
"diffusefraction" ".4"
"sunlight" "0.5"
"sundirection" "-22 247 0"
"suncolor" ".68 .72 .76"
"sundiffusecolor" "0.717647 0.776471 1.000000"
"_color" ".67 .72 .94"
"radiosityscale" "1.8"
"classname" "worldspawn"
}
{
"angles" "0 250 0"
"origin" "7613 2471 109"
"classname" "mp_dm_spawn"
}
{
"angles" "0 306 0"
"origin" "6559 2269 109"
"classname" "mp_dm_spawn"
}
{
"angles" "0 244 0"
"origin" "7341 1769 109"
"classname" "mp_dm_spawn"
}
{
"origin" "7328 1154 263"
"angles" "12 81 0"
"classname" "mp_global_intermission"
}
33 changes: 33 additions & 0 deletions mods/spmod/mapents/bog_b.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"sundiffusecolor" ".9 0.88 .75"
"suncolor" "1 0.92 0.88"
"classname" "worldspawn"
"northyaw" "180"
"sunlight" "1"
"ambient" ".1"
"bouncefraction" ".7"
"diffusefraction" "0.5"
"sundirection" "-50 136 0"
"_color" ".8 .9 1"
"contrastgain" "0.425"
}
{
"angles" "0 196 0"
"origin" "5335 -3159 -12"
"classname" "mp_dm_spawn"
}
{
"angles" "0 310 0"
"origin" "4291 -2681 -4"
"classname" "mp_dm_spawn"
}
{
"angles" "0 334 0"
"origin" "3392 -2771 -63"
"classname" "mp_dm_spawn"
}
{
"origin" "4273 -3439 -56"
"angles" "0 50 0"
"classname" "mp_global_intermission"
}
33 changes: 33 additions & 0 deletions mods/spmod/mapents/cargoship.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"reflection_color_correction" "cargoship"
"sunlight" "1"
"diffusefraction" "0.15"
"ambient" ".1"
"radiosityscale" "2"
"sundiffusecolor" "0.5 0.5 0.7"
"contrastgain" "0.15"
"_color" "0.5 0.5 0.7"
"sundirection" "-25 315 0"
"suncolor" "0.5 0.6 1.000000"
"classname" "worldspawn"
}
{
"angles" "0 181 0"
"origin" "1074 5 236"
"classname" "mp_dm_spawn"
}
{
"angles" "0 41 0"
"origin" "-1140 -277 76"
"classname" "mp_dm_spawn"
}
{
"angles" "0 317 0"
"origin" "-2133 478 76"
"classname" "mp_dm_spawn"
}
{
"origin" "-2115 468 289"
"angles" "11 334 0"
"classname" "mp_global_intermission"
}
34 changes: 34 additions & 0 deletions mods/spmod/mapents/coup.ents
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"reflection_color_correction" "coup"
"diffusefraction" "0.2"
"ambient" ".02"
"radiosity" "1"
"sunlight" "1.1"
"sundirection" "-40 72 0"
"sundiffusecolor" "1 .95 .8"
"suncolor" "1 1 .85"
"_color" "0 1 .5"
"bouncefracion" ".1"
"sunradiosity" "2.5"
"classname" "worldspawn"
}
{
"angles" "0 90 0"
"origin" "67 -549 60"
"classname" "mp_dm_spawn"
}
{
"angles" "0 0 0"
"origin" "-305 548 52"
"classname" "mp_dm_spawn"
}
{
"angles" "0 200 0"
"origin" "741 671 41"
"classname" "mp_dm_spawn"
}
{
"origin" "67 -549 60"
"angles" "0 90 0"
"classname" "mp_global_intermission"
}
Loading

0 comments on commit 0d26fc5

Please sign in to comment.