diff --git a/client/public/databases/units/aircraftdatabase.json b/client/public/databases/units/aircraftdatabase.json index 8462299f..5b11b017 100644 --- a/client/public/databases/units/aircraftdatabase.json +++ b/client/public/databases/units/aircraftdatabase.json @@ -4749,6 +4749,38 @@ "era": "Early Cold War", "shortLabel": "B52", "loadouts": [ + { + "items": [ + { + "name": "8 x AGM-84A Harpoon ASM", + "quantity": 1 + } + ], + "enabled": true, + "code": "AGM-84A*8", + "name": "AGM-84A*8", + "roles": [ + "Antiship Strike" + ] + }, + { + "items": [ + { + "name": "6 x AGM-86D on MER", + "quantity": 2 + }, + { + "name": "8 x AGM-86D", + "quantity": 1 + } + ], + "enabled": true, + "code": "AGM-86C*20", + "name": "AGM-86C*20", + "roles": [ + "Strike" + ] + }, { "items": [], "enabled": true, @@ -4759,21 +4791,6 @@ "Strike" ] }, - { - "items": [ - { - "name": "HSAB with 9 x Mk-83 - 1000lb GP Bombs LD", - "quantity": 2 - } - ], - "enabled": true, - "code": "Mk-84*18", - "name": "Mk-84*18", - "roles": [ - "Strike", - "Runway Attack" - ] - }, { "items": [ { @@ -4793,6 +4810,21 @@ "Runway Attack" ] }, + { + "items": [ + { + "name": "18 x Mk-84 2000lb GP Bombs", + "quantity": 1 + } + ], + "enabled": true, + "code": "Mk-84*18", + "name": "Mk-84*18", + "roles": [ + "Strike", + "Runway Attack" + ] + }, { "items": [ { @@ -4807,38 +4839,6 @@ "Strike", "Runway Attack" ] - }, - { - "items": [ - { - "name": "6 x AGM-86D on MER", - "quantity": 2 - }, - { - "name": "8 x AGM-86D", - "quantity": 1 - } - ], - "enabled": true, - "code": "AGM-86C*20", - "name": "AGM-86C*20", - "roles": [ - "Strike" - ] - }, - { - "items": [ - { - "name": "8 x AGM-84A Harpoon ASM", - "quantity": 1 - } - ], - "enabled": true, - "code": "AGM-84A*8", - "name": "AGM-84A*8", - "roles": [ - "Antiship Strike" - ] } ], "filename": "b-52.png", @@ -12315,16 +12315,6 @@ "era": "Early Cold War", "shortLabel": "86", "loadouts": [ - { - "items": [], - "enabled": true, - "code": "", - "name": "Empty loadout", - "roles": [ - "No task", - "CAP" - ] - }, { "items": [ { @@ -12339,20 +12329,6 @@ "CAP" ] }, - { - "items": [ - { - "name": "Fuel Tank 200 gallons", - "quantity": 2 - } - ], - "enabled": true, - "code": "200gal Fuel*2", - "name": "200gal Fuel*2", - "roles": [ - "CAP" - ] - }, { "items": [ { @@ -12371,23 +12347,6 @@ "CAP" ] }, - { - "items": [ - { - "name": "LAU-7 with AIM-9B Sidewinder IR AAM", - "quantity": 2 - } - ], - "enabled": true, - "code": "GAR-8*2", - "name": "GAR-8*2", - "roles": [ - "CAP", - "CAP", - "Escort", - "CAP" - ] - }, { "items": [ { @@ -12412,17 +12371,34 @@ { "items": [ { - "name": "2 x HVAR, UnGd Rkts", - "quantity": 8 + "name": "Fuel Tank 200 gallons", + "quantity": 2 } ], "enabled": true, - "code": "HVAR*16", - "name": "HVAR*16", + "code": "200gal Fuel*2", + "name": "200gal Fuel*2", + "roles": [ + "CAP" + ] + }, + { + "items": [ + { + "name": "Fuel Tank 200 gallons", + "quantity": 2 + }, + { + "name": "AN-M64 - 500lb GP Bomb LD", + "quantity": 2 + } + ], + "enabled": true, + "code": "200gal Fuel*2, AN-M64*2", + "name": "200gal Fuel*2, AN-M64*2", "roles": [ - "Strike", "CAS", - "Antiship Strike" + "Strike" ] }, { @@ -12460,23 +12436,47 @@ "Antiship Strike" ] }, + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "CAP" + ] + }, { "items": [ { - "name": "Fuel Tank 200 gallons", - "quantity": 2 - }, - { - "name": "AN-M64 - 500lb GP Bomb LD", + "name": "LAU-7 with AIM-9B Sidewinder IR AAM", "quantity": 2 } ], "enabled": true, - "code": "200gal Fuel*2, AN-M64*2", - "name": "200gal Fuel*2, AN-M64*2", + "code": "GAR-8*2", + "name": "GAR-8*2", "roles": [ + "CAP", + "CAP", + "Escort", + "CAP" + ] + }, + { + "items": [ + { + "name": "2 x HVAR, UnGd Rkts", + "quantity": 8 + } + ], + "enabled": true, + "code": "HVAR*16", + "name": "HVAR*16", + "roles": [ + "Strike", "CAS", - "Strike" + "Antiship Strike" ] }, { @@ -12496,7 +12496,7 @@ ] } ], - "filename": "f-5.png", + "filename": "f-86.png", "enabled": true, "liveries": { "us air force (skyblazers)": { @@ -19181,6 +19181,44 @@ "era": "Modern", "shortLabel": "MQ9", "loadouts": [ + { + "items": [ + { + "name": "M299 - 4 x AGM-114K Hellfire", + "quantity": 2 + }, + { + "name": "AGM-114K * 2", + "quantity": 2 + } + ], + "enabled": true, + "code": "AGM-114K*12", + "name": "AGM-114K*12", + "roles": [ + "CAS", + "Strike" + ] + }, + { + "items": [ + { + "name": "M299 - 4 x AGM-114K Hellfire", + "quantity": 2 + }, + { + "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", + "quantity": 2 + } + ], + "enabled": true, + "code": "AGM-114K*8,GBU-38*2", + "name": "AGM-114K*8,GBU-38*2", + "roles": [ + "CAS", + "Strike" + ] + }, { "items": [], "enabled": true, @@ -19220,47 +19258,9 @@ "CAS", "Strike" ] - }, - { - "items": [ - { - "name": "M299 - 4 x AGM-114K Hellfire", - "quantity": 2 - }, - { - "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", - "quantity": 2 - } - ], - "enabled": true, - "code": "AGM-114K*8,GBU-38*2", - "name": "AGM-114K*8,GBU-38*2", - "roles": [ - "CAS", - "Strike" - ] - }, - { - "items": [ - { - "name": "M299 - 4 x AGM-114K Hellfire", - "quantity": 2 - }, - { - "name": "AGM-114K * 2", - "quantity": 2 - } - ], - "enabled": true, - "code": "AGM-114K*12", - "name": "AGM-114K*12", - "roles": [ - "CAS", - "Strike" - ] } ], - "filename": "i-16.png", + "filename": "rq-1.png", "enabled": true, "liveries": { "standard": { diff --git a/client/public/databases/units/default/aircraftdatabase.json b/client/public/databases/units/default/aircraftdatabase.json index 8462299f..5b11b017 100644 --- a/client/public/databases/units/default/aircraftdatabase.json +++ b/client/public/databases/units/default/aircraftdatabase.json @@ -4749,6 +4749,38 @@ "era": "Early Cold War", "shortLabel": "B52", "loadouts": [ + { + "items": [ + { + "name": "8 x AGM-84A Harpoon ASM", + "quantity": 1 + } + ], + "enabled": true, + "code": "AGM-84A*8", + "name": "AGM-84A*8", + "roles": [ + "Antiship Strike" + ] + }, + { + "items": [ + { + "name": "6 x AGM-86D on MER", + "quantity": 2 + }, + { + "name": "8 x AGM-86D", + "quantity": 1 + } + ], + "enabled": true, + "code": "AGM-86C*20", + "name": "AGM-86C*20", + "roles": [ + "Strike" + ] + }, { "items": [], "enabled": true, @@ -4759,21 +4791,6 @@ "Strike" ] }, - { - "items": [ - { - "name": "HSAB with 9 x Mk-83 - 1000lb GP Bombs LD", - "quantity": 2 - } - ], - "enabled": true, - "code": "Mk-84*18", - "name": "Mk-84*18", - "roles": [ - "Strike", - "Runway Attack" - ] - }, { "items": [ { @@ -4793,6 +4810,21 @@ "Runway Attack" ] }, + { + "items": [ + { + "name": "18 x Mk-84 2000lb GP Bombs", + "quantity": 1 + } + ], + "enabled": true, + "code": "Mk-84*18", + "name": "Mk-84*18", + "roles": [ + "Strike", + "Runway Attack" + ] + }, { "items": [ { @@ -4807,38 +4839,6 @@ "Strike", "Runway Attack" ] - }, - { - "items": [ - { - "name": "6 x AGM-86D on MER", - "quantity": 2 - }, - { - "name": "8 x AGM-86D", - "quantity": 1 - } - ], - "enabled": true, - "code": "AGM-86C*20", - "name": "AGM-86C*20", - "roles": [ - "Strike" - ] - }, - { - "items": [ - { - "name": "8 x AGM-84A Harpoon ASM", - "quantity": 1 - } - ], - "enabled": true, - "code": "AGM-84A*8", - "name": "AGM-84A*8", - "roles": [ - "Antiship Strike" - ] } ], "filename": "b-52.png", @@ -12315,16 +12315,6 @@ "era": "Early Cold War", "shortLabel": "86", "loadouts": [ - { - "items": [], - "enabled": true, - "code": "", - "name": "Empty loadout", - "roles": [ - "No task", - "CAP" - ] - }, { "items": [ { @@ -12339,20 +12329,6 @@ "CAP" ] }, - { - "items": [ - { - "name": "Fuel Tank 200 gallons", - "quantity": 2 - } - ], - "enabled": true, - "code": "200gal Fuel*2", - "name": "200gal Fuel*2", - "roles": [ - "CAP" - ] - }, { "items": [ { @@ -12371,23 +12347,6 @@ "CAP" ] }, - { - "items": [ - { - "name": "LAU-7 with AIM-9B Sidewinder IR AAM", - "quantity": 2 - } - ], - "enabled": true, - "code": "GAR-8*2", - "name": "GAR-8*2", - "roles": [ - "CAP", - "CAP", - "Escort", - "CAP" - ] - }, { "items": [ { @@ -12412,17 +12371,34 @@ { "items": [ { - "name": "2 x HVAR, UnGd Rkts", - "quantity": 8 + "name": "Fuel Tank 200 gallons", + "quantity": 2 } ], "enabled": true, - "code": "HVAR*16", - "name": "HVAR*16", + "code": "200gal Fuel*2", + "name": "200gal Fuel*2", + "roles": [ + "CAP" + ] + }, + { + "items": [ + { + "name": "Fuel Tank 200 gallons", + "quantity": 2 + }, + { + "name": "AN-M64 - 500lb GP Bomb LD", + "quantity": 2 + } + ], + "enabled": true, + "code": "200gal Fuel*2, AN-M64*2", + "name": "200gal Fuel*2, AN-M64*2", "roles": [ - "Strike", "CAS", - "Antiship Strike" + "Strike" ] }, { @@ -12460,23 +12436,47 @@ "Antiship Strike" ] }, + { + "items": [], + "enabled": true, + "code": "", + "name": "Empty loadout", + "roles": [ + "No task", + "CAP" + ] + }, { "items": [ { - "name": "Fuel Tank 200 gallons", - "quantity": 2 - }, - { - "name": "AN-M64 - 500lb GP Bomb LD", + "name": "LAU-7 with AIM-9B Sidewinder IR AAM", "quantity": 2 } ], "enabled": true, - "code": "200gal Fuel*2, AN-M64*2", - "name": "200gal Fuel*2, AN-M64*2", + "code": "GAR-8*2", + "name": "GAR-8*2", "roles": [ + "CAP", + "CAP", + "Escort", + "CAP" + ] + }, + { + "items": [ + { + "name": "2 x HVAR, UnGd Rkts", + "quantity": 8 + } + ], + "enabled": true, + "code": "HVAR*16", + "name": "HVAR*16", + "roles": [ + "Strike", "CAS", - "Strike" + "Antiship Strike" ] }, { @@ -12496,7 +12496,7 @@ ] } ], - "filename": "f-5.png", + "filename": "f-86.png", "enabled": true, "liveries": { "us air force (skyblazers)": { @@ -19181,6 +19181,44 @@ "era": "Modern", "shortLabel": "MQ9", "loadouts": [ + { + "items": [ + { + "name": "M299 - 4 x AGM-114K Hellfire", + "quantity": 2 + }, + { + "name": "AGM-114K * 2", + "quantity": 2 + } + ], + "enabled": true, + "code": "AGM-114K*12", + "name": "AGM-114K*12", + "roles": [ + "CAS", + "Strike" + ] + }, + { + "items": [ + { + "name": "M299 - 4 x AGM-114K Hellfire", + "quantity": 2 + }, + { + "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", + "quantity": 2 + } + ], + "enabled": true, + "code": "AGM-114K*8,GBU-38*2", + "name": "AGM-114K*8,GBU-38*2", + "roles": [ + "CAS", + "Strike" + ] + }, { "items": [], "enabled": true, @@ -19220,47 +19258,9 @@ "CAS", "Strike" ] - }, - { - "items": [ - { - "name": "M299 - 4 x AGM-114K Hellfire", - "quantity": 2 - }, - { - "name": "GBU-38(V)1/B - JDAM, 500lb GPS Guided Bomb", - "quantity": 2 - } - ], - "enabled": true, - "code": "AGM-114K*8,GBU-38*2", - "name": "AGM-114K*8,GBU-38*2", - "roles": [ - "CAS", - "Strike" - ] - }, - { - "items": [ - { - "name": "M299 - 4 x AGM-114K Hellfire", - "quantity": 2 - }, - { - "name": "AGM-114K * 2", - "quantity": 2 - } - ], - "enabled": true, - "code": "AGM-114K*12", - "name": "AGM-114K*12", - "roles": [ - "CAS", - "Strike" - ] } ], - "filename": "i-16.png", + "filename": "rq-1.png", "enabled": true, "liveries": { "standard": { diff --git a/client/public/databases/units/default/groundunitdatabase.json b/client/public/databases/units/default/groundunitdatabase.json index 602b4ab3..a58fb24a 100644 --- a/client/public/databases/units/default/groundunitdatabase.json +++ b/client/public/databases/units/default/groundunitdatabase.json @@ -3820,7 +3820,7 @@ } }, "acquisitionRange": 0, - "engagementRange": 35000, + "engagementRange": 30000, "description": "M270 Multiple Launch Rocket System. Tracked. Fires M26 270 mm DPICM rockets. Min range 10km, max 35km. Note cluster munition can be very laggy with many shots.", "abilities": "Combined arms, Indirect Fire", "canTargetPoint": true, @@ -7563,11 +7563,11 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 18700, + "engagementRange": 18400, "description": "SpGH Dana 77. Wheeled. Self propelled 152mm howitzer. 1km min range, 18km max.", "abilities": "Combined arms, Indirect fire", "canTargetPoint": true, - "tags": "CA", + "tags": "152mm, CA", "markerFile": "groundunit-artillery", "indirectFire": true, "aimTime": 60, @@ -7586,14 +7586,14 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 1000, + "engagementRange": 18500, "description": "MT-LBu IV12 series tracked. Artillery command / recon vehicle, not an arty piece, speeds up artillery fire time in game when grouped.", "abilities": "Combined arms, AA, Fast Artillery", "canTargetPoint": true, "canRearm": false, "barrelHeight": 3, "muzzleVelocity": 900, - "aimTime": 60, + "aimTime": 5, "shotsToFire": 2, "tags": "Command, CA", "markerFile": "groundunit-artillery", @@ -8096,12 +8096,12 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 320000, + "engagementRange": 283000, "description": "SS-1C Scud-B wheeled vehicle firing R-17 tactical ballistic missile. 50 km min range, 300 km max. Approx 700 m CEP. Long setup time, check if the stabilisers are moving to see if launch command worked.", "abilities": "", "canTargetPoint": true, "canRearm": false, - "tags": "Missile", + "tags": "Ballistic Missile", "markerFile": "groundunit-artillery", "aimTime": 300, "shotsToFire": 1, @@ -8289,7 +8289,7 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 15000, + "engagementRange": 4900, "description": "Technical with a B8M1 80mm rocket pod on the back. 1km min range, max 15km.", "abilities": "Combined Arms, Indirect Fire.", "canTargetPoint": true, @@ -9392,7 +9392,7 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 23500, + "engagementRange": 22000, "description": "PLZ-05 or the Type 05 tracked self propelled howitzer. 155 mm main gun with 12.7 mm machine gun. 1km min range, 22km max.", "abilities": "Combined arms, indirect fire", "canTargetPoint": true, diff --git a/client/public/databases/units/default/navyunitdatabase.json b/client/public/databases/units/default/navyunitdatabase.json index e4d642dd..5533b518 100644 --- a/client/public/databases/units/default/navyunitdatabase.json +++ b/client/public/databases/units/default/navyunitdatabase.json @@ -4,7 +4,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-71 Theodore Roosevelt (SC)", + "label": "CVN-71 Theodore Roosevelt", "shortLabel": "CVN-71", "range": "Short", "filename": "", @@ -12,7 +12,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -22,7 +22,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-72 Abraham Lincoln (SC)", + "label": "CVN-72 Abraham Lincoln", "shortLabel": "CVN-72", "range": "Short", "filename": "", @@ -30,7 +30,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -40,7 +40,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-73 George Washington (SC)", + "label": "CVN-73 George Washington", "shortLabel": "CVN-73", "range": "Medium", "filename": "", @@ -48,7 +48,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -58,7 +58,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-75 Harry S. Truman (SC)", + "label": "CVN-75 Harry S. Truman", "shortLabel": "CVN-75", "range": "Medium", "filename": "", @@ -88,7 +88,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -130,7 +130,7 @@ "acquisitionRange": 25000, "engagementRange": 3000, "tags": "", - "description": "HMS Leeds Castle. Smaller. Patrol craft", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -220,7 +220,7 @@ "acquisitionRange": 150000, "engagementRange": 20000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -608,7 +608,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -644,7 +644,7 @@ "acquisitionRange": 100000, "engagementRange": 30000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -704,13 +704,13 @@ "acquisitionRange": 260000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false }, "Type_054A": { - "name": "", + "name": "Type_054A", "coalition": "red", "type": "Combatants", "era": "Modern", @@ -872,7 +872,7 @@ "acquisitionRange": 160000, "engagementRange": 45000, "tags": "", - "description": "Ship", + "description": "", "abilities": "35nm >50,000ft range" }, "Type_071": { @@ -926,7 +926,7 @@ "acquisitionRange": 300000, "engagementRange": 150000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1084,7 +1084,7 @@ "acquisitionRange": 18000, "engagementRange": 5000, "tags": "", - "description": "ARA Vienticinco de Mayo. Conventional CATOBAR carrier", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1102,7 +1102,7 @@ "acquisitionRange": 100000, "engagementRange": 74000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1120,7 +1120,7 @@ "acquisitionRange": 180000, "engagementRange": 8000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1138,7 +1138,7 @@ "acquisitionRange": 180000, "engagementRange": 140000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1156,7 +1156,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1174,7 +1174,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1192,7 +1192,7 @@ "acquisitionRange": 180000, "engagementRange": 140000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1233,7 +1233,7 @@ "canRearm": false }, "PERRY": { - "name": "perry", + "name": "PERRY", "coalition": "blue", "type": "Combatants", "era": "Mid Cold War", @@ -1293,7 +1293,7 @@ "canRearm": false }, "ALBATROS": { - "name": "albatros", + "name": "ALBATROS", "coalition": "red", "type": "Combatants", "era": "Modern", @@ -1349,7 +1349,7 @@ "canRearm": false }, "KUZNECOW": { - "name": "kuznecow", + "name": "KUZNECOW", "coalition": "red", "type": "Aircraft Carrier", "era": "Late Cold War", @@ -1367,7 +1367,7 @@ "canRearm": false }, "MOLNIYA": { - "name": "molniya", + "name": "MOLNIYA", "coalition": "", "type": "Combatants", "era": "Late Cold War", @@ -1399,7 +1399,7 @@ "canRearm": false }, "MOSCOW": { - "name": "moscow", + "name": "MOSCOW", "coalition": "red", "type": "Combatants", "era": "Late Cold War", @@ -1435,13 +1435,13 @@ "canRearm": false }, "NEUSTRASH": { - "name": "neustrash", + "name": "NEUSTRASH", "coalition": "red", "type": "Combatants", "era": "Late Cold War", "label": "Neustrashimy", "shortLabel": "Neustrashimy", - "range": "Short", + "range": "", "filename": "", "enabled": true, "acquisitionRange": 27000, @@ -1470,13 +1470,13 @@ "canRearm": false }, "REZKY": { - "name": "Rezky (Krivak-2)", + "name": "REZKY", "coalition": "red", "type": "Combatants", "era": "WW2", "label": "Rezky (Krivak-2)", "shortLabel": "Rezky", - "range": "Short", + "range": "", "filename": "", "enabled": true, "acquisitionRange": 30000, @@ -1488,7 +1488,7 @@ "canRearm": false }, "ELNYA": { - "name": "elnya", + "name": "ELNYA", "coalition": "red", "type": "Cargo/Transport", "era": "Late Cold War", @@ -1554,7 +1554,7 @@ "canRearm": false }, "ZWEZDNY": { - "name": "zwezdny", + "name": "ZWEZDNY", "coalition": "", "type": "Cargo/Transport", "era": "Modern", @@ -1572,7 +1572,7 @@ "canRearm": false }, "KILO": { - "name": "kilo", + "name": "KILO", "coalition": "red", "type": "Submarine", "era": "Mid Cold War", diff --git a/client/public/databases/units/groundunitdatabase.json b/client/public/databases/units/groundunitdatabase.json index 602b4ab3..a58fb24a 100644 --- a/client/public/databases/units/groundunitdatabase.json +++ b/client/public/databases/units/groundunitdatabase.json @@ -3820,7 +3820,7 @@ } }, "acquisitionRange": 0, - "engagementRange": 35000, + "engagementRange": 30000, "description": "M270 Multiple Launch Rocket System. Tracked. Fires M26 270 mm DPICM rockets. Min range 10km, max 35km. Note cluster munition can be very laggy with many shots.", "abilities": "Combined arms, Indirect Fire", "canTargetPoint": true, @@ -7563,11 +7563,11 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 18700, + "engagementRange": 18400, "description": "SpGH Dana 77. Wheeled. Self propelled 152mm howitzer. 1km min range, 18km max.", "abilities": "Combined arms, Indirect fire", "canTargetPoint": true, - "tags": "CA", + "tags": "152mm, CA", "markerFile": "groundunit-artillery", "indirectFire": true, "aimTime": 60, @@ -7586,14 +7586,14 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 1000, + "engagementRange": 18500, "description": "MT-LBu IV12 series tracked. Artillery command / recon vehicle, not an arty piece, speeds up artillery fire time in game when grouped.", "abilities": "Combined arms, AA, Fast Artillery", "canTargetPoint": true, "canRearm": false, "barrelHeight": 3, "muzzleVelocity": 900, - "aimTime": 60, + "aimTime": 5, "shotsToFire": 2, "tags": "Command, CA", "markerFile": "groundunit-artillery", @@ -8096,12 +8096,12 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 320000, + "engagementRange": 283000, "description": "SS-1C Scud-B wheeled vehicle firing R-17 tactical ballistic missile. 50 km min range, 300 km max. Approx 700 m CEP. Long setup time, check if the stabilisers are moving to see if launch command worked.", "abilities": "", "canTargetPoint": true, "canRearm": false, - "tags": "Missile", + "tags": "Ballistic Missile", "markerFile": "groundunit-artillery", "aimTime": 300, "shotsToFire": 1, @@ -8289,7 +8289,7 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 15000, + "engagementRange": 4900, "description": "Technical with a B8M1 80mm rocket pod on the back. 1km min range, max 15km.", "abilities": "Combined Arms, Indirect Fire.", "canTargetPoint": true, @@ -9392,7 +9392,7 @@ "enabled": true, "liveries": {}, "acquisitionRange": 0, - "engagementRange": 23500, + "engagementRange": 22000, "description": "PLZ-05 or the Type 05 tracked self propelled howitzer. 155 mm main gun with 12.7 mm machine gun. 1km min range, 22km max.", "abilities": "Combined arms, indirect fire", "canTargetPoint": true, diff --git a/client/public/databases/units/navyunitdatabase.json b/client/public/databases/units/navyunitdatabase.json index e4d642dd..5533b518 100644 --- a/client/public/databases/units/navyunitdatabase.json +++ b/client/public/databases/units/navyunitdatabase.json @@ -4,7 +4,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-71 Theodore Roosevelt (SC)", + "label": "CVN-71 Theodore Roosevelt", "shortLabel": "CVN-71", "range": "Short", "filename": "", @@ -12,7 +12,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -22,7 +22,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-72 Abraham Lincoln (SC)", + "label": "CVN-72 Abraham Lincoln", "shortLabel": "CVN-72", "range": "Short", "filename": "", @@ -30,7 +30,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -40,7 +40,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-73 George Washington (SC)", + "label": "CVN-73 George Washington", "shortLabel": "CVN-73", "range": "Medium", "filename": "", @@ -48,7 +48,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -58,7 +58,7 @@ "coalition": "blue", "type": "Aircraft Carrier", "era": "Late Cold War", - "label": "CVN-75 Harry S. Truman (SC)", + "label": "CVN-75 Harry S. Truman", "shortLabel": "CVN-75", "range": "Medium", "filename": "", @@ -88,7 +88,7 @@ "acquisitionRange": 50000, "engagementRange": 25000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": false, "canRearm": false @@ -130,7 +130,7 @@ "acquisitionRange": 25000, "engagementRange": 3000, "tags": "", - "description": "HMS Leeds Castle. Smaller. Patrol craft", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -220,7 +220,7 @@ "acquisitionRange": 150000, "engagementRange": 20000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -608,7 +608,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -644,7 +644,7 @@ "acquisitionRange": 100000, "engagementRange": 30000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -704,13 +704,13 @@ "acquisitionRange": 260000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false }, "Type_054A": { - "name": "", + "name": "Type_054A", "coalition": "red", "type": "Combatants", "era": "Modern", @@ -872,7 +872,7 @@ "acquisitionRange": 160000, "engagementRange": 45000, "tags": "", - "description": "Ship", + "description": "", "abilities": "35nm >50,000ft range" }, "Type_071": { @@ -926,7 +926,7 @@ "acquisitionRange": 300000, "engagementRange": 150000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1084,7 +1084,7 @@ "acquisitionRange": 18000, "engagementRange": 5000, "tags": "", - "description": "ARA Vienticinco de Mayo. Conventional CATOBAR carrier", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1102,7 +1102,7 @@ "acquisitionRange": 100000, "engagementRange": 74000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1120,7 +1120,7 @@ "acquisitionRange": 180000, "engagementRange": 8000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1138,7 +1138,7 @@ "acquisitionRange": 180000, "engagementRange": 140000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1156,7 +1156,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1174,7 +1174,7 @@ "acquisitionRange": 150000, "engagementRange": 100000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1192,7 +1192,7 @@ "acquisitionRange": 180000, "engagementRange": 140000, "tags": "", - "description": "Ship", + "description": "", "abilities": "", "canTargetPoint": true, "canRearm": false @@ -1233,7 +1233,7 @@ "canRearm": false }, "PERRY": { - "name": "perry", + "name": "PERRY", "coalition": "blue", "type": "Combatants", "era": "Mid Cold War", @@ -1293,7 +1293,7 @@ "canRearm": false }, "ALBATROS": { - "name": "albatros", + "name": "ALBATROS", "coalition": "red", "type": "Combatants", "era": "Modern", @@ -1349,7 +1349,7 @@ "canRearm": false }, "KUZNECOW": { - "name": "kuznecow", + "name": "KUZNECOW", "coalition": "red", "type": "Aircraft Carrier", "era": "Late Cold War", @@ -1367,7 +1367,7 @@ "canRearm": false }, "MOLNIYA": { - "name": "molniya", + "name": "MOLNIYA", "coalition": "", "type": "Combatants", "era": "Late Cold War", @@ -1399,7 +1399,7 @@ "canRearm": false }, "MOSCOW": { - "name": "moscow", + "name": "MOSCOW", "coalition": "red", "type": "Combatants", "era": "Late Cold War", @@ -1435,13 +1435,13 @@ "canRearm": false }, "NEUSTRASH": { - "name": "neustrash", + "name": "NEUSTRASH", "coalition": "red", "type": "Combatants", "era": "Late Cold War", "label": "Neustrashimy", "shortLabel": "Neustrashimy", - "range": "Short", + "range": "", "filename": "", "enabled": true, "acquisitionRange": 27000, @@ -1470,13 +1470,13 @@ "canRearm": false }, "REZKY": { - "name": "Rezky (Krivak-2)", + "name": "REZKY", "coalition": "red", "type": "Combatants", "era": "WW2", "label": "Rezky (Krivak-2)", "shortLabel": "Rezky", - "range": "Short", + "range": "", "filename": "", "enabled": true, "acquisitionRange": 30000, @@ -1488,7 +1488,7 @@ "canRearm": false }, "ELNYA": { - "name": "elnya", + "name": "ELNYA", "coalition": "red", "type": "Cargo/Transport", "era": "Late Cold War", @@ -1554,7 +1554,7 @@ "canRearm": false }, "ZWEZDNY": { - "name": "zwezdny", + "name": "ZWEZDNY", "coalition": "", "type": "Cargo/Transport", "era": "Modern", @@ -1572,7 +1572,7 @@ "canRearm": false }, "KILO": { - "name": "kilo", + "name": "KILO", "coalition": "red", "type": "Submarine", "era": "Mid Cold War", diff --git a/src/core/src/groundunit.cpp b/src/core/src/groundunit.cpp index 72a5078e..f40e73b7 100644 --- a/src/core/src/groundunit.cpp +++ b/src/core/src/groundunit.cpp @@ -316,10 +316,10 @@ void GroundUnit::AIloop() canAAA = databaseEntry[L"canAAA"].as_bool(); } - /* Only perform scenic functions when the scheduler is "free" */ - if (scheduler->getLoad() == 0 && canAAA) { + if (canAAA) { + /* Only perform scenic functions when the scheduler is "free" */ /* Only run this when the internal counter reaches 0 to avoid excessive computations when no nearby target */ - if (internalCounter == 0) { + if (scheduler->getLoad() == 0 && internalCounter == 0) { double distance = 0; unsigned char unitCoalition = coalition == 0 ? getOperateAs() : coalition; unsigned char targetCoalition = unitCoalition == 2 ? 1 : 2;