From 93c795b3f59feb542cb6b6ce986942127a23ef48 Mon Sep 17 00:00:00 2001 From: maddin Date: Thu, 21 Nov 2013 18:43:20 +0100 Subject: [PATCH] =?utf8?q?added=20autoscreenshot=20entity,=20removed=20lig?= =?utf8?q?htmapsamplesize=20parm=20in=20worldspawn,=20removed=20null=20mod?= =?utf8?q?el=20(because=20we=20don=C2=B4t=20need=20it),=20replaced=20explo?= =?utf8?q?sive=20barrels,=20using=20standard=20compile=20options=20now?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- maps/warfare.map | 134 +++++++++++++++--------------------- maps/warfare.map.options | 7 +- maps/warfare.mapinfo | 2 +- models/map_warfare/null.md3 | Bin 22340 -> 0 bytes scripts/map_warfare.shader | 9 ++- 5 files changed, 65 insertions(+), 87 deletions(-) delete mode 100644 models/map_warfare/null.md3 diff --git a/maps/warfare.map b/maps/warfare.map index eb6c75aa..4a297efe 100644 --- 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 cebfce64..da6c0cfe 100644 --- 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 34323dcd..eaab2694 100644 --- 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 index b30fdfcf51455817909624de20c8cc0db2bf84da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22340 zcmeI(y>47p6o%o6NzV;XP|{`2K6B=$LYC5`OGh1nyTq145R_aJw?N0Ga04_H5i{d? z7~$2dd`gL>@ngT4ogI;-9kg})>gDVC%hl)k`1|tPJiGYz=vTYP*URtD@%Q8B)9dtc zdwHF|@#(MU%kAWwtF3k8`hH)v*3I61wY6?@eZQ|->lW|6+FG~0zTa1^b;rMgrys3# z`=_fO|L#s}Pan6J*ZCWtPJe#~-&}3&H?6M=E?@Q5)q&})s{_+pR|lrIt`1CZT^*R- zx;ikub#-8R>*~Pt*42S&tsCLIjBs8?I4>idml4j(2N!+F_;^Rf-+Wf#uNE}WNLI4`?!UUuQU?8153h4Zot=Vcep%PyRkeK;@sa9;M| zyzIky*@yG859ehc&dWZWmwh-d`*2p5FNbhm4&l5U z!g-n2WnfzOHq*KcOmkfsnC7}NFwJ#kV4Ca7z%@b>1VUhp>8h4WG`c$@o$^HMK(oBM_H zQZIO$`-SsTFL-sTaJx z{ptm8b6t48)C=C`e&P92FL;~#h38AX;BD>~o-g%+x3^!t;BBr8&zE|^+uScaU+M*K zbHDI>sTaJ>{lfF5Uhp>e3(uE&!Q0!fUhp>8h38AX;BD>~o-g%+x4B<P% zQZIOW`_&8H=DP5FsTaJ>{lfF5Uhp>e3(uE&!Q0#~JYVVsZ*#x!e5n__z5VJ1Z*yIE zzSIle=6>P%QZIO$`-SIAz2I%`7oIQmg15I{z2I%G3(uE&!Q0#~JYVVsZ*#x!e5n__ z&HcjjrC#th_shI1yZ z{lfF5KET`DFFarB1H8@s!t*7(-yQV<-rk=xyx$%50p8|*;lD@q0p8|*;lD@q0p8|* z;lD@q0p8wz;r;Fi?{`OifVcVQ4FCV7KET`DFFarB1H8@s!tzl7vs}Fa-eE8}8-H$K6 ze|Y!q;r_+_!w>J@{CxbyPy9Ij{-?c8A730_r|(y*U%x%`pHHWDdEH#z_VHgop5J=2 z;^S}g|F8S+;J*uX>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)I zr%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#Q zsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+ z>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXy zI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXa zPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?Vfq zQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u z)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Z zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y; zojP^u)TvXaPMtb+>eQ)Ir%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPMtb+>eQ)I lr%s(Zb?VfqQ>RXyI(6#QsZ*y;ojP^u)TvXaPM!MMe*mz4-wFT# diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader index 8111b35d..64457c15 100644 --- 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 } -- 2.39.2