Remove custom textures, replace ads with logos, add more gamemodes

diff --git a/maps/opium.map b/maps/opium.map
index e58e837e97b7f274b4dcab10223f4afe96eb5993..8fa23b2d4d8edfd7915809425cb3b7525cd6f0e1 100644 (file)
--- a/maps/opium.map
+++ b/maps/opium.map
@@ -1,5 +1,8 @@
 {
 "classname" "worldspawn"
+"author" "cityy"
+"message" "Opium"
+"_description" "Medium sized indoor deathmatch map"
 {
 patchDef2
 {
@@ -610,12 +613,12 @@ brushDef
 {
 brushDef
 {
-( -188.6491699219 140.649597168 -128 ) ( -195.7759552002 144.283996582 -128 ) ( -181.3803863525 154.9031829834 -128 ) ( ( -0.0070984256 0.0139195155 6.3606524467 ) ( -0.0139195155 -0.0070984256 12.3118743896 ) ) common/nodrawnonsolid 134217728 0 0
-( -146.7616271973 115.2088317871 -744 ) ( -139.4928283691 129.4624328613 -744 ) ( -146.7616271973 115.2088317871 -752 ) ( ( 0.0156249981 0 243.6881256104 ) ( 0 0.015625 251 ) ) common/nodrawnonsolid 134217728 0 0
-( -193.0147705078 147.7763977051 -744 ) ( -193.0147705078 147.7763977051 -752 ) ( -200.1415710449 151.4107971191 -744 ) ( ( 0.0156249981 0 6.3606529236 ) ( 0 0.015625 251 ) ) common/nodrawnonsolid 134217728 0 0
-( -192.8727874756 165.6643676758 -752 ) ( -200.1415710449 151.4107971191 -752 ) ( -185.7459869385 162.0299835205 -752 ) ( ( -0.0070984256 -0.0139195155 6.3606524467 ) ( 0.0139195155 -0.0070984256 243.6881256104 ) ) common/nodrawnonsolid 134217728 0 0
-( -192.8727874756 165.6643676758 -752 ) ( -192.8727874756 165.6643676758 -744 ) ( -200.1415710449 151.4107971191 -752 ) ( ( 0.0156249991 0 12.3118743896 ) ( 0 0.015625 251 ) ) common/nodrawnonsolid 134217728 0 0
-( -196.5071716309 158.5375823975 -752 ) ( -189.3803863525 154.9031829834 -752 ) ( -196.5071716309 158.5375823975 -744 ) ( ( 0.0156250019 0 125.1393432617 ) ( 0 0.001602564 255.7948760986 ) ) ct_opium/opium_teleporter_beam 134217728 0 0
+( -188.6491699219 140.649597168 -128 ) ( -195.7759552002 144.283996582 -128 ) ( -181.3803863525 154.9031829834 -128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
+( -146.7616271973 115.2088317871 -744 ) ( -139.4928283691 129.4624328613 -744 ) ( -146.7616271973 115.2088317871 -752 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
+( -193.0147705078 147.7763977051 -744 ) ( -193.0147705078 147.7763977051 -752 ) ( -200.1415710449 151.4107971191 -744 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
+( -192.8727874756 165.6643676758 -752 ) ( -200.1415710449 151.4107971191 -752 ) ( -185.7459869385 162.0299835205 -752 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
+( -192.8727874756 165.6643676758 -752 ) ( -192.8727874756 165.6643676758 -744 ) ( -200.1415710449 151.4107971191 -752 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
+( -196.5071716309 158.5375823975 -752 ) ( -189.3803863525 154.9031829834 -752 ) ( -196.5071716309 158.5375823975 -744 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/blueedge 134217728 0 0
 }
 }
 {
@@ -785,12 +788,12 @@ brushDef
 {
 brushDef
 {
-( 1760 -248 -456 ) ( 1760 -256 -456 ) ( 1744 -248 -456 ) ( ( 0 0.015625 249.5 ) ( -0.015625 0 240.25 ) ) common/nodrawnonsolid 134217728 0 0
-( 1760 -192 -552 ) ( 1744 -192 -552 ) ( 1760 -192 -560 ) ( ( 0.015625 0 15.75 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 1752 -248 -552 ) ( 1752 -248 -560 ) ( 1752 -256 -552 ) ( ( 0.015625 0 249.5 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 1736 -256 -560 ) ( 1752 -256 -560 ) ( 1736 -248 -560 ) ( ( 0 -0.015625 249.5 ) ( 0.015625 0 15.75 ) ) common/nodrawnonsolid 134217728 0 0
-( 1736 -256 -560 ) ( 1736 -256 -552 ) ( 1752 -256 -560 ) ( ( 0.015625 0 240.25 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 1744 -256 -560 ) ( 1744 -248 -560 ) ( 1744 -256 -552 ) ( ( 0.0078125 0 5 ) ( 0 0.0024038376 63.2884597778 ) ) ct_opium/opium_teleporter_beam 134217728 0 0
+( 1760 -248 -456 ) ( 1760 -256 -456 ) ( 1744 -248 -456 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1760 -192 -552 ) ( 1744 -192 -552 ) ( 1760 -192 -560 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1752 -248 -552 ) ( 1752 -248 -560 ) ( 1752 -256 -552 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1736 -256 -560 ) ( 1752 -256 -560 ) ( 1736 -248 -560 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1736 -256 -560 ) ( 1736 -256 -552 ) ( 1752 -256 -560 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1744 -256 -560 ) ( 1744 -248 -560 ) ( 1744 -256 -552 ) ( ( 0.125 0 -0 ) ( -0 0.015625 0 ) ) effects_beam/beam-blue 134217728 0 0
 }
 }
 {
@@ -1335,12 +1338,12 @@ brushDef
 {
 brushDef
 {
-( -360 136 448 ) ( -360 -32 448 ) ( -520 136 448 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
-( -8 1208 448 ) ( -168 1208 448 ) ( -8 1208 384 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
-( 1912 136 456 ) ( 1912 136 392 ) ( 1912 -32 456 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
-( -64 -32 384 ) ( 96 -32 384 ) ( -64 136 384 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
-( -312 -2016 384 ) ( -312 -2016 448 ) ( -152 -2016 384 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
-( -520 -32 384 ) ( -520 136 384 ) ( -520 -32 448 ) ( ( 0.0052083335 0 -0 ) ( -0 0.015625 0 ) ) ct_opium/opium_heaven 0 0 0
+( -360 136 448 ) ( -360 -32 448 ) ( -520 136 448 ) ( ( 0.0013020834 0 -0 ) ( -0 0.00390625 0 ) ) skies/calm_sea 0 0 0
+( -8 1208 448 ) ( -168 1208 448 ) ( -8 1208 384 ) ( ( 0.0013020834 0 -0 ) ( -0 0.00390625 0 ) ) skies/calm_sea 0 0 0
+( 1912 136 456 ) ( 1912 136 392 ) ( 1912 -32 456 ) ( ( 0.0013020834 0 -0 ) ( -0 0.00390625 0 ) ) skies/calm_sea 0 0 0
+( -64 -32 384 ) ( 96 -32 384 ) ( -64 136 384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) skies/calm_sea 0 0 0
+( -312 -2016 384 ) ( -312 -2016 448 ) ( -152 -2016 384 ) ( ( 0.0013020834 0 -0 ) ( -0 0.00390625 0 ) ) skies/calm_sea 0 0 0
+( -520 -32 384 ) ( -520 136 384 ) ( -520 -32 448 ) ( ( 0.0013020834 0 -0 ) ( -0 0.00390625 0 ) ) skies/calm_sea 0 0 0
 }
 }
 {
@@ -5755,7 +5758,7 @@ brushDef
 ( 584 -1752 -392 ) ( 584 -1752 -400 ) ( 576 -1752 -392 ) ( ( 0.015625 0 249.5 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 134217728 0 0
 ( 576 -1736 -400 ) ( 576 -1752 -400 ) ( 584 -1736 -400 ) ( ( 0 -0.015625 249.5 ) ( 0.015625 0 15.75 ) ) common/nodrawnonsolid 134217728 0 0
 ( 576 -1736 -400 ) ( 576 -1736 -392 ) ( 576 -1752 -400 ) ( ( 0.015625 0 240.25 ) ( 0 0.015625 0.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 576 -1744 -400 ) ( 584 -1744 -400 ) ( 576 -1744 -392 ) ( ( 0.0078125 0 5 ) ( 0 0.0024038376 63.2884597778 ) ) ct_opium/opium_teleporter_beam 134217728 0 0
+( 576 -1744 -400 ) ( 584 -1744 -400 ) ( 576 -1744 -392 ) ( ( 0.015625 0 10 ) ( -0 0.009615385 509.1538391113 ) ) effects_warpzone/blueedge 134217728 0 0
 }
 }
 {
@@ -16564,12 +16567,12 @@ brushDef
 {
 brushDef
 {
-( 915.9891052246 -36 63.4272003174 ) ( 919.9481811523 -36 62.856552124 ) ( 915.9891052246 -48 63.4272003174 ) ( ( 0 -0.015625 19.5245494843 ) ( 0.015625 0 10.375 ) ) common/nodrawnonsolid 134217728 0 0
-( 918.8068847656 -36 54.9383850098 ) ( 918.8068847656 -48 54.9383850098 ) ( 905.1112823486 -36 -40.0796813965 ) ( ( 0.015625 0 245.625 ) ( 0 0.015625 7.022734642 ) ) common/nodrawnonsolid 134217728 0 0
-( 914.8477935791 -32 55.5090332031 ) ( 901.1522064209 -32 -39.5090179443 ) ( 918.8068847656 -32 54.9383850098 ) ( ( 0.0154651785 -0.002229101 19.5245494843 ) ( 0.002229101 0.0154651785 7.022734642 ) ) common/nodrawnonsolid 134217728 0 0
-( 903.9699859619 -48 -47.9978485107 ) ( 903.9699859619 -36 -47.9978485107 ) ( 900.0108947754 -48 -47.4272003174 ) ( ( 0 -0.015625 19.524553299 ) ( 0.015625 0 245.625 ) ) common/nodrawnonsolid 134217728 0 0
-( 906.10105896 -52 -40.2223358154 ) ( 919.796661377 -52 54.795715332 ) ( 906.10105896 -40 -40.2223358154 ) ( ( 0.0078125 0 5.1875 ) ( 0 0.0078125 3.5113828182 ) ) ct_fuse/fuse_scanlines 134217728 0 0
-( 906.2525939941 -272 -32.1614990234 ) ( 902.2935028076 -272 -31.5908508301 ) ( 919.9481811523 -272 62.856552124 ) ( ( 0.0154651785 0.002229101 236.4754486084 ) ( -0.002229101 0.0154651785 7.022734642 ) ) common/nodrawnonsolid 134217728 0 0
+( 915.9891052246 -36 63.4272003174 ) ( 919.9481811523 -36 62.856552124 ) ( 915.9891052246 -48 63.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 918.8068847656 -36 54.9383850098 ) ( 918.8068847656 -48 54.9383850098 ) ( 905.1112823486 -36 -40.0796813965 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 914.8477935791 -32 55.5090332031 ) ( 901.1522064209 -32 -39.5090179443 ) ( 918.8068847656 -32 54.9383850098 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 903.9699859619 -48 -47.9978485107 ) ( 903.9699859619 -36 -47.9978485107 ) ( 900.0108947754 -48 -47.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 906.10105896 -52 -40.2223358154 ) ( 919.796661377 -52 54.795715332 ) ( 906.10105896 -40 -40.2223358154 ) ( ( 0.0041666669 0 1.1333334446 ) ( 0 0.0089285718 1.727283597 ) ) logos/logo02_black 134217728 0 0
+( 906.2525939941 -272 -32.1614990234 ) ( 902.2935028076 -272 -31.5908508301 ) ( 919.9481811523 -272 62.856552124 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
@@ -16587,12 +16590,12 @@ exx/trim-vert01
 {
 brushDef
 {
-( 915.9891052246 -36 63.4272003174 ) ( 919.9481811523 -36 62.856552124 ) ( 915.9891052246 -48 63.4272003174 ) ( ( 0 -0.015625 19.5245494843 ) ( 0.015625 0 10.375 ) ) common/caulk 134217728 0 0
-( 914.8477935791 -36 55.5090332031 ) ( 914.8477935791 -48 55.5090332031 ) ( 901.1522064209 -36 -39.5090179443 ) ( ( 0.015625 0 245.625 ) ( 0 0.015625 7.0227332115 ) ) common/caulk 134217728 0 0
-( 914.8477935791 -32 55.5090332031 ) ( 901.1522064209 -32 -39.5090179443 ) ( 918.8068847656 -32 54.9383850098 ) ( ( 0.0154651785 -0.002229101 19.5245494843 ) ( 0.002229101 0.0154651785 7.022734642 ) ) common/caulk 134217728 0 0
-( 903.9699859619 -48 -47.9978485107 ) ( 903.9699859619 -36 -47.9978485107 ) ( 900.0108947754 -48 -47.4272003174 ) ( ( 0 -0.015625 19.524553299 ) ( 0.015625 0 245.625 ) ) common/caulk 134217728 0 0
-( 905.1112823486 -52 -40.0796813965 ) ( 918.8068847656 -52 54.9383850098 ) ( 905.1112823486 -40 -40.0796813965 ) ( ( 0.0041666669 0 1.1331784725 ) ( 0 0.0089285728 1.7272588015 ) ) ct_opium/ad_msg 134217728 0 0
-( 906.2525939941 -272 -32.1614990234 ) ( 902.2935028076 -272 -31.5908508301 ) ( 919.9481811523 -272 62.856552124 ) ( ( 0.0154651785 0.002229101 236.4754486084 ) ( -0.002229101 0.0154651785 7.022734642 ) ) common/caulk 134217728 0 0
+( 915.9891052246 -36 63.4272003174 ) ( 919.9481811523 -36 62.856552124 ) ( 915.9891052246 -48 63.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 914.8477935791 -36 55.5090332031 ) ( 914.8477935791 -48 55.5090332031 ) ( 901.1522064209 -36 -39.5090179443 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 914.8477935791 -32 55.5090332031 ) ( 901.1522064209 -32 -39.5090179443 ) ( 918.8068847656 -32 54.9383850098 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 903.9699859619 -48 -47.9978485107 ) ( 903.9699859619 -36 -47.9978485107 ) ( 900.0108947754 -48 -47.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 905.1112823486 -52 -40.0796813965 ) ( 918.8068847656 -52 54.9383850098 ) ( 905.1112823486 -40 -40.0796813965 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01a 134217728 0 0
+( 906.2525939941 -272 -32.1614990234 ) ( 902.2935028076 -272 -31.5908508301 ) ( 919.9481811523 -272 62.856552124 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 }
@@ -16903,12 +16906,12 @@ brushDef
 {
 brushDef
 {
-( 148 -915.9891052246 -208.5727996826 ) ( 148 -919.9481811523 -209.143447876 ) ( 136 -915.9891052246 -208.5727996826 ) ( ( 0 -0.015625 20.130865097 ) ( 0.015625 0 7.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 148 -918.8068847656 -217.0616149902 ) ( 136 -918.8068847656 -217.0616149902 ) ( 148 -905.1112823486 -312.0796813965 ) ( ( 0.015625 0 248.5 ) ( 0 0.015625 2.8162164688 ) ) common/nodrawnonsolid 134217728 0 0
-( 152 -914.8477935791 -216.4909667969 ) ( 152 -901.1522064209 -311.5090179443 ) ( 152 -918.8068847656 -217.0616149902 ) ( ( 0.0154651785 -0.002229101 20.130865097 ) ( 0.002229101 0.0154651785 2.8162167072 ) ) common/nodrawnonsolid 134217728 0 0
-( 136 -903.9699859619 -319.9978485107 ) ( 148 -903.9699859619 -319.9978485107 ) ( 136 -900.0108947754 -319.4272003174 ) ( ( 0 -0.015625 20.130865097 ) ( 0.015625 0 248.5 ) ) common/nodrawnonsolid 134217728 0 0
-( 132 -906.10105896 -312.2223358154 ) ( 132 -919.796661377 -217.204284668 ) ( 144 -906.10105896 -312.2223358154 ) ( ( 0.0078125 0 3.75 ) ( 0 0.0078125 1.4081082344 ) ) ct_fuse/fuse_scanlines 134217728 0 0
-( -88 -906.2525939941 -304.1614990234 ) ( -88 -902.2935028076 -303.5908508301 ) ( -88 -919.9481811523 -209.143447876 ) ( ( 0.0154651785 0.002229101 235.869140625 ) ( -0.002229101 0.0154651785 2.8162167072 ) ) common/nodrawnonsolid 134217728 0 0
+( 148 -915.9891052246 -208.5727996826 ) ( 148 -919.9481811523 -209.143447876 ) ( 136 -915.9891052246 -208.5727996826 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 148 -918.8068847656 -217.0616149902 ) ( 136 -918.8068847656 -217.0616149902 ) ( 148 -905.1112823486 -312.0796813965 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 152 -914.8477935791 -216.4909667969 ) ( 152 -901.1522064209 -311.5090179443 ) ( 152 -918.8068847656 -217.0616149902 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 136 -903.9699859619 -319.9978485107 ) ( 148 -903.9699859619 -319.9978485107 ) ( 136 -900.0108947754 -319.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 132 -906.10105896 -312.2223358154 ) ( 132 -919.796661377 -217.204284668 ) ( 144 -906.10105896 -312.2223358154 ) ( ( 0.0041666669 0 0.3666666746 ) ( -0 0.0089285718 511.3235473633 ) ) logos/logo02_white 134217728 0 0
+( -88 -906.2525939941 -304.1614990234 ) ( -88 -902.2935028076 -303.5908508301 ) ( -88 -919.9481811523 -209.143447876 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
@@ -16926,12 +16929,12 @@ exx/trim-vert01
 {
 brushDef
 {
-( 148 -915.9891052246 -208.5727996826 ) ( 148 -919.9481811523 -209.143447876 ) ( 136 -915.9891052246 -208.5727996826 ) ( ( 0 -0.015625 20.130865097 ) ( 0.015625 0 7.5 ) ) common/caulk 134217728 0 0
-( 148 -914.8477935791 -216.4909667969 ) ( 136 -914.8477935791 -216.4909667969 ) ( 148 -901.1522064209 -311.5090179443 ) ( ( 0.015625 0 248.5 ) ( 0 0.015625 2.8162164688 ) ) common/caulk 134217728 0 0
-( 152 -914.8477935791 -216.4909667969 ) ( 152 -901.1522064209 -311.5090179443 ) ( 152 -918.8068847656 -217.0616149902 ) ( ( 0.0154651785 -0.002229101 20.130865097 ) ( 0.002229101 0.0154651785 2.8162167072 ) ) common/caulk 134217728 0 0
-( 136 -903.9699859619 -319.9978485107 ) ( 148 -903.9699859619 -319.9978485107 ) ( 136 -900.0108947754 -319.4272003174 ) ( ( 0 -0.015625 20.130865097 ) ( 0.015625 0 248.5 ) ) common/caulk 134217728 0 0
-( 132 -905.1112823486 -312.0796813965 ) ( 132 -918.8068847656 -217.0616149902 ) ( 144 -905.1112823486 -312.0796813965 ) ( ( 0.0041666669 0 0.3665934205 ) ( 0 0.0089285728 511.3235473633 ) ) ct_opium/ad_esrepublic 134217728 0 0
-( -88 -906.2525939941 -304.1614990234 ) ( -88 -902.2935028076 -303.5908508301 ) ( -88 -919.9481811523 -209.143447876 ) ( ( 0.0154651785 0.002229101 235.869140625 ) ( -0.002229101 0.0154651785 2.8162167072 ) ) common/caulk 134217728 0 0
+( 148 -915.9891052246 -208.5727996826 ) ( 148 -919.9481811523 -209.143447876 ) ( 136 -915.9891052246 -208.5727996826 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 148 -914.8477935791 -216.4909667969 ) ( 136 -914.8477935791 -216.4909667969 ) ( 148 -901.1522064209 -311.5090179443 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 152 -914.8477935791 -216.4909667969 ) ( 152 -901.1522064209 -311.5090179443 ) ( 152 -918.8068847656 -217.0616149902 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 136 -903.9699859619 -319.9978485107 ) ( 148 -903.9699859619 -319.9978485107 ) ( 136 -900.0108947754 -319.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 132 -905.1112823486 -312.0796813965 ) ( 132 -918.8068847656 -217.0616149902 ) ( 144 -905.1112823486 -312.0796813965 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 134217728 0 0
+( -88 -906.2525939941 -304.1614990234 ) ( -88 -902.2935028076 -303.5908508301 ) ( -88 -919.9481811523 -209.143447876 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 }
@@ -17056,23 +17059,23 @@ brushDef
 {
 brushDef
 {
-( 1164 -1452.0108947754 167.4272003174 ) ( 1164 -1448.0518188477 166.856552124 ) ( 1176 -1452.0108947754 167.4272003174 ) ( ( 0 -0.015625 238.6711883545 ) ( 0.015625 0 28 ) ) common/nodrawnonsolid 134217728 0 0
-( 1164 -1449.1931152344 158.9383850098 ) ( 1176 -1449.1931152344 158.9383850098 ) ( 1164 -1462.8887176514 63.9203186035 ) ( ( 0.015625 0 228 ) ( 0 0.015625 3.3525896072 ) ) common/nodrawnonsolid 134217728 0 0
-( 1160 -1453.1522064209 159.5090332031 ) ( 1160 -1466.8477935791 64.4909820557 ) ( 1160 -1449.1931152344 158.9383850098 ) ( ( 0.0154651785 -0.002229101 238.6711883545 ) ( 0.002229101 0.0154651785 3.3525896072 ) ) common/nodrawnonsolid 134217728 0 0
-( 1176 -1464.0300140381 56.0021514893 ) ( 1164 -1464.0300140381 56.0021514893 ) ( 1176 -1467.9891052246 56.5727996826 ) ( ( 0 -0.015625 238.6711883545 ) ( 0.015625 0 228 ) ) common/nodrawnonsolid 134217728 0 0
-( 1180 -1461.89894104 63.7776641846 ) ( 1180 -1448.203338623 158.795715332 ) ( 1168 -1461.89894104 63.7776641846 ) ( ( 0.0078125 0 14 ) ( 0 0.0078125 1.6762948036 ) ) ct_fuse/fuse_scanlines 134217728 0 0
-( 1400 -1461.7474060059 71.8385009766 ) ( 1400 -1465.7064971924 72.4091491699 ) ( 1400 -1448.0518188477 166.856552124 ) ( ( 0.0154651785 0.002229101 17.3288192749 ) ( -0.002229101 0.0154651785 3.3525896072 ) ) common/nodrawnonsolid 134217728 0 0
+( 1164 -1452.0108947754 167.4272003174 ) ( 1164 -1448.0518188477 166.856552124 ) ( 1176 -1452.0108947754 167.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1164 -1449.1931152344 158.9383850098 ) ( 1176 -1449.1931152344 158.9383850098 ) ( 1164 -1462.8887176514 63.9203186035 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1160 -1453.1522064209 159.5090332031 ) ( 1160 -1466.8477935791 64.4909820557 ) ( 1160 -1449.1931152344 158.9383850098 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1176 -1464.0300140381 56.0021514893 ) ( 1164 -1464.0300140381 56.0021514893 ) ( 1176 -1467.9891052246 56.5727996826 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1180 -1461.89894104 63.7776641846 ) ( 1180 -1448.203338623 158.795715332 ) ( 1168 -1461.89894104 63.7776641846 ) ( ( 0.0041666669 0 5.8333334923 ) ( -0 0.0089285709 511.630065918 ) ) logos/logo02_cyan_glowy 134217728 0 0
+( 1400 -1461.7474060059 71.8385009766 ) ( 1400 -1465.7064971924 72.4091491699 ) ( 1400 -1448.0518188477 166.856552124 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 1164 -1452.0108947754 167.4272003174 ) ( 1164 -1448.0518188477 166.856552124 ) ( 1176 -1452.0108947754 167.4272003174 ) ( ( 0 -0.015625 238.6711883545 ) ( 0.015625 0 28 ) ) common/caulk 134217728 0 0
-( 1164 -1453.1522064209 159.5090332031 ) ( 1176 -1453.1522064209 159.5090332031 ) ( 1164 -1466.8477935791 64.4909820557 ) ( ( 0.015625 0 228 ) ( 0 0.015625 3.3525898457 ) ) common/caulk 134217728 0 0
-( 1160 -1453.1522064209 159.5090332031 ) ( 1160 -1466.8477935791 64.4909820557 ) ( 1160 -1449.1931152344 158.9383850098 ) ( ( 0.0154651785 -0.002229101 238.6711883545 ) ( 0.002229101 0.0154651785 3.3525896072 ) ) common/caulk 134217728 0 0
-( 1176 -1464.0300140381 56.0021514893 ) ( 1164 -1464.0300140381 56.0021514893 ) ( 1176 -1467.9891052246 56.5727996826 ) ( ( 0 -0.015625 238.6711883545 ) ( 0.015625 0 228 ) ) common/caulk 134217728 0 0
-( 1180 -1462.8887176514 63.9203186035 ) ( 1180 -1449.1931152344 158.9383850098 ) ( 1168 -1462.8887176514 63.9203186035 ) ( ( 0.0041666669 0 5.8332762718 ) ( 0 0.0089285728 511.630065918 ) ) ct_opium/ad_sapphire 134217728 0 0
-( 1400 -1461.7474060059 71.8385009766 ) ( 1400 -1465.7064971924 72.4091491699 ) ( 1400 -1448.0518188477 166.856552124 ) ( ( 0.0154651785 0.002229101 17.3288192749 ) ( -0.002229101 0.0154651785 3.3525896072 ) ) common/caulk 134217728 0 0
+( 1164 -1452.0108947754 167.4272003174 ) ( 1164 -1448.0518188477 166.856552124 ) ( 1176 -1452.0108947754 167.4272003174 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1164 -1453.1522064209 159.5090332031 ) ( 1176 -1453.1522064209 159.5090332031 ) ( 1164 -1466.8477935791 64.4909820557 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1160 -1453.1522064209 159.5090332031 ) ( 1160 -1466.8477935791 64.4909820557 ) ( 1160 -1449.1931152344 158.9383850098 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1176 -1464.0300140381 56.0021514893 ) ( 1164 -1464.0300140381 56.0021514893 ) ( 1176 -1467.9891052246 56.5727996826 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 1180 -1462.8887176514 63.9203186035 ) ( 1180 -1449.1931152344 158.9383850098 ) ( 1168 -1462.8887176514 63.9203186035 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 134217728 0 0
+( 1400 -1461.7474060059 71.8385009766 ) ( 1400 -1465.7064971924 72.4091491699 ) ( 1400 -1448.0518188477 166.856552124 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {

diff --git a/maps/opium.map.options b/maps/opium.map.options
index 588c155a80121d7ca3d0c4554586aec228f6bc7a..381c4043dc5c34ffee5761bdb948111cbaf4df10 100644 (file)
--- a/maps/opium.map.options
+++ b/maps/opium.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 0a
\ No newline at end of file
+Version: 0b
\ No newline at end of file

diff --git a/maps/opium.mapinfo b/maps/opium.mapinfo
index f92393cbf3ad5062671731dde731fd833a2baab1..baec68e924d33d85a87d7b6ade16ee0d4a963986 100644 (file)
--- a/maps/opium.mapinfo
+++ b/maps/opium.mapinfo
@@ -1,18 +1,12 @@
-title OPIUM
-description 1on1 and 2on2 Level
-author Ferdinand 'cityy' List
+title Opium
+description Medium sized level with plenty of vertical action
+author cityy
 cdtrack 6
 has weapons
-// uncomment this if you added turrets: has turrets
-// uncomment this if you added vehicles: has vehicles
-gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0
-gametype tdm // defaults: timelimit=20 pointlimit=30 leadlimit=0
-gametype lms // defaults: timelimit=20 lives=9 leadlimit=0
-gametype arena // defaults: timelimit=20 pointlimit=10 leadlimit=0
-gametype rune // defaults: timelimit=20 pointlimit=200 leadlimit=0
-gametype ka // defaults: timelimit=20 pointlimit=30
-// optional: fog density red green blue alpha mindist maxdist
-// optional: settemp_for_type (all|gametypename) cvarname value
-// optional: clientsettemp_for_type (all|gametypename) cvarname value
-// optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden
+gametype dm
+gametype tdm
+gametype lms
+gametype ca
+gametype ka
+gametype kh
+gametype ft
\ No newline at end of file

diff --git a/scripts/map_opium.shader b/scripts/map_opium.shader
index be591781fe3ba45c4dda15cc41df818f01b67189..10f08510d4767fb9738440837d0aa761124370ce 100644 (file)
--- a/scripts/map_opium.shader
+++ b/scripts/map_opium.shader
@@ -1,17 +1,3 @@
-//TELEPORTER 
-
-textures/map_opium/opium_teleporter_beam
-{
-       surfaceparm nonsolid
-       surfaceparm nomarks
-       cull none
-       q3map_surfacelight 500
-       {
-               map textures/opium/opium_teleporter_beam.tga
-               blendfunc GL_SRC_ALPHA GL_ONE
-       }
-}
-
 //PIPE LIQUID
 
 textures/map_opium/lava0_blue_flow_pipe
@@ -84,21 +70,4 @@ textures/map_opium/floor-simplines
                tcGen lightmap
                blendfunc filter
        }
-}
-
-//AD BOARD SCANLINES
-
-textures/map_opium/opium_scanlines
-{
-       qer_editorimage textures/opium/opium_scanlines.tga
-       surfaceparm noimpact
-       surfaceparm trans
-       cull disable
-       surfaceparm nonsolid
-       qer_trans 0.25
-       {
-               map textures/opium/opium_scanlines.tga
-               blendfunc GL_SRC_ALPHA GL_ONE
-               tcMod scroll 0 -0.75
-       }
 }
\ No newline at end of file

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 489cb362481c32861a9e13b074f0bd2be33d70e3..16c0f8bfe8962b13d40ad66526be32b69d35e5c4 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -59,7 +59,6 @@ skies_exosystem
 skies_extragalactic
 skies_heaven
 skies_polluted_earth
-skies_opium_heaven
 stein1x
 techpanelx
 terrain01x

diff --git a/scripts/skies_opium_heaven.shader b/scripts/skies_opium_heaven.shader
deleted file mode 100644 (file)
index 08c1804..0000000
--- a/scripts/skies_opium_heaven.shader
+++ /dev/null
@@ -1,29 +0,0 @@
-textures/skies/opium_heaven
-{
-       qer_editorimage textures/skies/opium_heaven
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm sky
-       
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
-       q3map_sun .3803921568627451 .7176470588235294 .9607843137254902 250 90 10
-       q3map_skylight 200 4
-       skyparms textures/env/opium_heaven/opium_heaven - -
-}
-
-textures/map_opium/heaven
-{
-       qer_editorimage textures/skies/heaven
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nomarks
-       surfaceparm sky
-       
-       //q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>
-       q3map_sun .9607843137254902 .7176470588235294 .3803921568627451 250 270 30
-       q3map_skylight 200 4
-       skyparms env/heaven/heaven - -
-}
\ No newline at end of file

diff --git a/textures/map_opium/opium_scanlines.jpg b/textures/map_opium/opium_scanlines.jpg
deleted file mode 100644 (file)
index 0c4d7ff..0000000
Binary files a/textures/map_opium/opium_scanlines.jpg and /dev/null differ

diff --git a/textures/map_opium/opium_scanlines_alpha.jpg b/textures/map_opium/opium_scanlines_alpha.jpg
deleted file mode 100644 (file)
index 0c4d7ff..0000000
Binary files a/textures/map_opium/opium_scanlines_alpha.jpg and /dev/null differ

diff --git a/textures/map_opium/opium_teleporter_beam.jpg b/textures/map_opium/opium_teleporter_beam.jpg
deleted file mode 100644 (file)
index c707cd1..0000000
Binary files a/textures/map_opium/opium_teleporter_beam.jpg and /dev/null differ

diff --git a/textures/skies/opium_heaven.jpg b/textures/skies/opium_heaven.jpg
deleted file mode 100644 (file)
index a757660..0000000
Binary files a/textures/skies/opium_heaven.jpg and /dev/null differ