added autoscreenshot entity, removed lightmapsamplesize parm in worldspawn, removed...

diff --git a/maps/warfare.map b/maps/warfare.map
index eb6c75aaa613bb476efd9dbb94807f9d9292a99b..4a297efe0b60fe8b8e76e39d8d777e1adaeb2389 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,6 +1,5 @@
 {
 "classname" "worldspawn"
-"_lightmapscale" "0.25"
 "fog" "1 1 0.8 0.5 0.15 128 1028"
 "_floodlight" "178 209 255 1024 10"
 {
@@ -20216,14 +20215,14 @@ exx/base-metal04
 ( -832 544 224 ) ( -832 576 224 ) ( -800 576 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -832 544 192 ) ( -800 544 192 ) ( -800 544 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( -808 544 192 ) ( -808 576 192 ) ( -808 576 160 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
-( -800 608 192 ) ( -832 608 192 ) ( -832 608 160 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -800 608 192 ) ( -832 608 192 ) ( -832 608 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( -832 576 192 ) ( -832 544 192 ) ( -832 544 160 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -816 608 224 ) ( -848 608 224 ) ( -848 544 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -808 544 288 ) ( -808 608 288 ) ( -792 608 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -832 544 224 ) ( -800 544 224 ) ( -800 544 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( -800 608 224 ) ( -832 608 224 ) ( -832 608 160 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -800 608 224 ) ( -832 608 224 ) ( -832 608 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( -808 608 288 ) ( -808 544 288 ) ( -824 544 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -808 544 224 ) ( -792 544 288 ) ( -800 608 256 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
 }
@@ -20232,7 +20231,7 @@ exx/base-metal04
 ( -792 544 312 ) ( -792 616 312 ) ( -768 616 312 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -816 544 288 ) ( -792 544 288 ) ( -792 544 256 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( -792 544 320 ) ( -792 616 320 ) ( -792 616 288 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
-( -792 608 288 ) ( -816 608 288 ) ( -816 608 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -792 608 288 ) ( -816 608 288 ) ( -816 608 256 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( -800 616 280 ) ( -800 544 280 ) ( -800 544 248 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -24353,39 +24352,22 @@ map_warfare/floor_panel
 ( 288 -952 640 ) ( 288 -944 640 ) ( 288 -952 672 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 424 -584 476 ) ( 424 -600 476 ) ( 384 -584 476 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( 424 -584 472 ) ( 384 -584 472 ) ( 424 -584 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -600 464 ) ( 424 -600 464 ) ( 384 -584 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 664 -768 464 ) ( 664 -768 472 ) ( 704 -768 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -600 468 ) ( 384 -584 468 ) ( 384 -600 476 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -600 -52 ) ( 400 -584 -52 ) ( 384 -600 76 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 512 -704 -64 ) ( 512 -720 -64 ) ( 512 -704 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 576 -824 480 ) ( 576 -952 480 ) ( 360 -824 480 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( 576 -824 476 ) ( 360 -824 476 ) ( 576 -824 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -952 472 ) ( 576 -952 472 ) ( 360 -824 472 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -952 468 ) ( 360 -952 476 ) ( 576 -952 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -952 476 ) ( 360 -824 476 ) ( 360 -952 484 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -848 -48 ) ( 368 -840 -48 ) ( 360 -848 80 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 512 -704 -60 ) ( 512 -720 -60 ) ( 512 -704 68 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 576 -768 476 ) ( 576 -832 476 ) ( 384 -768 476 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( 576 -768 472 ) ( 384 -768 472 ) ( 576 -768 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -832 464 ) ( 576 -832 464 ) ( 384 -768 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -824 464 ) ( 384 -824 472 ) ( 576 -824 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 384 -832 468 ) ( 384 -768 468 ) ( 384 -832 476 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 512 -704 -64 ) ( 512 -720 -64 ) ( 512 -704 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-( 576 -824 476 ) ( 576 -952 476 ) ( 360 -824 476 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( 576 -824 472 ) ( 360 -824 472 ) ( 576 -824 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 360 -952 464 ) ( 576 -952 464 ) ( 360 -824 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 360 -952 464 ) ( 360 -952 472 ) ( 576 -952 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 360 -952 468 ) ( 360 -824 468 ) ( 360 -952 476 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 360 -848 -52 ) ( 368 -840 -52 ) ( 360 -848 76 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 512 -704 -64 ) ( 512 -720 -64 ) ( 512 -704 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-( 360 -848 476 ) ( 360 -952 476 ) ( 248 -848 476 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( 360 -848 472 ) ( 248 -848 472 ) ( 360 -848 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 360 -848 476 ) ( 360 -848 468 ) ( 360 -952 476 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 248 -952 464 ) ( 360 -952 464 ) ( 248 -848 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 248 -952 464 ) ( 248 -952 472 ) ( 360 -952 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 248 -952 464 ) ( 248 -848 464 ) ( 248 -952 472 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 248 -864 -56 ) ( 264 -848 -56 ) ( 248 -864 72 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -848 480 ) ( 360 -952 480 ) ( 248 -848 480 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( 360 -848 476 ) ( 248 -848 476 ) ( 360 -848 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 360 -848 484 ) ( 360 -848 476 ) ( 360 -952 484 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 248 -952 472 ) ( 360 -952 472 ) ( 248 -848 472 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 248 -952 468 ) ( 248 -952 476 ) ( 360 -952 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 248 -952 468 ) ( 248 -848 468 ) ( 248 -952 476 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 248 -864 -52 ) ( 264 -848 -52 ) ( 248 -864 76 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 704 -608 744 ) ( 704 -768 744 ) ( 576 -608 744 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -25814,7 +25796,7 @@ map_warfare/floor_panel
 ( -256 -272 160 ) ( -240 -272 160 ) ( -256 -200 160 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -224 -312 288 ) ( -208 -304 288 ) ( -240 -272 160 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -224 64 288 ) ( -224 -280 288 ) ( -256 64 160 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -232 64 256 ) ( -224 64 256 ) ( -232 -64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -232 64 256 ) ( -224 64 256 ) ( -232 -64 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -208 64 288 ) ( -224 192 288 ) ( -256 192 160 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -28022,6 +28004,23 @@ trak5x/base-pipe1b
 ( 440 -256 -56 ) ( 480 -248 -56 ) ( 440 -256 72 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 ( 480 -248 -56 ) ( 512 -256 -56 ) ( 480 -248 72 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 424 -584 480 ) ( 424 -600 480 ) ( 384 -584 480 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( 424 -584 476 ) ( 384 -584 476 ) ( 424 -584 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -600 472 ) ( 424 -600 472 ) ( 384 -584 472 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -600 476 ) ( 384 -584 476 ) ( 384 -600 484 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -600 -44 ) ( 400 -584 -44 ) ( 384 -600 84 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 512 -704 -60 ) ( 512 -720 -60 ) ( 512 -704 68 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -824 468 ) ( 384 -824 476 ) ( 576 -824 468 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 343.7611541748 210.6975402832 50.8441619873 ) ( 343.6688232422 206.7222747803 50.4096984863 ) ( 273.371673584 213.948928833 36.0540008545 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 344.4998168945 242.4996337891 54.3199005127 ) ( 274.1103363037 245.7510223389 39.5297393799 ) ( 359.5516662598 249.8036956787 -15.7093353271 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 343.7611541748 210.6975402832 50.8441619873 ) ( 358.81300354 218.0016021729 -19.1850738525 ) ( 343.6688232422 206.7222747803 50.4096984863 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 288.3311767578 217.2777252197 -34.4096984863 ) ( 358.7206573486 214.0263366699 -19.6195373535 ) ( 288.4235076904 221.2529907227 -33.9752197266 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 286.6639556885 181.0945892334 -34.4293823242 ) ( 271.612121582 173.790512085 35.5998535156 ) ( 357.0534515381 177.8431854248 -19.6392211914 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 288.3311767578 217.2777252197 -34.4096984863 ) ( 288.4235076904 221.2529907227 -33.9752197266 ) ( 273.2793426514 209.9736633301 35.6195373535 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -29994,48 +29993,6 @@ exx/base-metal05rust
 "targetname" "wp_16"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "312.000000 232.000000 -16.000000"
-"model" "models/containers/barrel01.md3"
-"health" "40"
-"mdl" "TE_EXPLOSION"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/grenade_impact.ogg"
-"dmg" "50"
-"dmg_edge" "10"
-"dmg_radius" "192"
-"dmg_force" "200"
-"debristime" "5"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "30"
-"respawntimejitter" "10"
-"angles" "-50.000004 130.000000 0.000000"
-}
-{
-"classname" "misc_breakablemodel"
-"origin" "366.000000 233.000000 -11.000000"
-"model" "models/containers/barrel01.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"health" "50"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"count" "2"
-"dmg" "75"
-"dmg_edge" "25"
-"dmg_radius" "256"
-"dmg_force" "300"
-"debristime" "5"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "30"
-"respawntimejitter" "10"
-"angles" "-20.000013 30.000000 0.000000"
-}
-{
 "classname" "info_botwaypoint"
 "origin" "-48.000000 -56.000000 24.000000"
 "targetname" "wp_17"
@@ -30099,3 +30056,24 @@ exx/base-metal05rust
 "angles" "-2.079236 -0.174051 4.785770"
 "_cs" "1"
 }
+{
+"classname" "info_autoscreenshot"
+"origin" "40.000000 -1152.000000 568.000000"
+"angles" "4 40 0"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "323.483643 215.910202 -26.995792"
+"model" "models/containers/crate01.md3"
+"angles" "-11.922768 -1.351876 6.516583"
+"_cs" "1"
+"loddistance1" "384"
+"lodmodel1" "models/containers/crate01_lod.md3"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "418.999969 -751.000000 473.000031"
+"model" "models/map_warfare/cactus.md3"
+"angles" "9.123635 0.000000 5.837998"
+"_cs" "1"
+}

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index cebfce646dc0626dcd51e3bba63bf6edcf68ddb1..da6c0cfec7ca7aa450613effabec65e5a84bf97f 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -1,5 +1,6 @@
--bsp + -samplesize 8
+-bsp +
+-light + -dirtscale 2
 -vis +
--light + -samplesize 8 -deluxe -patchshadows -samples 4 -lightmapsize 1024 -dirty -dirtscale 2
 -minimap +
-Version: 1
+-sRGB
+Version: 2

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index 34323dcdc45b2c606d57ef43fa8634885959a881..eaab26948858bdb6d379a55f3e15d9dfff31d90e 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -8,5 +8,5 @@ gametype tdm
 gametype lms
 gametype ca
 gametype arena
-gametype rune
+gametype ka
 gametype kh

diff --git a/models/map_warfare/null.md3 b/models/map_warfare/null.md3
deleted file mode 100644 (file)
index b30fdfc..0000000
Binary files a/models/map_warfare/null.md3 and /dev/null differ

diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader
index 8111b35d94c41ec25589f8cb3be8bff3f8c466b3..64457c15c92a59cb9369c8de9443ca6417e86ddc 100644 (file)
--- a/scripts/map_warfare.shader
+++ b/scripts/map_warfare.shader
@@ -93,7 +93,7 @@ textures/map_warfare/cactus
 
 textures/map_warfare/sky
 {
-       qer_editorimage textures/skies/exosystem.tga
+       qer_editorimage textures/skies/exosystem
        
        surfaceparm noimpact
        surfaceparm nolightmap
@@ -101,10 +101,9 @@ textures/map_warfare/sky
        surfaceparm nomarks
        surfaceparm sky
 
+       q3map_sunext 1 1 1 350 60 42 3 16
+       q3map_lightmapfilterradius 0 8
+       q3map_skylight 400 4
        skyparms env/exosystem/exosystem - -
-
-       q3map_sunExt 1 1 1 350 60 42 3 16
-       q3map_lightmapFilterRadius 0 8 // self other
-       q3map_skyLight 400 4
 }