From 8873aa418a89297cfd1bead8238161fb441df002 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 2 May 2006 17:08:19 +0000 Subject: [PATCH] - increased enemy search distance to about infinity - new waypoints git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1366 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/nexdm10.waypoints | 220 ++++++---- data/maps/nexdm15.waypoints | 249 ++++++----- data/maps/nexdm17.waypoints | 503 ++++++++++++----------- data/qcsrc/server/gamec/havocbot_roles.c | 68 ++- 4 files changed, 588 insertions(+), 452 deletions(-) diff --git a/data/maps/nexdm10.waypoints b/data/maps/nexdm10.waypoints index ae866ddb4..dff0fdf9b 100644 --- a/data/maps/nexdm10.waypoints +++ b/data/maps/nexdm10.waypoints @@ -1,123 +1,183 @@ -'514.0 -664.9 -160.0' -'514.0 -664.9 -160.0' +'174.6 229.1 -8.0' +'174.6 229.1 -8.0' 0 -'542.1 -278.0 -8.0' -'542.1 -278.0 -8.0' +'-118.6 245.9 -8.0' +'-118.6 245.9 -8.0' 0 -'525.4 -507.2 -88.0' -'525.4 -507.2 -88.0' +'-882.5 1296.5 -16.0' +'-882.5 1296.5 -16.0' 0 -'443.8 310.1 -8.0' -'443.8 310.1 -8.0' +'-1165.4 1287.7 -16.0' +'-1165.4 1287.7 -16.0' 0 -'275.4 95.7 -8.0' -'275.4 95.7 -8.0' +'-700.8 1436.6 -16.0' +'-700.8 1436.6 -16.0' 0 -' 35.9 177.1 -96.0' -' 35.9 177.1 -96.0' +'-689.0 1140.0 -16.0' +'-689.0 1140.0 -16.0' 0 -' 26.9 -26.4 -160.0' -' 26.9 -26.4 -160.0' +'1214.3 895.4 -8.0' +'1214.3 895.4 -8.0' 0 -'317.5 -474.4 -160.0' -'317.5 -474.4 -160.0' +'-129.4 733.3 152.0' +'-129.4 733.3 152.0' 0 -'-225.5 -442.2 -160.0' -'-225.5 -442.2 -160.0' +'171.7 726.4 152.0' +'171.7 726.4 152.0' 0 -'-207.5 -846.1 -160.0' -'-207.5 -846.1 -160.0' +'373.7 714.7 152.0' +'373.7 714.7 152.0' 0 -'-617.3 -841.4 -8.0' -'-617.3 -841.4 -8.0' +'-274.2 698.7 152.0' +'-274.2 698.7 152.0' 0 -'-669.0 -473.7 -8.0' -'-669.0 -473.7 -8.0' +'-90.1 -296.5 -8.0' +'-90.1 -296.5 -8.0' 0 -'-672.6 -318.8 40.0' -'-672.6 -318.8 40.0' +'-48.0 -230.2 -8.0' +'-48.0 -230.2 -8.0' 0 -'-678.3 -81.4 96.0' -'-678.3 -81.4 96.0' +'-922.6 -34.2 96.0' +'-922.6 -34.2 96.0' 0 -'1207.5 -9.6 -136.0' -'1207.5 -9.6 -136.0' +'-1164.2 -9.7 96.0' +'-1164.2 -9.7 96.0' 0 -'1195.4 -342.9 -86.0' -'1195.4 -342.9 -86.0' +'-1183.4 128.1 48.0' +'-1183.4 128.1 48.0' 0 -'1183.0 -570.4 -8.0' -'1183.0 -570.4 -8.0' +'-1207.4 300.4 40.0' +'-1207.4 300.4 40.0' 0 -'677.4 -569.3 -8.0' -'677.4 -569.3 -8.0' +'-1233.5 487.7 -16.0' +'-1233.5 487.7 -16.0' 0 -'664.7 -243.7 -8.0' -'664.7 -243.7 -8.0' +'1456.9 87.3 -136.0' +'1456.9 87.3 -136.0' 0 -'280.6 -235.4 -8.0' -'280.6 -235.4 -8.0' +'1433.7 257.1 -64.0' +'1433.7 257.1 -64.0' 0 -'-208.4 -223.0 -8.0' -'-208.4 -223.0 -8.0' +'1454.4 477.3 -8.0' +'1454.4 477.3 -8.0' 0 -'-234.5 107.3 -8.0' -'-234.5 107.3 -8.0' +'1207.0 631.3 -8.0' +'1207.0 631.3 -8.0' 0 -'-210.0 524.6 -8.0' -'-210.0 524.6 -8.0' +'812.5 336.2 -8.0' +'812.5 336.2 -8.0' 0 -'-216.5 894.1 -8.0' -'-216.5 894.1 -8.0' +'806.0 628.1 88.0' +'806.0 628.1 88.0' 0 -'-491.0 1115.9 -8.0' -'-491.0 1115.9 -8.0' +'800.8 860.0 152.0' +'800.8 860.0 152.0' +0 +'777.8 1141.9 152.0' +'777.8 1141.9 152.0' 0 '390.9 1185.1 152.0' '390.9 1185.1 152.0' 0 -'777.8 1141.9 152.0' -'777.8 1141.9 152.0' +'-491.0 1115.9 -8.0' +'-491.0 1115.9 -8.0' 0 -'800.8 860.0 152.0' -'800.8 860.0 152.0' +'-216.5 894.1 -8.0' +'-216.5 894.1 -8.0' 0 -'806.0 628.1 88.0' -'806.0 628.1 88.0' +'-210.0 524.6 -8.0' +'-210.0 524.6 -8.0' 0 -'812.5 336.2 -8.0' -'812.5 336.2 -8.0' +'-234.5 107.3 -8.0' +'-234.5 107.3 -8.0' 0 -'1207.0 631.3 -8.0' -'1207.0 631.3 -8.0' +'-208.4 -223.0 -8.0' +'-208.4 -223.0 -8.0' 0 -'1454.4 477.3 -8.0' -'1454.4 477.3 -8.0' +'280.6 -235.4 -8.0' +'280.6 -235.4 -8.0' 0 -'1433.7 257.1 -64.0' -'1433.7 257.1 -64.0' +'664.7 -243.7 -8.0' +'664.7 -243.7 -8.0' 0 -'1456.9 87.3 -136.0' -'1456.9 87.3 -136.0' +'677.4 -569.3 -8.0' +'677.4 -569.3 -8.0' 0 -'-1233.5 487.7 -16.0' -'-1233.5 487.7 -16.0' +'1183.0 -570.4 -8.0' +'1183.0 -570.4 -8.0' 0 -'-1207.4 300.4 40.0' -'-1207.4 300.4 40.0' +'1195.4 -342.9 -86.0' +'1195.4 -342.9 -86.0' 0 -'-1183.4 128.1 48.0' -'-1183.4 128.1 48.0' +'1207.5 -9.6 -136.0' +'1207.5 -9.6 -136.0' 0 -'-1164.2 -9.7 96.0' -'-1164.2 -9.7 96.0' +'-678.3 -81.4 96.0' +'-678.3 -81.4 96.0' 0 -'-922.6 -34.2 96.0' -'-922.6 -34.2 96.0' +'-672.6 -318.8 40.0' +'-672.6 -318.8 40.0' 0 -'-48.0 -230.2 -8.0' -'-48.0 -230.2 -8.0' +'-669.0 -473.7 -8.0' +'-669.0 -473.7 -8.0' 0 -'-90.1 -296.5 -8.0' -'-90.1 -296.5 -8.0' +'-617.3 -841.4 -8.0' +'-617.3 -841.4 -8.0' +0 +'-207.5 -846.1 -160.0' +'-207.5 -846.1 -160.0' +0 +'-225.5 -442.2 -160.0' +'-225.5 -442.2 -160.0' +0 +'317.5 -474.4 -160.0' +'317.5 -474.4 -160.0' +0 +' 26.9 -26.4 -160.0' +' 26.9 -26.4 -160.0' +0 +' 35.9 177.1 -96.0' +' 35.9 177.1 -96.0' +0 +'275.4 95.7 -8.0' +'275.4 95.7 -8.0' +0 +'443.8 310.1 -8.0' +'443.8 310.1 -8.0' +0 +'525.4 -507.2 -88.0' +'525.4 -507.2 -88.0' +0 +'542.1 -278.0 -8.0' +'542.1 -278.0 -8.0' +0 +'514.0 -664.9 -160.0' +'514.0 -664.9 -160.0' +0 +'596.5 1260.4 152.0' +'596.5 1260.4 152.0' +0 +'-279.9 1036.0 152.0' +'-279.9 1036.0 152.0' +0 +'-251.5 1306.1 152.0' +'-251.5 1306.1 152.0' +0 +'-855.4 573.8 -16.0' +'-855.4 573.8 -16.0' +0 +'-861.1 843.5 -16.0' +'-861.1 843.5 -16.0' +0 +'-545.6 1135.4 152.0' +'-545.6 1135.4 152.0' +0 +'-644.1 503.0 -16.0' +'-644.1 503.0 -16.0' +0 +'-658.3 982.1 152.0' +'-658.3 982.1 152.0' +0 +'1220.3 1320.0 -8.0' +'1220.3 1320.0 -8.0' 0 diff --git a/data/maps/nexdm15.waypoints b/data/maps/nexdm15.waypoints index c82a04cab..de505c28f 100644 --- a/data/maps/nexdm15.waypoints +++ b/data/maps/nexdm15.waypoints @@ -1,174 +1,195 @@ -'795.1 -354.5 -320.0' -'795.1 -354.5 -320.0' +'299.1 -172.1 152.0' +'299.1 -172.1 152.0' 0 -'643.4 -252.4 -328.0' -'643.4 -252.4 -328.0' +'770.7 100.3 952.0' +'770.7 100.3 952.0' 0 -'884.1 -328.7 -328.0' -'884.1 -328.7 -328.0' +'1119.1 -661.2 312.0' +'1119.1 -661.2 312.0' 0 -'1073.3 -99.7 -320.0' -'1073.3 -99.7 -320.0' +'386.5 -443.0 152.0' +'386.5 -443.0 152.0' 0 -'1160.4 -143.8 -320.0' -'1160.4 -143.8 -320.0' +'368.9 -210.5 152.0' +'368.9 -210.5 152.0' 0 -'1256.4 -165.1 -344.0' -'1256.4 -165.1 -344.0' +'637.3 -184.7 152.0' +'637.3 -184.7 152.0' 0 -'1414.5 40.3 -392.0' -'1414.5 40.3 -392.0' +'602.3 186.9 152.0' +'602.3 186.9 152.0' 0 -'1339.0 150.3 -408.0' -'1339.0 150.3 -408.0' +'749.3 202.6 232.0' +'749.3 202.6 232.0' 0 -'1234.5 214.3 -432.0' -'1234.5 214.3 -432.0' +'867.7 34.6 304.0' +'867.7 34.6 304.0' 0 -'1335.5 -139.4 -360.0' -'1335.5 -139.4 -360.0' +'517.7 -228.2 448.0' +'517.7 -228.2 448.0' 0 -'1146.6 199.4 -440.0' -'1146.6 199.4 -440.0' +'393.2 -227.3 448.0' +'393.2 -227.3 448.0' 0 -'1011.3 79.9 -464.0' -'1011.3 79.9 -464.0' +'311.6 23.0 448.0' +'311.6 23.0 448.0' 0 -'971.9 -67.1 -488.0' -'971.9 -67.1 -488.0' +'391.0 480.6 448.0' +'391.0 480.6 448.0' 0 -'1016.9 -172.5 -504.0' -'1016.9 -172.5 -504.0' +'183.6 -147.0 152.0' +'183.6 -147.0 152.0' 0 -'1092.1 -206.3 -512.0' -'1092.1 -206.3 -512.0' +'305.7 -74.2 152.0' +'305.7 -74.2 152.0' 0 -'1191.8 -251.2 -528.0' -'1191.8 -251.2 -528.0' +'557.4 226.1 -104.0' +'557.4 226.1 -104.0' 0 -'1313.0 -221.1 -544.0' -'1313.0 -221.1 -544.0' +'142.7 177.3 24.0' +'142.7 177.3 24.0' 0 -'1415.4 -133.1 -560.0' -'1415.4 -133.1 -560.0' +'1706.0 536.1 -648.0' +'1706.0 536.1 -648.0' 0 -'1445.1 -22.3 -576.0' -'1445.1 -22.3 -576.0' +'1443.8 809.5 -632.0' +'1443.8 809.5 -632.0' 0 -'1276.0 240.5 -616.0' -'1276.0 240.5 -616.0' +'542.4 884.7 -648.0' +'542.4 884.7 -648.0' 0 -'1433.2 118.8 -592.0' -'1433.2 118.8 -592.0' +'267.2 762.7 -648.0' +'267.2 762.7 -648.0' 0 -'1384.3 100.4 -592.0' -'1384.3 100.4 -592.0' +'-52.6 883.8 -616.0' +'-52.6 883.8 -616.0' 0 -'1212.6 250.5 -624.0' -'1212.6 250.5 -624.0' +'-278.2 842.1 -616.0' +'-278.2 842.1 -616.0' 0 -'644.9 190.6 168.0' -'644.9 190.6 168.0' +'561.8 535.1 -648.0' +'561.8 535.1 -648.0' 0 -'670.0 194.6 184.0' -'670.0 194.6 184.0' +' 69.7 543.6 -634.0' +' 69.7 543.6 -634.0' 0 -'1424.9 55.7 -584.0' -'1424.9 55.7 -584.0' +'1372.2 -94.5 -368.0' +'1372.2 -94.5 -368.0' 0 -'1309.3 199.3 -608.0' -'1309.3 199.3 -608.0' +'698.2 199.1 200.0' +'698.2 199.1 200.0' 0 -'1079.0 232.1 -640.0' -'1079.0 232.1 -640.0' +'1605.3 225.3 -648.0' +'1605.3 225.3 -648.0' +0 +'1574.9 459.9 -648.0' +'1574.9 459.9 -648.0' 0 '896.7 354.3 -648.0' '896.7 354.3 -648.0' 0 -'1574.9 459.9 -648.0' -'1574.9 459.9 -648.0' +'1079.0 232.1 -640.0' +'1079.0 232.1 -640.0' 0 -'1605.3 225.3 -648.0' -'1605.3 225.3 -648.0' +'1309.3 199.3 -608.0' +'1309.3 199.3 -608.0' 0 -'698.2 199.1 200.0' -'698.2 199.1 200.0' +'1424.9 55.7 -584.0' +'1424.9 55.7 -584.0' 0 -'1372.2 -94.5 -368.0' -'1372.2 -94.5 -368.0' +'670.0 194.6 184.0' +'670.0 194.6 184.0' 0 -' 69.7 543.6 -634.0' -' 69.7 543.6 -634.0' +'644.9 190.6 168.0' +'644.9 190.6 168.0' 0 -'561.8 535.1 -648.0' -'561.8 535.1 -648.0' +'1212.6 250.5 -624.0' +'1212.6 250.5 -624.0' 0 -'-278.2 842.1 -616.0' -'-278.2 842.1 -616.0' +'1384.3 100.4 -592.0' +'1384.3 100.4 -592.0' 0 -'-52.6 883.8 -616.0' -'-52.6 883.8 -616.0' +'1433.2 118.8 -592.0' +'1433.2 118.8 -592.0' 0 -'267.2 762.7 -648.0' -'267.2 762.7 -648.0' +'1276.0 240.5 -616.0' +'1276.0 240.5 -616.0' 0 -'542.4 884.7 -648.0' -'542.4 884.7 -648.0' +'1445.1 -22.3 -576.0' +'1445.1 -22.3 -576.0' 0 -'1443.8 809.5 -632.0' -'1443.8 809.5 -632.0' +'1415.4 -133.1 -560.0' +'1415.4 -133.1 -560.0' 0 -'1706.0 536.1 -648.0' -'1706.0 536.1 -648.0' +'1313.0 -221.1 -544.0' +'1313.0 -221.1 -544.0' 0 -'142.7 177.3 24.0' -'142.7 177.3 24.0' +'1191.8 -251.2 -528.0' +'1191.8 -251.2 -528.0' 0 -'557.4 226.1 -104.0' -'557.4 226.1 -104.0' +'1092.1 -206.3 -512.0' +'1092.1 -206.3 -512.0' 0 -'305.7 -74.2 152.0' -'305.7 -74.2 152.0' +'1016.9 -172.5 -504.0' +'1016.9 -172.5 -504.0' 0 -'183.6 -147.0 152.0' -'183.6 -147.0 152.0' +'971.9 -67.1 -488.0' +'971.9 -67.1 -488.0' 0 -'391.0 480.6 448.0' -'391.0 480.6 448.0' +'1011.3 79.9 -464.0' +'1011.3 79.9 -464.0' 0 -'311.6 23.0 448.0' -'311.6 23.0 448.0' +'1146.6 199.4 -440.0' +'1146.6 199.4 -440.0' 0 -'393.2 -227.3 448.0' -'393.2 -227.3 448.0' +'1335.5 -139.4 -360.0' +'1335.5 -139.4 -360.0' 0 -'517.7 -228.2 448.0' -'517.7 -228.2 448.0' +'1234.5 214.3 -432.0' +'1234.5 214.3 -432.0' 0 -'867.7 34.6 304.0' -'867.7 34.6 304.0' +'1339.0 150.3 -408.0' +'1339.0 150.3 -408.0' 0 -'749.3 202.6 232.0' -'749.3 202.6 232.0' +'1414.5 40.3 -392.0' +'1414.5 40.3 -392.0' 0 -'602.3 186.9 152.0' -'602.3 186.9 152.0' +'1256.4 -165.1 -344.0' +'1256.4 -165.1 -344.0' 0 -'637.3 -184.7 152.0' -'637.3 -184.7 152.0' +'1160.4 -143.8 -320.0' +'1160.4 -143.8 -320.0' 0 -'368.9 -210.5 152.0' -'368.9 -210.5 152.0' +'1073.3 -99.7 -320.0' +'1073.3 -99.7 -320.0' 0 -'386.5 -443.0 152.0' -'386.5 -443.0 152.0' +'884.1 -328.7 -328.0' +'884.1 -328.7 -328.0' 0 -'1119.1 -661.2 312.0' -'1119.1 -661.2 312.0' +'643.4 -252.4 -328.0' +'643.4 -252.4 -328.0' 0 -'770.7 100.3 952.0' -'770.7 100.3 952.0' +'795.1 -354.5 -320.0' +'795.1 -354.5 -320.0' 0 -'299.1 -172.1 152.0' -'299.1 -172.1 152.0' +'1401.6 48.0 320.0' +'1401.6 48.0 320.0' +0 +'1268.2 -241.2 328.0' +'1268.2 -241.2 328.0' +0 +'1411.4 -245.1 328.0' +'1411.4 -245.1 328.0' +0 +'1406.3 -433.3 328.0' +'1406.3 -433.3 328.0' +0 +'1276.1 -429.8 328.0' +'1276.1 -429.8 328.0' +0 +'-87.1 152.2 24.0' +'-87.1 152.2 24.0' +0 +' 72.6 114.1 24.0' +' 72.6 114.1 24.0' 0 diff --git a/data/maps/nexdm17.waypoints b/data/maps/nexdm17.waypoints index 3830d5688..d259713e6 100644 --- a/data/maps/nexdm17.waypoints +++ b/data/maps/nexdm17.waypoints @@ -1,378 +1,381 @@ -'1809.8 -1240.7 -504.0' -'1809.8 -1240.7 -504.0' +'2190.2 -1274.2 -744.0' +'2190.2 -1274.2 -744.0' 0 -'376.4 189.6 -488.0' -'376.4 189.6 -488.0' +'210.8 1303.1 216.0' +'210.8 1303.1 216.0' 0 -'462.9 -479.5 -490.3' -'462.9 -479.5 -490.3' +'507.0 1302.9 472.0' +'507.0 1302.9 472.0' 0 -'645.4 -785.5 -567.9' -'645.4 -785.5 -567.9' +'803.6 1111.1 472.0' +'803.6 1111.1 472.0' 0 -'1792.4 -1016.2 -744.0' -'1792.4 -1016.2 -744.0' +'1160.6 1673.4 280.0' +'1160.6 1673.4 280.0' 0 -'1790.7 -862.6 -744.0' -'1790.7 -862.6 -744.0' +'802.8 1686.0 359.1' +'802.8 1686.0 359.1' 0 -'1677.9 -1163.5 -744.0' -'1677.9 -1163.5 -744.0' +'485.5 1477.5 472.0' +'485.5 1477.5 472.0' 0 -'1236.6 -1328.5 -424.0' -'1236.6 -1328.5 -424.0' +'1130.4 432.2 -104.0' +'1130.4 432.2 -104.0' 0 -'1367.5 -1418.2 -424.0' -'1367.5 -1418.2 -424.0' +'1498.7 -1347.7 -426.7' +'1498.7 -1347.7 -426.7' 0 -'1464.0 -1360.9 -424.0' -'1464.0 -1360.9 -424.0' +'1821.4 -1260.8 -200.0' +'1821.4 -1260.8 -200.0' 0 -'2412.0 -400.4 -296.0' -'2412.0 -400.4 -296.0' +'1818.0 -1737.7 -200.0' +'1818.0 -1737.7 -200.0' 0 -'605.5 -236.5 -744.0' -'605.5 -236.5 -744.0' +'1449.8 -961.9 -744.0' +'1449.8 -961.9 -744.0' 0 -'531.0 377.7 -744.0' -'531.0 377.7 -744.0' +'1289.5 65.7 -424.0' +'1289.5 65.7 -424.0' 0 -'345.6 341.0 -744.0' -'345.6 341.0 -744.0' +'741.0 66.8 -424.0' +'741.0 66.8 -424.0' 0 -'1733.2 94.3 -744.0' -'1733.2 94.3 -744.0' +'980.6 -932.1 -744.0' +'980.6 -932.1 -744.0' 0 -'1727.5 -223.4 -744.0' -'1727.5 -223.4 -744.0' +'715.0 -1048.3 -648.2' +'715.0 -1048.3 -648.2' 0 -'1787.9 -283.8 -744.0' -'1787.9 -283.8 -744.0' +'426.4 -774.9 -518.0' +'426.4 -774.9 -518.0' 0 -'1910.3 -368.0 -744.0' -'1910.3 -368.0 -744.0' +'335.1 -385.0 -488.0' +'335.1 -385.0 -488.0' 0 -'2094.9 -241.0 -744.0' -'2094.9 -241.0 -744.0' +'384.1 20.7 -488.0' +'384.1 20.7 -488.0' 0 -'2105.1 102.9 -744.0' -'2105.1 102.9 -744.0' +'506.9 981.6 -380.0' +'506.9 981.6 -380.0' 0 -'1918.1 234.6 -744.0' -'1918.1 234.6 -744.0' +'315.6 685.0 -424.0' +'315.6 685.0 -424.0' 0 -'1812.3 179.6 -744.0' -'1812.3 179.6 -744.0' +'647.3 990.7 -232.0' +'647.3 990.7 -232.0' 0 -'1676.9 104.9 -744.0' -'1676.9 104.9 -744.0' +'791.7 1199.1 -232.0' +'791.7 1199.1 -232.0' 0 -'2079.1 126.2 -296.0' -'2079.1 126.2 -296.0' +' 6.8 1391.1 216.0' +' 6.8 1391.1 216.0' 0 -'2323.3 -99.8 -296.0' -'2323.3 -99.8 -296.0' +'-73.2 371.9 216.0' +'-73.2 371.9 216.0' 0 -'2552.0 -288.6 -296.0' -'2552.0 -288.6 -296.0' +' -0.2 868.5 216.0' +' -0.2 868.5 216.0' 0 -'2342.2 -267.8 -296.0' -'2342.2 -267.8 -296.0' +'587.2 565.2 -744.0' +'587.2 565.2 -744.0' 0 -'1273.1 260.3 -104.0' -'1273.1 260.3 -104.0' +'522.9 21.7 -744.0' +'522.9 21.7 -744.0' 0 -'-804.0 1027.5 -232.0' -'-804.0 1027.5 -232.0' +'746.3 -448.2 -744.0' +'746.3 -448.2 -744.0' 0 -'2012.7 -1328.6 -744.0' -'2012.7 -1328.6 -744.0' +'1413.2 -528.4 -744.0' +'1413.2 -528.4 -744.0' 0 -'470.6 975.3 -440.0' -'470.6 975.3 -440.0' +'1361.0 -38.3 -744.0' +'1361.0 -38.3 -744.0' 0 -'437.2 1289.8 -232.0' -'437.2 1289.8 -232.0' +'2193.5 -86.1 -296.0' +'2193.5 -86.1 -296.0' 0 -'1120.0 -573.4 -1000.0' -'1120.0 -573.4 -1000.0' +'2441.4 -62.1 -296.0' +'2441.4 -62.1 -296.0' 0 -'1169.9 -871.2 -1000.0' -'1169.9 -871.2 -1000.0' +'2438.4 -696.5 -296.0' +'2438.4 -696.5 -296.0' 0 -'1337.2 -466.8 -1000.0' -'1337.2 -466.8 -1000.0' +'2186.0 -645.6 -296.0' +'2186.0 -645.6 -296.0' 0 -'1329.2 555.3 -1000.0' -'1329.2 555.3 -1000.0' +'1795.9 -660.3 -200.0' +'1795.9 -660.3 -200.0' 0 -'1344.0 -73.9 -1000.0' -'1344.0 -73.9 -1000.0' +'1498.9 -671.2 -107.6' +'1498.9 -671.2 -107.6' 0 -'1719.0 -70.9 -1000.0' -'1719.0 -70.9 -1000.0' +'672.1 -664.3 -104.0' +'672.1 -664.3 -104.0' 0 -'1975.6 -68.8 -1000.0' -'1975.6 -68.8 -1000.0' +'1203.7 -684.5 -104.0' +'1203.7 -684.5 -104.0' 0 -'1958.9 -1329.3 -681.0' -'1958.9 -1329.3 -681.0' +'348.0 -641.8 -1.3' +'348.0 -641.8 -1.3' 0 -'1948.2 -1025.2 -744.0' -'1948.2 -1025.2 -744.0' +' 36.2 -664.2 24.0' +' 36.2 -664.2 24.0' 0 -'1327.7 594.4 -744.0' -'1327.7 594.4 -744.0' +'1115.9 1393.3 280.0' +'1115.9 1393.3 280.0' 0 -'1202.3 -523.5 -744.0' -'1202.3 -523.5 -744.0' +'1227.5 1154.8 280.0' +'1227.5 1154.8 280.0' 0 -'1291.4 313.9 -424.0' -'1291.4 313.9 -424.0' +'1152.2 820.6 280.0' +'1152.2 820.6 280.0' 0 -'807.7 677.2 -424.0' -'807.7 677.2 -424.0' +'1186.6 420.5 280.0' +'1186.6 420.5 280.0' 0 -'372.1 983.8 -424.0' -'372.1 983.8 -424.0' +'959.7 400.0 280.0' +'959.7 400.0 280.0' 0 -'155.2 927.1 -424.0' -'155.2 927.1 -424.0' +'697.6 374.3 280.0' +'697.6 374.3 280.0' 0 -'-292.3 966.6 -232.0' -'-292.3 966.6 -232.0' +'649.4 704.4 104.4' +'649.4 704.4 104.4' 0 -'-587.9 899.6 -232.0' -'-587.9 899.6 -232.0' +'679.8 1019.0 419.1' +'679.8 1019.0 419.1' 0 -'-691.2 767.1 -232.0' -'-691.2 767.1 -232.0' +'651.9 1120.8 472.0' +'651.9 1120.8 472.0' 0 -'-690.6 448.8 -141.6' -'-690.6 448.8 -141.6' +'-24.8 1217.0 216.0' +'-24.8 1217.0 216.0' 0 -'-667.6 183.4 -53.1' -'-667.6 183.4 -53.1' +'-360.3 990.6 216.0' +'-360.3 990.6 216.0' 0 -'-740.9 -57.0 24.0' -'-740.9 -57.0 24.0' +'-335.4 863.2 216.0' +'-335.4 863.2 216.0' 0 -'-631.2 -161.1 24.0' -'-631.2 -161.1 24.0' +'-305.4 760.0 216.0' +'-305.4 760.0 216.0' 0 -'816.4 -505.5 -104.0' -'816.4 -505.5 -104.0' +'-161.2 670.2 216.0' +'-161.2 670.2 216.0' 0 -'915.3 -781.7 -104.0' -'915.3 -781.7 -104.0' +'-72.5 158.5 24.0' +'-72.5 158.5 24.0' 0 -'1308.9 -1073.8 -104.0' -'1308.9 -1073.8 -104.0' +'185.0 165.9 24.0' +'185.0 165.9 24.0' 0 -'1185.0 -1130.8 -104.0' -'1185.0 -1130.8 -104.0' +'-137.6 -257.0 24.0' +'-137.6 -257.0 24.0' 0 -'1440.8 -1170.4 -104.0' -'1440.8 -1170.4 -104.0' +'158.1 -263.7 24.0' +'158.1 -263.7 24.0' 0 -'1293.6 927.2 -104.0' -'1293.6 927.2 -104.0' +'400.0 162.6 24.0' +'400.0 162.6 24.0' 0 -'1075.3 914.2 -104.0' -'1075.3 914.2 -104.0' +'1167.2 -481.6 -104.0' +'1167.2 -481.6 -104.0' 0 -'698.0 343.1 -104.0' -'698.0 343.1 -104.0' +'1256.2 -220.8 -104.0' +'1256.2 -220.8 -104.0' +0 +'1100.4 34.1 -104.0' +'1100.4 34.1 -104.0' 0 '833.2 557.5 -104.0' '833.2 557.5 -104.0' 0 -'1100.4 34.1 -104.0' -'1100.4 34.1 -104.0' +'698.0 343.1 -104.0' +'698.0 343.1 -104.0' 0 -'1256.2 -220.8 -104.0' -'1256.2 -220.8 -104.0' +'1075.3 914.2 -104.0' +'1075.3 914.2 -104.0' 0 -'1167.2 -481.6 -104.0' -'1167.2 -481.6 -104.0' +'1293.6 927.2 -104.0' +'1293.6 927.2 -104.0' 0 -'400.0 162.6 24.0' -'400.0 162.6 24.0' +'1440.8 -1170.4 -104.0' +'1440.8 -1170.4 -104.0' 0 -'158.1 -263.7 24.0' -'158.1 -263.7 24.0' +'1185.0 -1130.8 -104.0' +'1185.0 -1130.8 -104.0' 0 -'-137.6 -257.0 24.0' -'-137.6 -257.0 24.0' +'1308.9 -1073.8 -104.0' +'1308.9 -1073.8 -104.0' 0 -'185.0 165.9 24.0' -'185.0 165.9 24.0' +'915.3 -781.7 -104.0' +'915.3 -781.7 -104.0' 0 -'-72.5 158.5 24.0' -'-72.5 158.5 24.0' +'816.4 -505.5 -104.0' +'816.4 -505.5 -104.0' 0 -'-161.2 670.2 216.0' -'-161.2 670.2 216.0' +'-631.2 -161.1 24.0' +'-631.2 -161.1 24.0' 0 -'-305.4 760.0 216.0' -'-305.4 760.0 216.0' +'-740.9 -57.0 24.0' +'-740.9 -57.0 24.0' 0 -'-335.4 863.2 216.0' -'-335.4 863.2 216.0' +'-667.6 183.4 -53.1' +'-667.6 183.4 -53.1' 0 -'-360.3 990.6 216.0' -'-360.3 990.6 216.0' +'-690.6 448.8 -141.6' +'-690.6 448.8 -141.6' 0 -'-24.8 1217.0 216.0' -'-24.8 1217.0 216.0' +'-691.2 767.1 -232.0' +'-691.2 767.1 -232.0' 0 -'651.9 1120.8 472.0' -'651.9 1120.8 472.0' +'-587.9 899.6 -232.0' +'-587.9 899.6 -232.0' 0 -'679.8 1019.0 419.1' -'679.8 1019.0 419.1' +'-292.3 966.6 -232.0' +'-292.3 966.6 -232.0' 0 -'649.4 704.4 104.4' -'649.4 704.4 104.4' +'155.2 927.1 -424.0' +'155.2 927.1 -424.0' 0 -'697.6 374.3 280.0' -'697.6 374.3 280.0' +'372.1 983.8 -424.0' +'372.1 983.8 -424.0' 0 -'959.7 400.0 280.0' -'959.7 400.0 280.0' +'807.7 677.2 -424.0' +'807.7 677.2 -424.0' 0 -'1186.6 420.5 280.0' -'1186.6 420.5 280.0' +'1291.4 313.9 -424.0' +'1291.4 313.9 -424.0' 0 -'1152.2 820.6 280.0' -'1152.2 820.6 280.0' +'1202.3 -523.5 -744.0' +'1202.3 -523.5 -744.0' 0 -'1227.5 1154.8 280.0' -'1227.5 1154.8 280.0' +'1327.7 594.4 -744.0' +'1327.7 594.4 -744.0' 0 -'1115.9 1393.3 280.0' -'1115.9 1393.3 280.0' +'1948.2 -1025.2 -744.0' +'1948.2 -1025.2 -744.0' 0 -' 36.2 -664.2 24.0' -' 36.2 -664.2 24.0' +'1958.9 -1329.3 -681.0' +'1958.9 -1329.3 -681.0' 0 -'348.0 -641.8 -1.3' -'348.0 -641.8 -1.3' +'1975.6 -68.8 -1000.0' +'1975.6 -68.8 -1000.0' 0 -'1203.7 -684.5 -104.0' -'1203.7 -684.5 -104.0' +'1719.0 -70.9 -1000.0' +'1719.0 -70.9 -1000.0' 0 -'672.1 -664.3 -104.0' -'672.1 -664.3 -104.0' +'1344.0 -73.9 -1000.0' +'1344.0 -73.9 -1000.0' 0 -'1498.9 -671.2 -107.6' -'1498.9 -671.2 -107.6' +'1329.2 555.3 -1000.0' +'1329.2 555.3 -1000.0' 0 -'1795.9 -660.3 -200.0' -'1795.9 -660.3 -200.0' +'1337.2 -466.8 -1000.0' +'1337.2 -466.8 -1000.0' 0 -'2186.0 -645.6 -296.0' -'2186.0 -645.6 -296.0' +'1169.9 -871.2 -1000.0' +'1169.9 -871.2 -1000.0' 0 -'2438.4 -696.5 -296.0' -'2438.4 -696.5 -296.0' +'1120.0 -573.4 -1000.0' +'1120.0 -573.4 -1000.0' 0 -'2441.4 -62.1 -296.0' -'2441.4 -62.1 -296.0' +'437.2 1289.8 -232.0' +'437.2 1289.8 -232.0' 0 -'2193.5 -86.1 -296.0' -'2193.5 -86.1 -296.0' +'470.6 975.3 -440.0' +'470.6 975.3 -440.0' 0 -'1361.0 -38.3 -744.0' -'1361.0 -38.3 -744.0' +'2012.7 -1328.6 -744.0' +'2012.7 -1328.6 -744.0' 0 -'1413.2 -528.4 -744.0' -'1413.2 -528.4 -744.0' +'-804.0 1027.5 -232.0' +'-804.0 1027.5 -232.0' 0 -'746.3 -448.2 -744.0' -'746.3 -448.2 -744.0' +'1273.1 260.3 -104.0' +'1273.1 260.3 -104.0' 0 -'522.9 21.7 -744.0' -'522.9 21.7 -744.0' +'2342.2 -267.8 -296.0' +'2342.2 -267.8 -296.0' 0 -'587.2 565.2 -744.0' -'587.2 565.2 -744.0' +'2552.0 -288.6 -296.0' +'2552.0 -288.6 -296.0' 0 -' -0.2 868.5 216.0' -' -0.2 868.5 216.0' +'2323.3 -99.8 -296.0' +'2323.3 -99.8 -296.0' 0 -'-73.2 371.9 216.0' -'-73.2 371.9 216.0' +'2079.1 126.2 -296.0' +'2079.1 126.2 -296.0' 0 -' 6.8 1391.1 216.0' -' 6.8 1391.1 216.0' +'1676.9 104.9 -744.0' +'1676.9 104.9 -744.0' 0 -'791.7 1199.1 -232.0' -'791.7 1199.1 -232.0' +'1812.3 179.6 -744.0' +'1812.3 179.6 -744.0' 0 -'647.3 990.7 -232.0' -'647.3 990.7 -232.0' +'1918.1 234.6 -744.0' +'1918.1 234.6 -744.0' 0 -'315.6 685.0 -424.0' -'315.6 685.0 -424.0' +'2105.1 102.9 -744.0' +'2105.1 102.9 -744.0' 0 -'506.9 981.6 -380.0' -'506.9 981.6 -380.0' +'2094.9 -241.0 -744.0' +'2094.9 -241.0 -744.0' 0 -'384.1 20.7 -488.0' -'384.1 20.7 -488.0' +'1910.3 -368.0 -744.0' +'1910.3 -368.0 -744.0' 0 -'335.1 -385.0 -488.0' -'335.1 -385.0 -488.0' +'1787.9 -283.8 -744.0' +'1787.9 -283.8 -744.0' 0 -'426.4 -774.9 -518.0' -'426.4 -774.9 -518.0' +'1727.5 -223.4 -744.0' +'1727.5 -223.4 -744.0' 0 -'715.0 -1048.3 -648.2' -'715.0 -1048.3 -648.2' +'1733.2 94.3 -744.0' +'1733.2 94.3 -744.0' 0 -'980.6 -932.1 -744.0' -'980.6 -932.1 -744.0' +'345.6 341.0 -744.0' +'345.6 341.0 -744.0' 0 -'741.0 66.8 -424.0' -'741.0 66.8 -424.0' +'531.0 377.7 -744.0' +'531.0 377.7 -744.0' 0 -'1289.5 65.7 -424.0' -'1289.5 65.7 -424.0' +'605.5 -236.5 -744.0' +'605.5 -236.5 -744.0' 0 -'1449.8 -961.9 -744.0' -'1449.8 -961.9 -744.0' +'2412.0 -400.4 -296.0' +'2412.0 -400.4 -296.0' 0 -'1818.0 -1737.7 -200.0' -'1818.0 -1737.7 -200.0' +'1464.0 -1360.9 -424.0' +'1464.0 -1360.9 -424.0' 0 -'1821.4 -1260.8 -200.0' -'1821.4 -1260.8 -200.0' +'1367.5 -1418.2 -424.0' +'1367.5 -1418.2 -424.0' 0 -'1498.7 -1347.7 -426.7' -'1498.7 -1347.7 -426.7' +'1236.6 -1328.5 -424.0' +'1236.6 -1328.5 -424.0' 0 -'1130.4 432.2 -104.0' -'1130.4 432.2 -104.0' +'1677.9 -1163.5 -744.0' +'1677.9 -1163.5 -744.0' 0 -'485.5 1477.5 472.0' -'485.5 1477.5 472.0' +'1790.7 -862.6 -744.0' +'1790.7 -862.6 -744.0' 0 -'802.8 1686.0 359.1' -'802.8 1686.0 359.1' +'1792.4 -1016.2 -744.0' +'1792.4 -1016.2 -744.0' 0 -'1160.6 1673.4 280.0' -'1160.6 1673.4 280.0' +'645.4 -785.5 -567.9' +'645.4 -785.5 -567.9' 0 -'803.6 1111.1 472.0' -'803.6 1111.1 472.0' +'462.9 -479.5 -490.3' +'462.9 -479.5 -490.3' 0 -'507.0 1302.9 472.0' -'507.0 1302.9 472.0' +'376.4 189.6 -488.0' +'376.4 189.6 -488.0' 0 -'210.8 1303.1 216.0' -'210.8 1303.1 216.0' +'1809.8 -1240.7 -504.0' +'1809.8 -1240.7 -504.0' 0 -'2190.2 -1274.2 -744.0' -'2190.2 -1274.2 -744.0' +'1810.3 -1424.9 -200.0' +'1810.3 -1424.9 -200.0' 0 diff --git a/data/qcsrc/server/gamec/havocbot_roles.c b/data/qcsrc/server/gamec/havocbot_roles.c index b1c268704..75b8ab576 100644 --- a/data/qcsrc/server/gamec/havocbot_roles.c +++ b/data/qcsrc/server/gamec/havocbot_roles.c @@ -1,8 +1,14 @@ .float havocbot_role_timeout; +.void() havocbot_previous_role; .float bot_strategytime; .void() havocbot_role; +float(entity e) canreach = +{ + return vlen(self.origin - e.origin) < 1500; +} + void(float ratingscale, vector org, float sradius) havocbot_goalrating_items = { local entity head; @@ -84,6 +90,7 @@ void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplay void() havocbot_role_ctf_middle; void() havocbot_role_ctf_defense; void() havocbot_role_ctf_offense; +void() havocbot_role_ctf_interceptor; void(float ratingscale, vector org, float sradius) havocbot_goalrating_ctf_carrieritems = { @@ -129,6 +136,11 @@ void(float ratingscale) havocbot_goalrating_ctf_enemyflag = navigation_routerating(head, ratingscale); }; +void(float ratingscale) havocbot_goalrating_ctf_enemybase = +{ + // div0: needs a change in the CTF code +}; + void(float ratingscale) havocbot_goalrating_ctf_ourstolenflag = { local entity head; @@ -206,7 +218,7 @@ void() havocbot_role_ctf_carrier = //go to enemy flag void() havocbot_role_ctf_offense = { - //local entity f; + local entity f; if (self.flagcarried) { dprint("changing role to carrier\n"); @@ -214,7 +226,6 @@ void() havocbot_role_ctf_offense = self.havocbot_role_timeout = 0; return; } - /* // check our flag if (self.team == 5) // red f = find(world, classname, "item_flag_team1"); @@ -223,11 +234,11 @@ void() havocbot_role_ctf_offense = if (f.cnt != FLAG_BASE && canreach(f)) { dprint("changing role to interceptor\n"); + self.havocbot_previous_role = self.havocbot_role; self.havocbot_role = havocbot_role_ctf_interceptor; self.havocbot_role_timeout = 0; return; } - */ if (!self.havocbot_role_timeout) self.havocbot_role_timeout = time + random() * 30 + 60; if (self.ammo_rockets < 15 || time > self.havocbot_role_timeout) @@ -243,6 +254,47 @@ void() havocbot_role_ctf_offense = navigation_goalrating_start(); havocbot_goalrating_ctf_ourstolenflag(5000); havocbot_goalrating_ctf_enemyflag(3000); + havocbot_goalrating_ctf_enemybase(2000); + havocbot_goalrating_items(10000, self.origin, 10000); + navigation_goalrating_end(); + } +}; + +//role interceptor (temporary role): +//pick up items +//if carrying flag, change role to flag carrier +//if our flag is back, change role to previous role +//follow our flag +//go to least recently visited area +void() havocbot_role_ctf_interceptor = +{ + local entity f; + if (self.flagcarried) + { + dprint("changing role to carrier\n"); + self.havocbot_role = havocbot_role_ctf_carrier; + self.havocbot_role_timeout = 0; + return; + } + // check our flag + if (self.team == 5) // red + f = find(world, classname, "item_flag_team1"); + else // blue + f = find(world, classname, "item_flag_team2"); + if (f.cnt == FLAG_BASE) + { + dprint("changing role back\n"); + self.havocbot_role = self.havocbot_previous_role; + self.havocbot_role_timeout = 0; + return; + } + + if (self.bot_strategytime < time) + { + self.bot_strategytime = time + cvar("bot_ai_strategyinterval"); + navigation_goalrating_start(); + havocbot_goalrating_ctf_ourstolenflag(5000); + havocbot_goalrating_ctf_droppedflags(5000); havocbot_goalrating_items(10000, self.origin, 10000); navigation_goalrating_end(); } @@ -257,6 +309,7 @@ void() havocbot_role_ctf_offense = //go to least recently visited area void() havocbot_role_ctf_middle = { + local entity f; if (self.flagcarried) { dprint("changing role to carrier\n"); @@ -264,7 +317,6 @@ void() havocbot_role_ctf_middle = self.havocbot_role_timeout = 0; return; } - /* // check our flag if (self.team == 5) // red f = find(world, classname, "item_flag_team1"); @@ -273,11 +325,11 @@ void() havocbot_role_ctf_middle = if (f.cnt != FLAG_BASE && canreach(f)) { dprint("changing role to interceptor\n"); + self.havocbot_previous_role = self.havocbot_role; self.havocbot_role = havocbot_role_ctf_interceptor; self.havocbot_role_timeout = 0; return; } - */ if (!self.havocbot_role_timeout) self.havocbot_role_timeout = time + random() * 10 + 10; if (time > self.havocbot_role_timeout) @@ -325,7 +377,6 @@ void() havocbot_role_ctf_defense = self.havocbot_role_timeout = 0; return; } - /* // check our flag if (self.team == 5) // red f = find(world, classname, "item_flag_team1"); @@ -334,11 +385,11 @@ void() havocbot_role_ctf_defense = if (f.cnt != FLAG_BASE && canreach(f)) { dprint("changing role to interceptor\n"); + self.havocbot_previous_role = self.havocbot_role; self.havocbot_role = havocbot_role_ctf_interceptor; self.havocbot_role_timeout = 0; return; } - */ if (!self.havocbot_role_timeout) self.havocbot_role_timeout = time + random() * 20 + 30; if (self.ammo_rockets < 15 || time > self.havocbot_role_timeout) @@ -353,6 +404,7 @@ void() havocbot_role_ctf_defense = self.bot_strategytime = time + cvar("bot_ai_strategyinterval"); navigation_goalrating_start(); havocbot_goalrating_ctf_ourstolenflag(20000); + havocbot_goalrating_ctf_droppedflags(500); havocbot_goalrating_items(10000, f.origin, 10000); navigation_goalrating_end(); } @@ -433,7 +485,7 @@ void() havocbot_role_dm = self.bot_strategytime = time + cvar("bot_ai_strategyinterval"); navigation_goalrating_start(); havocbot_goalrating_items(10000, self.origin, 10000); - havocbot_goalrating_enemyplayers(1, self.origin, 2000); + havocbot_goalrating_enemyplayers(1, self.origin, 20000); //havocbot_goalrating_waypoints(1, self.origin, 1000); navigation_goalrating_end(); } -- 2.39.2