FAForever · Garanas · Mar 26, 2022 · Mar 20, 2022 · Mar 20, 2022 · Mar 26, 2022
diff --git a/etc/faf/blacklist.lua b/etc/faf/blacklist.lua
@@ -43,14 +43,11 @@ Blacklist = {
     ['98785b7a-9e9e-4863-abb3-46aaf1caef80'] = INTEGRATED,
 
     -- GAZ_UI (already merged)
-    ['4f8b5ac3-346c-4d25-ac34-7b8ccc14eb0a'] = INTEGRATED,
-    ['CC5A5288-18E3-11DD-BF33-005055D89593'] = INTEGRATED,
-    ['e9bb4b11-2952-4b19-bf4e-11fb6e5fcbe9'] = INTEGRATED,
-    ['CC5A5288-18E3-11DD-BF33-005055D89593'] = INTEGRATED,
-    ['e9bb4b11-2952-4b19-bf4e-11fe6e5fcbe9'] = INTEGRATED,
+    -- ['4f8b5ac3-346c-4d25-ac34-7b8ccc14eb0a'] = INTEGRATED,
     ['CC5A5288-18E3-11DD-BF33-005055D89593'] = INTEGRATED,
     ['e9bb4b11-2952-4b19-bf4e-11fb6e5fcbe9'] = INTEGRATED,
 
+
     -- MoreUnitInfo
     ['CC51528A-1823-113D-BF33-044655D89593'] = INTEGRATED,
     ['9B5F858A-163C-4AF1-B846-A884572E61A4'] = INTEGRATED,
@@ -194,8 +191,4 @@ Blacklist = {
     -- cheat mods
     ['086060ea-6452-466d-b576-f756f9c913ef'] = HARMFUL, --Quality of Performance v3
     ['086061ea-6452-466d-b576-f756f9c913ef'] = HARMFUL, --Quality of Performance v4
-
-    -- cheat mod
-    ['086060ea-6452-466d-b576-f756f9c913ef'] = HARMFUL, --Quality of Performance v3
-    ['086061ea-6452-466d-b576-f756f9c913ef'] = HARMFUL, --Quality of Performance v4
 }
diff --git a/etc/faf/mapblacklist.lua b/etc/faf/mapblacklist.lua
@@ -107,7 +107,6 @@ MapBlacklist = {
     ['adaptive_ians_cross.v0001'] = true,
     ['adaptive_setons_clutch.v0001'] = true,
     ['adaptive_twilight_hill.v0001'] = true,
-    ['adaptive_twin_rivers.v0001'] = true,
     ['adaptive_point_of_reach.v0001'] = true,
     ['adaptive_waters_of_random_noobs.v0001'] = true,
     ['adaptive_waters_of_random_noobs.v0002'] = true,

diff --git a/lua/keymap/alternativeKeyMap.lua b/lua/keymap/alternativeKeyMap.lua
@@ -160,7 +160,6 @@ defaultKeyMap = {
 debugKeyMap = {
     ['Ctrl-Alt-N']          = 'debug_nodamage',
     ['Alt-F2']              = 'debug_create_unit',
-    ['Ctrl-Alt-B']          = 'debug_blingbling',
     ['Alt-Delete']          = 'debug_destroy_units',
     ['Ctrl-F9']             = 'debug_toggle_log_window',
     ['Ctrl-Shift-C']        = 'debug_copy_units',

diff --git a/lua/keymap/hotbuildKeyMap.lua b/lua/keymap/hotbuildKeyMap.lua
@@ -158,7 +158,6 @@ debugKeyMap = {
     ['Ctrl-Alt-N']          = 'debug_nodamage',
     ['Alt-F2']              = 'debug_create_unit',
     ['Ctrl-T']              = 'debug_teleport',
-    ['Ctrl-Alt-B']          = 'debug_blingbling',
     ['Alt-Delete']          = 'debug_destroy_units',
     ['Ctrl-F9']             = 'debug_toggle_log_window',
     ['Ctrl-Shift-C']        = 'debug_copy_units',

diff --git a/lua/keymap/keydescriptions.lua b/lua/keymap/keydescriptions.lua
@@ -223,7 +223,6 @@ keyDescriptions = {
     ['toggle_markers_screen'] = 'Toggle marker information window, requires cheats to be enabled',
     ['toggle_profiler'] = 'Toggles the profiler. This is a debug tool, abuse is bannable',
     ['toggle_profiler_window'] = 'Toggles the profiler window. This is a debug tool, abuse is bannable',
-    ['toggle_ai_screen'] = 'Toggle AI blueprint information window, requires cheats to be enabled',
 
     -- GAZUI
     ['toggle_repeat_build'] = '<LOC key_desc_0185>Toggle factory repeat build',

diff --git a/lua/ui/game/buildmodedata.lua b/lua/ui/game/buildmodedata.lua
@@ -403,7 +403,6 @@ local CybranT3Sea = {
 local CybranCrabBot = {
     ['E'] = 'xrl0002',
     ['A'] = 'xrl0003',
-    ['N'] = 'xrl0004',
     ['R'] = 'xrl0005',
     ['N'] = 'drlk001',
 }

diff --git a/lua/ui/game/commandgraphparams.lua b/lua/ui/game/commandgraphparams.lua
@@ -45,7 +45,6 @@ CommandGraphParams = {
     },
     UNITCOMMAND_Retaliate = {inherit_from = 'UNITCOMMAND_Attack'},
     UNITCOMMAND_FormAttack = {inherit_from = 'UNITCOMMAND_Attack'},
-    UNITCOMMAND_OverCharge = {inherit_from = 'UNITCOMMAND_Attack'},
     UNITCOMMAND_Tactical = {inherit_from = 'UNITCOMMAND_Attack'},
     UNITCOMMAND_Script = {inherit_from = 'UNITCOMMAND_Attack'},
     UNITCOMMAND_AggressiveMove = {
@@ -186,7 +185,6 @@ CommandGraphParams = {
     UNITCOMMAND_Stop = {inherit_from = 'default'},
     UNITCOMMAND_Land = {inherit_from = 'default'},
     UNITCOMMAND_Upgrade = {inherit_from = 'default'},
-    UNITCOMMAND_Script = {inherit_from = 'default'},
     UNITCOMMAND_AssistCommander = {inherit_from = 'default'},
     UNITCOMMAND_KillSelf = {inherit_from = 'default'},
     UNITCOMMAND_DestroySelf = {inherit_from = 'default'},

diff --git a/lua/ui/game/nukelaunchping.lua b/lua/ui/game/nukelaunchping.lua
@@ -38,7 +38,7 @@ function DoNukePing(NukeLaunchData)
         end
 
         if pingOkFlag then
-            local data = {Owner = army, Type = pingType, Location = position, Type = pingType}
+            local data = {Owner = army, Type = pingType, Location = position}
             data = table.merged(data, PingTypes[pingType])
             SimCallback({Func = 'SpawnSpecialPing', Args = data})
         end

diff --git a/lua/ui/help/tooltips.lua b/lua/ui/help/tooltips.lua
@@ -46,11 +46,6 @@ Tooltips = {
         description = "<LOC tooltipui0300>Units will not engage enemies",
         keyID = "mode",
     },
-    mode_aggressive = {
-        title = "<LOC tooltipui0301>Ground Fire",
-        description = "<LOC tooltipui0302>Units will attack targeted positions rather attack-move",
-        keyID = "mode",
-    },
     mode_return_fire = {
         title = "<LOC tooltipui0303>Return Fire",
         description = "<LOC tooltipui0304>Units will move and engage normally",
@@ -1336,18 +1331,6 @@ Tooltips = {
         title = "<LOC tooltipui0219>Score",
         description = "<LOC tooltipui0220>Sort by Overall Performance",
     },
-    PostScore_kills = {
-        title = "<LOC tooltipui0221>Kills",
-        description = "<LOC tooltipui0222>Sort by Units Destroyed",
-    },
-    PostScore_built = {
-        title = "<LOC tooltipui0223>Built",
-        description = "<LOC tooltipui0224>Sort by Structures Built",
-    },
-    PostScore_lost = {
-        title = "<LOC tooltipui0225>Losses",
-        description = "<LOC tooltipui0226>Sort by Units Lost",
-    },
     PostScore_cdr = {
         title = "<LOC tooltipui0231>Command Units",
         description = "<LOC tooltipui0232>Sort by Command Units",
@@ -2031,10 +2014,6 @@ Tooltips = {
     -- **********************
     -- ** Misc
     -- **********************
-    minimap_reset = {
-        title = "<LOC tooltipui0625>Reset Minimap",
-        description = "<LOC tooltipui0626>Sets the minimap to its default position and size",
-    },
     no_rush_clock = {
         title = "<LOC tooltipui0627>No Rush Clock",
         description = "<LOC tooltipui0628>Displays time remaining in the no rush clock",

diff --git a/units/XEC8009/XEC8009_unit.bp b/units/XEC8009/XEC8009_unit.bp
@@ -106,10 +106,6 @@ UnitBlueprint {
         VisionRadius = 0,
         WaterVisionRadius = 0,
     },
-    Intel = {
-        VisionRadius = 0,
-        WaterVisionRadius = 0,
-    },
     Interface = {
         HelpText = '<LOC xec8009_help>UEF Wall Segment',
     },

diff --git a/units/XEC8010/XEC8010_unit.bp b/units/XEC8010/XEC8010_unit.bp
@@ -106,10 +106,6 @@ UnitBlueprint {
         VisionRadius = 0,
         WaterVisionRadius = 0,
     },
-    Intel = {
-        VisionRadius = 0,
-        WaterVisionRadius = 0,
-    },
     Interface = {
         HelpText = '<LOC xec8010_help>UEF Wall Segment',
     },

diff --git a/units/XEC8011/XEC8011_unit.bp b/units/XEC8011/XEC8011_unit.bp
@@ -106,10 +106,6 @@ UnitBlueprint {
         VisionRadius = 0,
         WaterVisionRadius = 0,
     },
-    Intel = {
-        VisionRadius = 0,
-        WaterVisionRadius = 0,
-    },
     Interface = {
         HelpText = '<LOC xec8011_help>UEF Wall Segment',
     },

diff --git a/units/XEC8012/XEC8012_unit.bp b/units/XEC8012/XEC8012_unit.bp
@@ -106,10 +106,6 @@ UnitBlueprint {
         VisionRadius = 0,
         WaterVisionRadius = 0,
     },
-    Intel = {
-        VisionRadius = 0,
-        WaterVisionRadius = 0,
-    },
     Interface = {
         HelpText = '<LOC xec8012_help>UEF Wall Segment',
     },

diff --git a/units/XRS0205/XRS0205_unit.bp b/units/XRS0205/XRS0205_unit.bp
@@ -53,8 +53,6 @@ UnitBlueprint {
         'OVERLAYRADAR',
         'OVERLAYSONAR',
     },
-    CollisionOffsetY = -0.15,
-    CollisionOffsetZ = 0.1,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Normal',
@@ -221,6 +219,7 @@ UnitBlueprint {
     SizeY = 1.5,
     SizeZ = 3.6,
     CollisionOffsetY = -0.4,
+    CollisionOffsetZ = 0.1,
     StrategicIconName = 'icon_ship2_counterintel',
     StrategicIconSortPriority = 165,
     Weapon = {