r2601 - in branches/nexuiz-2.0/data: maps menu/data qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri May 18 17:36:18 EDT 2007
Author: div0
Date: 2007-05-18 17:36:17 -0400 (Fri, 18 May 2007)
New Revision: 2601
Modified:
branches/nexuiz-2.0/data/maps/silvercity.waypoints
branches/nexuiz-2.0/data/menu/data/input.menu
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qh
Log:
silvercity waypoints on map edges;
sensitivity can go up to 30 i menu;
fix keyhunt teamkill and drop exploit;
keyhunt capture effect
Modified: branches/nexuiz-2.0/data/maps/silvercity.waypoints
===================================================================
--- branches/nexuiz-2.0/data/maps/silvercity.waypoints 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/maps/silvercity.waypoints 2007-05-18 21:36:17 UTC (rev 2601)
@@ -1,429 +1,513 @@
-'910.1 -1449.0 -296.0'
-'910.1 -1449.0 -296.0'
+'-1965.4 -2079.1 336.1'
+'-1965.4 -2079.1 336.1'
0
-'325.9 -808.0 -296.0'
-'325.9 -808.0 -296.0'
+'-1454.7 -2081.6 336.1'
+'-1454.7 -2081.6 336.1'
0
-'-72.3 120.3 -296.0'
-'-72.3 120.3 -296.0'
+'-688.0 -2082.7 336.1'
+'-688.0 -2082.7 336.1'
0
-'-434.0 -205.9 -296.0'
-'-434.0 -205.9 -296.0'
+'117.5 -2090.1 336.1'
+'117.5 -2090.1 336.1'
0
-'-813.7 -299.9 -296.0'
-'-813.7 -299.9 -296.0'
+'797.2 -2080.6 336.1'
+'797.2 -2080.6 336.1'
0
-'-805.0 112.5 -296.0'
-'-805.0 112.5 -296.0'
+'1502.5 -2091.0 336.1'
+'1502.5 -2091.0 336.1'
0
-'-1349.5 -73.9 -296.0'
-'-1349.5 -73.9 -296.0'
+'2012.9 -2096.0 336.1'
+'2012.9 -2096.0 336.1'
0
-'-1105.6 1441.3 -296.0'
-'-1105.6 1441.3 -296.0'
+'2081.7 -1972.5 336.1'
+'2081.7 -1972.5 336.1'
0
-'-147.4 1606.2 -296.0'
-'-147.4 1606.2 -296.0'
+'2096.0 983.2 336.1'
+'2096.0 983.2 336.1'
0
-'1293.3 1313.9 -296.0'
-'1293.3 1313.9 -296.0'
+'2091.2 -943.8 336.1'
+'2091.2 -943.8 336.1'
0
-'1549.2 685.4 -296.0'
-'1549.2 685.4 -296.0'
+'2088.9 23.2 336.1'
+'2088.9 23.2 336.1'
0
-'1648.9 -314.9 -296.0'
-'1648.9 -314.9 -296.0'
+'2096.0 -1489.4 336.1'
+'2096.0 -1489.4 336.1'
0
-'-1684.5 -827.1 216.0'
-'-1684.5 -827.1 216.0'
+'2083.2 1499.2 336.1'
+'2083.2 1499.2 336.1'
0
-'-1390.3 -464.3 216.0'
-'-1390.3 -464.3 216.0'
+'2082.5 1947.1 336.1'
+'2082.5 1947.1 336.1'
0
-'-1674.2 174.7 216.0'
-'-1674.2 174.7 216.0'
+'1955.1 2096.0 336.1'
+'1955.1 2096.0 336.1'
0
-'-1329.9 516.0 216.0'
-'-1329.9 516.0 216.0'
+'936.2 2096.0 336.1'
+'936.2 2096.0 336.1'
0
-'-1556.9 1196.3 216.0'
-'-1556.9 1196.3 216.0'
+'1527.2 2096.0 336.1'
+'1527.2 2096.0 336.1'
0
-'1241.7 1735.6 24.0'
-'1241.7 1735.6 24.0'
+' 44.7 2096.0 336.1'
+' 44.7 2096.0 336.1'
0
-'528.9 1812.4 24.0'
-'528.9 1812.4 24.0'
+'-978.9 2096.0 336.1'
+'-978.9 2096.0 336.1'
0
-'1766.6 -1515.6 -296.0'
-'1766.6 -1515.6 -296.0'
+'-2096.0 -1957.5 344.1'
+'-2096.0 -1957.5 344.1'
0
-'1486.0 -1854.4 -296.0'
-'1486.0 -1854.4 -296.0'
+'-2083.8 -1488.5 344.1'
+'-2083.8 -1488.5 344.1'
0
-'954.7 -1905.8 -296.0'
-'954.7 -1905.8 -296.0'
+'-1475.3 2093.0 336.1'
+'-1475.3 2093.0 336.1'
0
-'-665.2 -1701.2 -296.0'
-'-665.2 -1701.2 -296.0'
+'-2096.0 691.4 344.1'
+'-2096.0 691.4 344.1'
0
-'-204.3 -1841.5 -296.0'
-'-204.3 -1841.5 -296.0'
+'-1964.9 2089.5 336.1'
+'-1964.9 2089.5 336.1'
0
-'168.6 -1937.3 -296.0'
-'168.6 -1937.3 -296.0'
+'-2096.0 -305.2 344.1'
+'-2096.0 -305.2 344.1'
0
-'-740.3 671.3 16.4'
-'-740.3 671.3 16.4'
+'-2089.5 1986.3 344.1'
+'-2089.5 1986.3 344.1'
0
-'-745.4 875.6 -85.8'
-'-745.4 875.6 -85.8'
+'-2096.0 -1026.3 344.1'
+'-2096.0 -1026.3 344.1'
0
-'-469.4 1346.5 -296.0'
-'-469.4 1346.5 -296.0'
+'-2096.0 1463.5 344.1'
+'-2096.0 1463.5 344.1'
0
-'-1883.2 974.4 -296.0'
-'-1883.2 974.4 -296.0'
+'1450.7 -860.4 216.1'
+'1450.7 -860.4 216.1'
0
-'-564.1 1814.7 -296.0'
-'-564.1 1814.7 -296.0'
+'1292.9 423.6 216.1'
+'1292.9 423.6 216.1'
0
-'-1114.7 1814.9 -296.0'
-'-1114.7 1814.9 -296.0'
+'1319.5 154.0 216.1'
+'1319.5 154.0 216.1'
0
-'-1693.6 34.8 -296.0'
-'-1693.6 34.8 -296.0'
+'861.1 552.0 216.1'
+'861.1 552.0 216.1'
0
-'-1186.0 349.0 -296.0'
-'-1186.0 349.0 -296.0'
+'1340.3 -284.0 216.1'
+'1340.3 -284.0 216.1'
0
-'-1170.0 914.3 -296.0'
-'-1170.0 914.3 -296.0'
+'931.1 128.9 216.1'
+'931.1 128.9 216.1'
0
-'-1497.9 629.9 -296.0'
-'-1497.9 629.9 -296.0'
+'877.3 -249.1 216.1'
+'877.3 -249.1 216.1'
0
-'-1454.3 1320.3 -296.0'
-'-1454.3 1320.3 -296.0'
+'998.2 -542.2 216.1'
+'998.2 -542.2 216.1'
0
-'423.5 -295.2 -296.0'
-'423.5 -295.2 -296.0'
+'1056.2 -858.6 216.1'
+'1056.2 -858.6 216.1'
0
-'474.4 141.1 -296.0'
-'474.4 141.1 -296.0'
+'732.3 -939.6 216.1'
+'732.3 -939.6 216.1'
0
-'-201.1 -1165.6 -296.0'
-'-201.1 -1165.6 -296.0'
+'550.2 -664.6 216.1'
+'550.2 -664.6 216.1'
0
-'142.4 -1333.3 -296.0'
-'142.4 -1333.3 -296.0'
+'550.0 -264.1 216.1'
+'550.0 -264.1 216.1'
0
-'-1068.7 -1377.8 -296.0'
-'-1068.7 -1377.8 -296.0'
+'597.1 48.0 216.1'
+'597.1 48.0 216.1'
0
-'-574.5 -640.1 -296.0'
-'-574.5 -640.1 -296.0'
+'638.3 417.1 216.1'
+'638.3 417.1 216.1'
0
-'1150.3 -1191.4 -296.0'
-'1150.3 -1191.4 -296.0'
+'-588.1 87.4 24.1'
+'-588.1 87.4 24.1'
0
-'939.3 -1002.1 -296.0'
-'939.3 -1002.1 -296.0'
+'-653.7 -621.6 24.1'
+'-653.7 -621.6 24.1'
0
-'1206.1 -1663.9 -296.0'
-'1206.1 -1663.9 -296.0'
+'-584.0 -309.9 1816.1'
+'-584.0 -309.9 1816.1'
0
-'1024.6 681.9 -296.0'
-'1024.6 681.9 -296.0'
+'664.2 -388.3 1816.1'
+'664.2 -388.3 1816.1'
0
-'987.9 342.6 -296.0'
-'987.9 342.6 -296.0'
+'-1759.1 -1273.4 984.1'
+'-1759.1 -1273.4 984.1'
0
-'1055.8 23.0 -296.0'
-'1055.8 23.0 -296.0'
+'-1777.9 -974.7 1029.4'
+'-1777.9 -974.7 1029.4'
0
-'-154.4 -342.0 114.8'
-'-154.4 -342.0 114.8'
+'-1796.9 -597.0 1104.1'
+'-1796.9 -597.0 1104.1'
0
-'-64.0 1757.0 24.0'
-'-64.0 1757.0 24.0'
+'-1763.9 498.6 1104.1'
+'-1763.9 498.6 1104.1'
0
-'-1160.0 -676.4 24.0'
-'-1160.0 -676.4 24.0'
+'-1784.4 835.7 1062.0'
+'-1784.4 835.7 1062.0'
0
-'1800.0 599.4 1104.0'
-'1800.0 599.4 1104.0'
+'-1498.9 -1429.8 24.1'
+'-1498.9 -1429.8 24.1'
0
-'-1803.0 1853.4 -296.0'
-'-1803.0 1853.4 -296.0'
+'-1508.4 -1710.3 -55.0'
+'-1508.4 -1710.3 -55.0'
0
-'-574.1 1691.2 -248.0'
-'-574.1 1691.2 -248.0'
+'-1483.7 -1959.7 -103.9'
+'-1483.7 -1959.7 -103.9'
0
-'824.9 1645.0 -247.0'
-'824.9 1645.0 -247.0'
+'-1061.6 -1984.7 -18.7'
+'-1061.6 -1984.7 -18.7'
0
-'492.9 1517.0 -296.0'
-'492.9 1517.0 -296.0'
+'-870.6 -2006.4 56.1'
+'-870.6 -2006.4 56.1'
0
-'1049.9 879.9 -296.0'
-'1049.9 879.9 -296.0'
+'-753.2 -1798.1 56.1'
+'-753.2 -1798.1 56.1'
0
-'1240.6 -550.5 -296.0'
-'1240.6 -550.5 -296.0'
+'-978.4 -1803.3 105.3'
+'-978.4 -1803.3 105.3'
0
-' 12.7 -327.4 -296.0'
-' 12.7 -327.4 -296.0'
+'-1271.3 -1811.0 216.1'
+'-1271.3 -1811.0 216.1'
0
-'-524.8 -1339.8 -296.0'
-'-524.8 -1339.8 -296.0'
+'-1519.8 -1632.6 216.1'
+'-1519.8 -1632.6 216.1'
0
-'-1439.4 -783.1 -296.0'
-'-1439.4 -783.1 -296.0'
+'-1469.5 -792.1 216.1'
+'-1469.5 -792.1 216.1'
0
-'289.9 811.4 -296.0'
-'289.9 811.4 -296.0'
+'-1489.9 200.9 216.1'
+'-1489.9 200.9 216.1'
0
-'-740.8 1351.7 -296.0'
-'-740.8 1351.7 -296.0'
+'-1526.0 1709.3 216.1'
+'-1526.0 1709.3 216.1'
0
-'-539.8 1037.1 -166.5'
-'-539.8 1037.1 -166.5'
+'-1046.4 1994.0 139.3'
+'-1046.4 1994.0 139.3'
0
-'-450.9 671.0 16.5'
-'-450.9 671.0 16.5'
+'-538.9 1834.2 24.1'
+'-538.9 1834.2 24.1'
0
-'-589.0 543.4 24.0'
-'-589.0 543.4 24.0'
+'-1326.1 1983.2 216.1'
+'-1326.1 1983.2 216.1'
0
-'-301.0 251.9 24.0'
-'-301.0 251.9 24.0'
+'-725.2 2005.5 24.1'
+'-725.2 2005.5 24.1'
0
-'213.8 252.6 24.0'
-'213.8 252.6 24.0'
+'-982.9 1749.5 24.1'
+'-982.9 1749.5 24.1'
0
-'920.2 338.8 24.0'
-'920.2 338.8 24.0'
+'-1454.2 1761.5 24.1'
+'-1454.2 1761.5 24.1'
0
-'925.8 -853.8 24.0'
-'925.8 -853.8 24.0'
+'-877.0 246.5 24.1'
+'-877.0 246.5 24.1'
0
-'233.6 -784.2 24.0'
-'233.6 -784.2 24.0'
+'-1555.2 274.3 24.1'
+'-1555.2 274.3 24.1'
0
-'-401.4 -738.4 24.0'
-'-401.4 -738.4 24.0'
+'-1467.6 -632.3 24.1'
+'-1467.6 -632.3 24.1'
0
-'596.5 -889.9 24.0'
-'596.5 -889.9 24.0'
+'-1806.9 1206.8 984.1'
+'-1806.9 1206.8 984.1'
0
-'559.6 -1473.3 -128.6'
-'559.6 -1473.3 -128.6'
+'1771.1 1186.1 984.1'
+'1771.1 1186.1 984.1'
0
-'622.8 -1112.2 24.0'
-'622.8 -1112.2 24.0'
+'1786.0 884.5 1050.6'
+'1786.0 884.5 1050.6'
0
-'569.3 -1837.0 -296.0'
-'569.3 -1837.0 -296.0'
+'1752.8 1688.8 -295.9'
+'1752.8 1688.8 -295.9'
0
-'1566.8 -232.7 24.0'
-'1566.8 -232.7 24.0'
+'1960.2 791.4 -295.9'
+'1960.2 791.4 -295.9'
0
-'1497.1 358.9 24.0'
-'1497.1 358.9 24.0'
+'1997.1 382.2 -143.0'
+'1997.1 382.2 -143.0'
0
-'1499.6 1295.5 24.0'
-'1499.6 1295.5 24.0'
+'1982.1 21.8 24.1'
+'1982.1 21.8 24.1'
0
-'1494.5 2008.9 24.0'
-'1494.5 2008.9 24.0'
+'1989.4 -373.7 24.1'
+'1989.4 -373.7 24.1'
0
-'1815.9 2016.8 24.0'
-'1815.9 2016.8 24.0'
+'1995.4 -758.1 -106.9'
+'1995.4 -758.1 -106.9'
0
-'1793.0 1670.6 156.7'
-'1793.0 1670.6 156.7'
+'1959.4 -1241.9 -295.9'
+'1959.4 -1241.9 -295.9'
0
-'1765.1 1429.7 216.0'
-'1765.1 1429.7 216.0'
+'929.6 -1022.0 216.1'
+'929.6 -1022.0 216.1'
0
-'1452.9 1469.2 216.0'
-'1452.9 1469.2 216.0'
+'126.2 -111.9 216.1'
+'126.2 -111.9 216.1'
0
-'1480.6 322.2 216.0'
-'1480.6 322.2 216.0'
+'-170.6 -120.1 106.8'
+'-170.6 -120.1 106.8'
0
-'111.3 -317.9 216.0'
-'111.3 -317.9 216.0'
+'111.3 -317.9 216.1'
+'111.3 -317.9 216.1'
0
-'-170.6 -120.1 106.7'
-'-170.6 -120.1 106.7'
+'1480.6 322.2 216.1'
+'1480.6 322.2 216.1'
0
-'126.2 -111.9 216.0'
-'126.2 -111.9 216.0'
+'1452.9 1469.2 216.1'
+'1452.9 1469.2 216.1'
0
-'929.6 -1022.0 216.0'
-'929.6 -1022.0 216.0'
+'1765.1 1429.7 216.1'
+'1765.1 1429.7 216.1'
0
-'1959.4 -1241.9 -296.0'
-'1959.4 -1241.9 -296.0'
+'1793.0 1670.6 156.8'
+'1793.0 1670.6 156.8'
0
-'1995.4 -758.1 -107.0'
-'1995.4 -758.1 -107.0'
+'1815.9 2016.8 24.1'
+'1815.9 2016.8 24.1'
0
-'1989.4 -373.7 24.0'
-'1989.4 -373.7 24.0'
+'1494.5 2008.9 24.1'
+'1494.5 2008.9 24.1'
0
-'1982.1 21.8 24.0'
-'1982.1 21.8 24.0'
+'1499.6 1295.5 24.1'
+'1499.6 1295.5 24.1'
0
-'1997.1 382.2 -143.1'
-'1997.1 382.2 -143.1'
+'1497.1 358.9 24.1'
+'1497.1 358.9 24.1'
0
-'1960.2 791.4 -296.0'
-'1960.2 791.4 -296.0'
+'1566.8 -232.7 24.1'
+'1566.8 -232.7 24.1'
0
-'1752.8 1688.8 -296.0'
-'1752.8 1688.8 -296.0'
+'569.3 -1837.0 -295.9'
+'569.3 -1837.0 -295.9'
0
-'1786.0 884.5 1050.5'
-'1786.0 884.5 1050.5'
+'622.8 -1112.2 24.1'
+'622.8 -1112.2 24.1'
0
-'1771.1 1186.1 984.0'
-'1771.1 1186.1 984.0'
+'559.6 -1473.3 -128.5'
+'559.6 -1473.3 -128.5'
0
-'-1806.9 1206.8 984.0'
-'-1806.9 1206.8 984.0'
+'596.5 -889.9 24.1'
+'596.5 -889.9 24.1'
0
-'-1467.6 -632.3 24.0'
-'-1467.6 -632.3 24.0'
+'-401.4 -738.4 24.1'
+'-401.4 -738.4 24.1'
0
-'-1555.2 274.3 24.0'
-'-1555.2 274.3 24.0'
+'233.6 -784.2 24.1'
+'233.6 -784.2 24.1'
0
-'-877.0 246.5 24.0'
-'-877.0 246.5 24.0'
+'925.8 -853.8 24.1'
+'925.8 -853.8 24.1'
0
-'-1454.2 1761.5 24.0'
-'-1454.2 1761.5 24.0'
+'920.2 338.8 24.1'
+'920.2 338.8 24.1'
0
-'-982.9 1749.5 24.0'
-'-982.9 1749.5 24.0'
+'213.8 252.6 24.1'
+'213.8 252.6 24.1'
0
-'-725.2 2005.5 24.0'
-'-725.2 2005.5 24.0'
+'-301.0 251.9 24.1'
+'-301.0 251.9 24.1'
0
-'-1326.1 1983.2 216.0'
-'-1326.1 1983.2 216.0'
+'-589.0 543.4 24.1'
+'-589.0 543.4 24.1'
0
-'-538.9 1834.2 24.0'
-'-538.9 1834.2 24.0'
+'-450.9 671.0 16.6'
+'-450.9 671.0 16.6'
0
-'-1046.4 1994.0 139.2'
-'-1046.4 1994.0 139.2'
+'-539.8 1037.1 -166.4'
+'-539.8 1037.1 -166.4'
0
-'-1526.0 1709.3 216.0'
-'-1526.0 1709.3 216.0'
+'-740.8 1351.7 -295.9'
+'-740.8 1351.7 -295.9'
0
-'-1489.9 200.9 216.0'
-'-1489.9 200.9 216.0'
+'289.9 811.4 -295.9'
+'289.9 811.4 -295.9'
0
-'-1469.5 -792.1 216.0'
-'-1469.5 -792.1 216.0'
+'-1439.4 -783.1 -295.9'
+'-1439.4 -783.1 -295.9'
0
-'-1519.8 -1632.6 216.0'
-'-1519.8 -1632.6 216.0'
+'-524.8 -1339.8 -295.9'
+'-524.8 -1339.8 -295.9'
0
-'-1271.3 -1811.0 216.0'
-'-1271.3 -1811.0 216.0'
+' 12.7 -327.4 -295.9'
+' 12.7 -327.4 -295.9'
0
-'-978.4 -1803.3 105.2'
-'-978.4 -1803.3 105.2'
+'1240.6 -550.5 -295.9'
+'1240.6 -550.5 -295.9'
0
-'-753.2 -1798.1 56.0'
-'-753.2 -1798.1 56.0'
+'1049.9 879.9 -295.9'
+'1049.9 879.9 -295.9'
0
-'-870.6 -2006.4 56.0'
-'-870.6 -2006.4 56.0'
+'492.9 1517.0 -295.9'
+'492.9 1517.0 -295.9'
0
-'-1061.6 -1984.7 -18.7'
-'-1061.6 -1984.7 -18.7'
+'824.9 1645.0 -295.9'
+'824.9 1645.0 -295.9'
0
-'-1483.7 -1959.7 -104.0'
-'-1483.7 -1959.7 -104.0'
+'-574.1 1691.2 -295.9'
+'-574.1 1691.2 -295.9'
0
-'-1508.4 -1710.3 -55.1'
-'-1508.4 -1710.3 -55.1'
+'-1803.0 1853.4 -295.9'
+'-1803.0 1853.4 -295.9'
0
-'-1498.9 -1429.8 24.0'
-'-1498.9 -1429.8 24.0'
+'1800.0 599.4 1104.1'
+'1800.0 599.4 1104.1'
0
-'-1784.4 835.7 1061.9'
-'-1784.4 835.7 1061.9'
+'-1160.0 -676.4 24.1'
+'-1160.0 -676.4 24.1'
0
-'-1763.9 498.6 1104.0'
-'-1763.9 498.6 1104.0'
+'-64.0 1757.0 24.1'
+'-64.0 1757.0 24.1'
0
-'-1796.9 -597.0 1104.0'
-'-1796.9 -597.0 1104.0'
+'-154.4 -342.0 114.9'
+'-154.4 -342.0 114.9'
0
-'-1777.9 -974.7 1029.3'
-'-1777.9 -974.7 1029.3'
+'1055.8 23.0 -295.9'
+'1055.8 23.0 -295.9'
0
-'-1759.1 -1273.4 984.0'
-'-1759.1 -1273.4 984.0'
+'987.9 342.6 -295.9'
+'987.9 342.6 -295.9'
0
-'664.2 -388.3 1816.0'
-'664.2 -388.3 1816.0'
+'1024.6 681.9 -295.9'
+'1024.6 681.9 -295.9'
0
-'-584.0 -309.9 1816.0'
-'-584.0 -309.9 1816.0'
+'1206.1 -1663.9 -295.9'
+'1206.1 -1663.9 -295.9'
0
-'-653.7 -621.6 24.0'
-'-653.7 -621.6 24.0'
+'939.3 -1002.1 -295.9'
+'939.3 -1002.1 -295.9'
0
-'-588.1 87.4 24.0'
-'-588.1 87.4 24.0'
+'1150.3 -1191.4 -295.9'
+'1150.3 -1191.4 -295.9'
0
-'638.3 417.1 216.0'
-'638.3 417.1 216.0'
+'-574.5 -640.1 -295.9'
+'-574.5 -640.1 -295.9'
0
-'597.1 48.0 216.0'
-'597.1 48.0 216.0'
+'-1068.7 -1377.8 -295.9'
+'-1068.7 -1377.8 -295.9'
0
-'550.0 -264.1 216.0'
-'550.0 -264.1 216.0'
+'142.4 -1333.3 -295.9'
+'142.4 -1333.3 -295.9'
0
-'550.2 -664.6 216.0'
-'550.2 -664.6 216.0'
+'-201.1 -1165.6 -295.9'
+'-201.1 -1165.6 -295.9'
0
-'732.3 -939.6 216.0'
-'732.3 -939.6 216.0'
+'474.4 141.1 -295.9'
+'474.4 141.1 -295.9'
0
-'1056.2 -858.6 216.0'
-'1056.2 -858.6 216.0'
+'423.5 -295.2 -295.9'
+'423.5 -295.2 -295.9'
0
-'998.2 -542.2 216.0'
-'998.2 -542.2 216.0'
+'-1454.3 1320.3 -295.9'
+'-1454.3 1320.3 -295.9'
0
-'877.3 -249.1 216.0'
-'877.3 -249.1 216.0'
+'-1497.9 629.9 -295.9'
+'-1497.9 629.9 -295.9'
0
-'931.1 128.9 216.0'
-'931.1 128.9 216.0'
+'-1170.0 914.3 -295.9'
+'-1170.0 914.3 -295.9'
0
-'1340.3 -284.0 216.0'
-'1340.3 -284.0 216.0'
+'-1186.0 349.0 -295.9'
+'-1186.0 349.0 -295.9'
0
-'861.1 552.0 216.0'
-'861.1 552.0 216.0'
+'-1693.6 34.8 -295.9'
+'-1693.6 34.8 -295.9'
0
-'1319.5 154.0 216.0'
-'1319.5 154.0 216.0'
+'-1114.7 1814.9 -295.9'
+'-1114.7 1814.9 -295.9'
0
-'1292.9 423.6 216.0'
-'1292.9 423.6 216.0'
+'-564.1 1814.7 -295.9'
+'-564.1 1814.7 -295.9'
0
-'1450.7 -860.4 216.0'
-'1450.7 -860.4 216.0'
+'-1883.2 974.4 -295.9'
+'-1883.2 974.4 -295.9'
0
+'-469.4 1346.5 -295.9'
+'-469.4 1346.5 -295.9'
+0
+'-745.4 875.6 -85.7'
+'-745.4 875.6 -85.7'
+0
+'-740.3 671.3 16.5'
+'-740.3 671.3 16.5'
+0
+'168.6 -1937.3 -295.9'
+'168.6 -1937.3 -295.9'
+0
+'-204.3 -1841.5 -295.9'
+'-204.3 -1841.5 -295.9'
+0
+'-665.2 -1701.2 -295.9'
+'-665.2 -1701.2 -295.9'
+0
+'954.7 -1905.8 -295.9'
+'954.7 -1905.8 -295.9'
+0
+'1486.0 -1854.4 -295.9'
+'1486.0 -1854.4 -295.9'
+0
+'1766.6 -1515.6 -295.9'
+'1766.6 -1515.6 -295.9'
+0
+'528.9 1812.4 24.1'
+'528.9 1812.4 24.1'
+0
+'1241.7 1735.6 24.1'
+'1241.7 1735.6 24.1'
+0
+'-1556.9 1196.3 216.1'
+'-1556.9 1196.3 216.1'
+0
+'-1329.9 516.0 216.1'
+'-1329.9 516.0 216.1'
+0
+'-1674.2 174.7 216.1'
+'-1674.2 174.7 216.1'
+0
+'-1390.3 -464.3 216.1'
+'-1390.3 -464.3 216.1'
+0
+'-1684.5 -827.1 216.1'
+'-1684.5 -827.1 216.1'
+0
+'1648.9 -314.9 -295.9'
+'1648.9 -314.9 -295.9'
+0
+'1549.2 685.4 -295.9'
+'1549.2 685.4 -295.9'
+0
+'1293.3 1313.9 -295.9'
+'1293.3 1313.9 -295.9'
+0
+'-147.4 1606.2 -295.9'
+'-147.4 1606.2 -295.9'
+0
+'-1105.6 1441.3 -295.9'
+'-1105.6 1441.3 -295.9'
+0
+'-1349.5 -73.9 -295.9'
+'-1349.5 -73.9 -295.9'
+0
+'-805.0 112.5 -295.9'
+'-805.0 112.5 -295.9'
+0
+'-813.7 -299.9 -295.9'
+'-813.7 -299.9 -295.9'
+0
+'-434.0 -205.9 -295.9'
+'-434.0 -205.9 -295.9'
+0
+'-72.3 120.3 -295.9'
+'-72.3 120.3 -295.9'
+0
+'325.9 -808.0 -295.9'
+'325.9 -808.0 -295.9'
+0
+'910.1 -1449.0 -295.9'
+'910.1 -1449.0 -295.9'
+0
Modified: branches/nexuiz-2.0/data/menu/data/input.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/input.menu 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/menu/data/input.menu 2007-05-18 21:36:17 UTC (rev 2601)
@@ -10,7 +10,7 @@
Item DataLink_Value Value
{
minValue 0.0
- maxValue 20.0
+ maxValue 30.0
stepValue 1
link "##up"
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-05-18 21:36:17 UTC (rev 2601)
@@ -288,7 +288,7 @@
}
DropAllRunes(self);
- kh_Key_DropAll(self);
+ kh_Key_DropAll(self, TRUE);
if(self.flagcarried)
DropFlag(self.flagcarried);
@@ -746,7 +746,7 @@
WaypointSprite_PlayerGone();
DropAllRunes(self);
- kh_Key_DropAll(self);
+ kh_Key_DropAll(self, TRUE);
if(self.flagcarried)
DropFlag(self.flagcarried);
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_player.qc 2007-05-18 21:36:17 UTC (rev 2601)
@@ -309,7 +309,12 @@
// print an obituary message
Obituary (attacker, self, deathtype);
DropAllRunes(self);
- kh_Key_DropAll(self);
+ if(self == attacker)
+ kh_Key_DropAll(self, TRUE);
+ else if(attacker.classname == "player" || attacker.classname == "gib")
+ kh_Key_DropAll(self, FALSE);
+ else
+ kh_Key_DropAll(self, TRUE);
if(self.flagcarried)
DropFlag(self.flagcarried);
// clear waypoints
Modified: branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/clientcommands.qc 2007-05-18 21:36:17 UTC (rev 2601)
@@ -319,7 +319,7 @@
if(self.classname == "player" && cvar("sv_spectate") == 1) {
if(self.flagcarried)
DropFlag(self.flagcarried);
- kh_Key_DropAll(self);
+ kh_Key_DropAll(self, TRUE);
WaypointSprite_PlayerDead();
DistributeFragsAmongTeam(self, self.team, 1.0);
self.classname = "observer";
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2007-05-18 21:36:17 UTC (rev 2601)
@@ -28,8 +28,7 @@
}
else if(cvar("g_keyhunt"))
{
- if(f > 0)
- f = kh_HandleFrags(attacker, targ, f);
+ f = kh_HandleFrags(attacker, targ, f);
}
else if(cvar("g_lms"))
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-05-18 21:36:17 UTC (rev 2601)
@@ -35,12 +35,14 @@
return 0;
}
+vector kh_average_teamcolor;
entity kh_controller;
float kh_tracking_enabled;
float kh_teams;
float kh_interferemsg_time, kh_interferemsg_team;
.entity kh_next, kh_prev; // linked list
.float kh_droptime;
+.float kh_dropperteam;
string kh_sound_capture = "sound/ctf/capture.wav";
string kh_sound_destroy = "sound/ctf/return.wav";
@@ -295,6 +297,7 @@
key.event_damage = kh_Key_Damage;
key.modelindex = kh_key_dropped;
key.model = "key";
+ key.kh_dropperteam = 0;
setsize(key, KH_KEY_MIN, KH_KEY_MAX);
switch(initial_owner.team)
@@ -302,18 +305,22 @@
case COLOR_TEAM1:
key.netname = "^1red key";
key.colormod = '103 0 0' * KH_KEY_BRIGHTNESS;
+ kh_average_teamcolor += key.colormod;
break;
case COLOR_TEAM2:
key.netname = "^4blue key";
key.colormod = '35 35 191' * KH_KEY_BRIGHTNESS;
+ kh_average_teamcolor += key.colormod;
break;
case COLOR_TEAM3:
key.netname = "^3yellow key";
key.colormod = '187 167 15' * KH_KEY_BRIGHTNESS;
+ kh_average_teamcolor += key.colormod;
break;
case COLOR_TEAM4:
key.netname = "^6pink key";
key.colormod = '139 79 107' * KH_KEY_BRIGHTNESS;
+ kh_average_teamcolor += key.colormod;
break;
default:
key.netname = "NETGIER key";
@@ -365,7 +372,9 @@
{
sound(player, CHAN_AUTO, kh_sound_collect, 1, ATTN_NORM);
- kh_Scores_Event(player, key, "collect", cvar("g_balance_keyhunt_score_collect"), 0);
+ if(key.kh_dropperteam != player.team)
+ kh_Scores_Event(player, key, "collect", cvar("g_balance_keyhunt_score_collect"), 0);
+ key.kh_dropperteam = 0;
bprint(player.netname, "^7 collected the ", key.netname, "\n");
kh_Key_AssignTo(key, player);
@@ -376,7 +385,7 @@
}
}
-void kh_Key_DropAll(entity player)
+void kh_Key_DropAll(entity player, float suicide)
{
entity key;
entity mypusher;
@@ -395,6 +404,8 @@
key.velocity = W_CalculateProjectileVelocity(player.velocity, cvar("g_balance_keyhunt_dropvelocity") * v_forward);
key.pusher = mypusher;
key.pushltime = time + cvar("g_balance_keyhunt_protecttime");
+ if(suicide)
+ key.kh_dropperteam = player.team;
}
sound(player, CHAN_AUTO, kh_sound_drop, 1, ATTN_NORM);
}
@@ -456,6 +467,7 @@
self.velocity = W_CalculateProjectileVelocity(self.owner.velocity, cvar("g_balance_keyhunt_throwvelocity") * v_forward);
kh_Key_AssignTo(self, world);
self.pushltime = time + cvar("g_balance_keyhunt_protecttime");
+ self.kh_dropperteam = self.team;
}
}
@@ -498,7 +510,7 @@
void kh_WinnerTeam(float teem)
{
// all key carriers get some points
- vector firstorigin, lastorigin;
+ vector firstorigin, lastorigin, midpoint;
float first;
entity key;
float score;
@@ -521,11 +533,13 @@
bprint("^7 captured the keys for the ", ColoredTeamName(teem), "\n");
first = TRUE;
+ midpoint = '0 0 0';
FOR_EACH_KH_KEY(key)
{
vector thisorigin;
thisorigin = kh_AttachedOrigin(key);
+ midpoint += thisorigin;
if(!first)
te_lightning2(world, lastorigin, thisorigin);
@@ -538,6 +552,8 @@
{
te_lightning2(world, lastorigin, firstorigin);
}
+ midpoint *= 1 / kh_teams;
+ te_customflash(midpoint, 1000, 1, kh_average_teamcolor);
sound(world, CHAN_AUTO, kh_sound_capture, 1, ATTN_NONE);
kh_FinishRound();
@@ -611,6 +627,7 @@
bprint("The ", ColoredTeamName(teem), "^7 could not take care of the ", lostkey.netname, "\n");
}
sound(world, CHAN_AUTO, kh_sound_destroy, 1, ATTN_NONE);
+ te_tarexplosion(lostkey.origin);
kh_FinishRound();
}
@@ -680,6 +697,7 @@
if(clienttype(player) == CLIENTTYPE_REAL)
centerprint_expire(player, CENTERPRIO_SPAM);
+ kh_average_teamcolor = '0 0 0';
for(i = 0; i < kh_teams; ++i)
{
teem = kh_Team_ByID(i);
@@ -698,6 +716,7 @@
//kh_Key_Spawn(my_player, 360 * i / kh_teams);
//kh_Key_Spawn(my_player, 360 * i / kh_teams);
}
+ kh_average_teamcolor *= 1 / kh_teams;
kh_tracking_enabled = FALSE;
kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_tracking"), "Scanning frequency range...", kh_EnableTrackingDevice);
@@ -762,13 +781,25 @@
float kh_HandleFrags(entity attacker, entity targ, float f)
{
- if(f <= 0)
- return f;
if(attacker == targ)
return f;
if(targ.kh_next)
- kh_Scores_Event(attacker, targ.kh_next, "carrierfrag", cvar("g_balance_keyhunt_score_carrierfrag")-1, 0);
+ {
+ if(attacker.team == targ.team)
+ {
+ entity k;
+ float nk;
+ nk = 0;
+ for(k = targ.kh_next; k != world; k = k.kh_next)
+ ++nk;
+ kh_Scores_Event(attacker, targ.kh_next, "carrierfrag", -nk * cvar("g_balance_keyhunt_score_collect"), 0);
+ }
+ else
+ {
+ kh_Scores_Event(attacker, targ.kh_next, "carrierfrag", cvar("g_balance_keyhunt_score_carrierfrag")-1, 0);
+ }
+ }
return f;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qh 2007-05-18 18:48:37 UTC (rev 2600)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qh 2007-05-18 21:36:17 UTC (rev 2601)
@@ -9,7 +9,7 @@
void kh_Key_Spawn(entity initial_owner, float angle);
void kh_Key_Remove(entity key);
void kh_Key_Collect(entity key, entity player);
-void kh_Key_DropAll(entity player);
+void kh_Key_DropAll(entity player, float suicide);
void kh_Key_Touch();
void kh_Key_Think();
void kh_WinnerTeam(float teem);
More information about the nexuiz-commits
mailing list