Fix stuff reported by Spike. Add visuals to warpzone. Use traack Nanite

diff --git a/maps/erbium.map b/maps/erbium.map
index 6ae174e47c946182e5a4f2259c167bb68411729c..9253225ef12f492b6bc49e436a7d3ade0b8ae1f7 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -1,7 +1,6 @@
 {
 "classname" "worldspawn"
 {
 "classname" "worldspawn"

-"author" "Justin"
-"message" "Erbium"
+"model" "models/effects_warpzone/blueedge.md3"

 {
 brushDef
 {
 {
 brushDef
 {


@@ -11768,7 +11767,7 @@ brushDef
 brushDef
 {
 ( 490 -234 524 ) ( 490 -258 524 ) ( 434 -234 524 ) ( ( 0 0.0089285718 508.125 ) ( -0.0416666679 0 118.25 ) ) exx/trim-baseboard02 0 0 0
 brushDef
 {
 ( 490 -234 524 ) ( 490 -258 524 ) ( 434 -234 524 ) ( ( 0 0.0089285718 508.125 ) ( -0.0416666679 0 118.25 ) ) exx/trim-baseboard02 0 0 0

-( 490 -234 524 ) ( 434 -234 524 ) ( 490 -234 500 ) ( ( -0.0061475411 0 1.5607999563 ) ( 0 -0.0357142873 110.2857131958 ) ) exx/trim-baseboard02 0 0 0
+( 490 -234 524 ) ( 434 -234 524 ) ( 490 -234 500 ) ( ( -0.0061475085 -0 -0.4391992092 ) ( 0 -0.0357142873 0.2857031226 ) ) exx/trim-baseboard02 0 0 0

 ( 434 -258 500 ) ( 490 -258 500 ) ( 434 -234 500 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0
 ( 434 -258 500 ) ( 434 -258 524 ) ( 490 -258 500 ) ( ( -0.0041594515 0 0.5529660583 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0
 ( 446 -258 -64 ) ( 434 -234 -64 ) ( 446 -258 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 434 -258 500 ) ( 490 -258 500 ) ( 434 -234 500 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0
 ( 434 -258 500 ) ( 434 -258 524 ) ( 490 -258 500 ) ( ( -0.0041594515 0 0.5529660583 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0
 ( 446 -258 -64 ) ( 434 -234 -64 ) ( 446 -258 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0


@@ -15586,7 +15585,7 @@ brushDef
 ( 608 -188 500 ) ( 446 -148 500 ) ( 446 -210 500 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0
 ( 442 -210 520 ) ( 512 -280 500 ) ( 442 -210 500 ) ( ( -0.0041594515 0 0.5412013531 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0
 ( 516 -280 520 ) ( 608 -188 500 ) ( 516 -280 500 ) ( ( -0.0041594515 0 0.5412013531 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0
 ( 608 -188 500 ) ( 446 -148 500 ) ( 446 -210 500 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 0 0 0
 ( 442 -210 520 ) ( 512 -280 500 ) ( 442 -210 500 ) ( ( -0.0041594515 0 0.5412013531 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0
 ( 516 -280 520 ) ( 608 -188 500 ) ( 516 -280 500 ) ( ( -0.0041594515 0 0.5412013531 ) ( 0 0.0416666679 21.8333339691 ) ) exx/trim-baseboard02 0 0 0

-( 502 -234 -64 ) ( 504 -236 -64 ) ( 502 -234 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 502 -234 -64 ) ( 504 -236 -64 ) ( 502 -234 64 ) ( ( -0.0061475085 -0 -0.4391992092 ) ( 0 -0.0357142873 0.2857031226 ) ) exx/trim-baseboard02 0 0 0

 ( 490 -258 -64 ) ( 502 -234 -64 ) ( 490 -258 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 ( 490 -258 -64 ) ( 502 -234 -64 ) ( 490 -258 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }


@@ -17573,12 +17572,12 @@ brushDef
 {
 brushDef
 {
 {
 brushDef
 {

-( -314 -830 356 ) ( -357.625 -793.625 356 ) ( -355.625 -791.625 356 ) ( ( 0.0055242716 0.0055242716 -0 ) ( -0.0055242716 0.0055242716 0.166015625 ) ) exx/base-metal01 0 0 0
-( -314 -830 336 ) ( -355.625 -791.625 336 ) ( -357.625 -793.625 336 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( -316 -832 356 ) ( -357.625 -793.625 336 ) ( -357.625 -793.625 356 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -357.625 -793.625 356 ) ( -355.625 -791.625 336 ) ( -355.625 -791.625 356 ) ( ( 0.0035714284 0 3.7457339764 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0
-( -314 -830 336 ) ( -355.625 -791.625 356 ) ( -355.625 -791.625 336 ) ( ( 0.0035714286 0 3.8012924194 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0
-( -314 -830 336 ) ( -316 -832 356 ) ( -314 -830 356 ) ( ( 0.0035714284 0 3.821495533 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0
+( -313.9708709717 -829.9886169434 356 ) ( -357.4047851563 -793.3857269287 356 ) ( -355.3943481445 -791.3962249756 356 ) ( ( 0.0054952744 0.0055531235 511.9847717285 ) ( -0.0055531235 0.0054952744 0.1328661293 ) ) exx/base-metal01 0 0 0
+( -313.9708709717 -829.9886169434 336 ) ( -355.3943481445 -791.3962249756 336 ) ( -357.4047851563 -793.3857269287 336 ) ( ( 0.015624797 -0.000081812 0.0253265351 ) ( 0.000081812 0.015624797 0.0684226379 ) ) common/caulk 0 0 0
+( -315.7295684814 -832.2320404053 356 ) ( -357.1530456543 -793.6396484375 336 ) ( -357.1530456543 -793.6396484375 356 ) ( ( 0.015625 0 255.9269561768 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -357.4047851563 -793.3857269287 356 ) ( -355.3943481445 -791.3962249756 336 ) ( -355.3943481445 -791.3962249756 356 ) ( ( 0.0035714298 0 3.7526984215 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0
+( -313.9708709717 -829.9886169434 336 ) ( -355.3943481445 -791.3962249756 356 ) ( -355.3943481445 -791.3962249756 336 ) ( ( 0.0035714307 0 3.8167169094 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0
+( -313.9708709717 -829.9886169434 336 ) ( -315.9813079834 -831.9781188965 356 ) ( -313.9708709717 -829.9886169434 356 ) ( ( 0.0035714298 0 3.8145310879 ) ( 0 0.03125 10.375 ) ) exx/trim-baseboard02 0 0 0

 }
 }
 {
 }
 }
 {


@@ -21470,12 +21469,12 @@ brushDef
 {
 brushDef
 {
 {
 brushDef
 {

-( 2068 972 488 ) ( 2068 764 696 ) ( 2068 972 696 ) ( ( 0.0625 0 7.75 ) ( 0 0.0625 13 ) ) common/trigger 0 0 0
-( 2036 776 484 ) ( 2004 776 692 ) ( 2036 776 692 ) ( ( 0.0625 0 196.75 ) ( 0 0.0625 12.75 ) ) common/trigger 0 0 0
-( 2012 768 488 ) ( 2012 976 696 ) ( 2012 768 696 ) ( ( 0.010416667 0 10.0833339691 ) ( 0 0.010416667 7.1666669846 ) ) common/warpzone 0 0 0
-( 2004 968 488 ) ( 2036 968 696 ) ( 2004 968 696 ) ( ( 0.0625 0 59.25 ) ( 0 0.0625 13 ) ) common/trigger 0 0 0
-( 2004 976 688 ) ( 2036 768 688 ) ( 2004 768 688 ) ( ( 0.0625 0 7.5 ) ( 0 0.0625 196.75 ) ) common/trigger 0 0 0
-( 2036 976 496 ) ( 2004 768 496 ) ( 2036 768 496 ) ( ( 0.0625 0 7.5 ) ( 0 0.0625 59.25 ) ) common/trigger 0 0 0
+( 2068 972 488 ) ( 2068 764 696 ) ( 2068 972 696 ) ( ( 0.0625 0 7.75 ) ( 0 0.0625 12.99609375 ) ) common/trigger 0 0 0
+( 2036 776 484 ) ( 2004 776 692 ) ( 2036 776 692 ) ( ( 0.0625 0 196.75 ) ( 0 0.0625 12.74609375 ) ) common/trigger 0 0 0
+( 2012 768 488 ) ( 2012 976 696 ) ( 2012 768 696 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/wavy 0 0 0
+( 2004 968 488 ) ( 2036 968 696 ) ( 2004 968 696 ) ( ( 0.0625 0 59.25 ) ( 0 0.0625 12.99609375 ) ) common/trigger 0 0 0
+( 2004 976 688 ) ( 2036 768 688 ) ( 2004 768 688 ) ( ( 0.0625 0 7.5 ) ( 0 0.0625 196.74609375 ) ) common/trigger 0 0 0
+( 2036 976 496 ) ( 2004 768 496 ) ( 2036 768 496 ) ( ( 0.0625 0 7.5 ) ( 0 0.0625 59.24609375 ) ) common/trigger 0 0 0

 }
 }
 }
 }
 }
 }


@@ -21487,7 +21486,7 @@ brushDef
 {
 ( 1756 -192 196 ) ( 1964 -192 404 ) ( 1756 -192 404 ) ( ( 0.0625 0 118.25 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0
 ( 1952 -192 196 ) ( 1952 -256 404 ) ( 1952 -192 404 ) ( ( 0.0625 0 60 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0
 {
 ( 1756 -192 196 ) ( 1964 -192 404 ) ( 1756 -192 404 ) ( ( 0.0625 0 118.25 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0
 ( 1952 -192 196 ) ( 1952 -256 404 ) ( 1952 -192 404 ) ( ( 0.0625 0 60 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0

-( 1964 -248 196 ) ( 1756 -248 404 ) ( 1964 -248 404 ) ( ( 0.010416667 0 237.6666564941 ) ( 0 0.010416667 4.1666669846 ) ) common/warpzone 0 0 0
+( 1964 -248 196 ) ( 1756 -248 404 ) ( 1964 -248 404 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) effects_warpzone/wavy 0 0 0

 ( 1760 -256 196 ) ( 1760 -192 404 ) ( 1760 -256 404 ) ( ( 0.0625 0 196 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0
 ( 1756 -256 400 ) ( 1964 -192 400 ) ( 1964 -256 400 ) ( ( 0 0.0625 137.75 ) ( -0.0625 0 196 ) ) common/trigger 0 0 0
 ( 1892 -960 208 ) ( 1892 -704 208 ) ( 1636 -960 208 ) ( ( 0 -0.0625 137.75 ) ( 0.0625 0 60 ) ) common/trigger 0 0 0
 ( 1760 -256 196 ) ( 1760 -192 404 ) ( 1760 -256 404 ) ( ( 0.0625 0 196 ) ( 0 0.0625 24.75 ) ) common/trigger 0 0 0
 ( 1756 -256 400 ) ( 1964 -192 400 ) ( 1964 -256 400 ) ( ( 0 0.0625 137.75 ) ( -0.0625 0 196 ) ) common/trigger 0 0 0
 ( 1892 -960 208 ) ( 1892 -704 208 ) ( 1636 -960 208 ) ( ( 0 -0.0625 137.75 ) ( 0.0625 0 60 ) ) common/trigger 0 0 0

diff --git a/maps/erbium.map.options b/maps/erbium.map.options
index 8d71feab8caec7366db3c5ef73181a36834eaec8..25a7e26124d48326a0db4076ec504953903975e8 100644 (file)
--- a/maps/erbium.map.options
+++ b/maps/erbium.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +

-Version: 2b
\ No newline at end of file
+Version: 3
\ No newline at end of file

diff --git a/maps/erbium.mapinfo b/maps/erbium.mapinfo
index 170cdbb645325552034dbea3a42d8d834e681fa2..85e73c3d237af59d1c9c5cf551ec9f8889e537e7 100644 (file)
--- a/maps/erbium.mapinfo
+++ b/maps/erbium.mapinfo
@@ -1,7 +1,7 @@
 title Erbium
 title Erbium

-description Industrial, nature... DUEL!
+description Industrial, nature... Duel!

 author Justin
 author Justin

-cdtrack 2
+cdtrack 21

 has weapons
 gametype dm
 gametype lms
 has weapons
 gametype dm
 gametype lms