Cleaning up of files pt. 1 (FAForever#3971)

speed2CZ · Jun 25, 2022 · 30a19ea · 30a19ea
1 parent e2172bd
commit 30a19ea
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 49 deletions.
diff --git a/effects/Entities/DebrisBoneAttachLow01/DebrisBoneAttachLow01_script.lua b/effects/Entities/DebrisBoneAttachLow01/DebrisBoneAttachLow01_script.lua
@@ -1,10 +1,8 @@
---
 -- script for projectile BoneAttached
---
+
 local GenericDebris = import('/lua/genericdebris.lua').GenericDebris
 DebrisBoneAttachLow01 = Class(GenericDebris) {
     FxUnitHitScale = 0.25,
-    FxWaterHitScale = 0.25,
     FxUnderWaterHitScale = 0.25,
     FxNoneHitScale = 0.25,
     FxWaterHitScale = 0.25,
@@ -13,6 +11,4 @@ DebrisBoneAttachLow01 = Class(GenericDebris) {
     FxTrailScale = 1,
 }
 
-
-TypeClass = DebrisBoneAttachLow01
-
+TypeClass = DebrisBoneAttachLow01
diff --git a/etc/faf/mapblacklist.lua b/etc/faf/mapblacklist.lua
@@ -839,9 +839,6 @@ MapBlacklist = {
     ['regicide.v0002'] = true,
     ['regicide.v0003'] = true,
     ['regicide.v0004'] = true,
-    ['regor_ultimate.v0001'] = true,
-    ['regor_ultimate.v0002'] = true,
-    ['regor_ultimate.v0003'] = true,
     ['regor_vi_highlands.v0001'] = true,
     ['regor_vi_highlands.v0002'] = true,
     ['regor_vi_highlands.v0003'] = true,
@@ -1743,13 +1740,6 @@ MapBlacklist = {
     ['wonder_open_ultimate.v0003'] = true,
     ['wonder_open_ultimate.v0002'] = true,
     ['wonder_open_ultimate.v0001'] = true,
-    ['diversity_ultimate.v0007'] = true,
-    ['diversity_ultimate.v0006'] = true,
-    ['diversity_ultimate.v0005'] = true,
-    ['diversity_ultimate.v0004'] = true,
-    ['diversity_ultimate.v0003'] = true,
-    ['diversity_ultimate.v0002'] = true,
-    ['diversity_ultimate.v0001'] = true,
     ['flooded_tabula_rasa_ultimate.v0012'] = true,
     ['flooded_tabula_rasa_ultimate.v0011'] = true,
     ['flooded_tabula_rasa_ultimate.v0010'] = true,
@@ -1854,12 +1844,6 @@ MapBlacklist = {
     ['zeta_wonder_ultimate.v0002'] = true,
     ['zeta_wonder_ultimate.v0001'] = true,
     ['africa_ultimate.v0001'] = true,
-    ['fields_of_great_phoenix_ultimate.v0006'] = true,
-    ['fields_of_great_phoenix_ultimate.v0005'] = true,
-    ['fields_of_great_phoenix_ultimate.v0004'] = true,
-    ['fields_of_great_phoenix_ultimate.v0003'] = true,
-    ['fields_of_great_phoenix_ultimate.v0002'] = true,
-    ['fields_of_great_phoenix_ultimate.v0001'] = true,
     ['twin_rivers_ultimate.v0005'] = true,
     ['twin_rivers_ultimate.v0004'] = true,
     ['twin_rivers_ultimate.v0003'] = true,

diff --git a/lua/AI/AIBuilders/SorianSeaAttackBuilders.lua b/lua/AI/AIBuilders/SorianSeaAttackBuilders.lua
@@ -7,21 +7,9 @@
 --**  Copyright © 2005 Gas Powered Games, Inc.  All rights reserved.
 --****************************************************************************
 
-local BBTmplFile = '/lua/basetemplates.lua'
-local BuildingTmpl = 'BuildingTemplates'
-local BaseTmpl = 'BaseTemplates'
-local ExBaseTmpl = 'ExpansionBaseTemplates'
-local Adj2x2Tmpl = 'Adjacency2x2'
 local UCBC = '/lua/editor/UnitCountBuildConditions.lua'
-local MIBC = '/lua/editor/MiscBuildConditions.lua'
-local MABC = '/lua/editor/MarkerBuildConditions.lua'
 local IBC = '/lua/editor/InstantBuildConditions.lua'
-local OAUBC = '/lua/editor/OtherArmyUnitCountBuildConditions.lua'
-local EBC = '/lua/editor/EconomyBuildConditions.lua'
-local PCBC = '/lua/editor/PlatoonCountBuildConditions.lua'
 local TBC = '/lua/editor/ThreatBuildConditions.lua'
-local SAI = '/lua/ScenarioPlatoonAI.lua'
-local PlatoonFile = '/lua/platoon.lua'
 local SBC = '/lua/editor/SorianBuildConditions.lua'
 local SIBC = '/lua/editor/SorianInstantBuildConditions.lua'
 
@@ -352,16 +340,14 @@ BuilderGroup {
         Priority = 100,
         InstanceCount = 5,
         BuilderType = 'Any',
-        BuilderData = {
-        UseFormation = 'AttackFormation',
-        },
         BuilderConditions = {
             { UCBC, 'PoolGreaterAtLocation', { 'LocationType', 0, 'MOBILE TECH2 NAVAL' } },
             { UCBC, 'HaveUnitsWithCategoryAndAlliance', { true, 1, categories.STRUCTURE * categories.DEFENSE * categories.ANTINAVY, 'Enemy'}},
             { SeaAttackCondition, { 'LocationType', 60 } },
             { SBC, 'NoRushTimeCheck', { 0 }},
         },
         BuilderData = {
+            UseFormation = 'AttackFormation',
             SearchRadius = 6000,
             PrioritizedCategories = {
                 'STRUCTURE DEFENSE ANTINAVY TECH2',
@@ -553,3 +539,18 @@ BuilderGroup {
     BuilderGroupName = 'SorianMassHunterSeaFormBuilders',
     BuildersType = 'PlatoonFormBuilder',
 }
+
+
+-- kept for mod compatibility, as they may depend on these
+local BBTmplFile = '/lua/basetemplates.lua'
+local BuildingTmpl = 'BuildingTemplates'
+local BaseTmpl = 'BaseTemplates'
+local ExBaseTmpl = 'ExpansionBaseTemplates'
+local Adj2x2Tmpl = 'Adjacency2x2'
+local MIBC = '/lua/editor/MiscBuildConditions.lua'
+local MABC = '/lua/editor/MarkerBuildConditions.lua'
+local OAUBC = '/lua/editor/OtherArmyUnitCountBuildConditions.lua'
+local EBC = '/lua/editor/EconomyBuildConditions.lua'
+local PCBC = '/lua/editor/PlatoonCountBuildConditions.lua'
+local SAI = '/lua/ScenarioPlatoonAI.lua'
+local PlatoonFile = '/lua/platoon.lua'
diff --git a/lua/AI/AIBuilders/SorianStrategyPlatoonBuilders.lua b/lua/AI/AIBuilders/SorianStrategyPlatoonBuilders.lua
@@ -7,20 +7,12 @@
 --**  Copyright © 2005 Gas Powered Games, Inc.  All rights reserved.
 --****************************************************************************
 
-local BBTmplFile = '/lua/basetemplates.lua'
-local BuildingTmpl = 'BuildingTemplates'
-local BaseTmpl = 'BaseTemplates'
 local ExBaseTmpl = 'ExpansionBaseTemplates'
-local Adj2x2Tmpl = 'Adjacency2x2'
 local UCBC = '/lua/editor/UnitCountBuildConditions.lua'
 local MIBC = '/lua/editor/MiscBuildConditions.lua'
-local MABC = '/lua/editor/MarkerBuildConditions.lua'
 local IBC = '/lua/editor/InstantBuildConditions.lua'
-local OAUBC = '/lua/editor/OtherArmyUnitCountBuildConditions.lua'
 local EBC = '/lua/editor/EconomyBuildConditions.lua'
-local PCBC = '/lua/editor/PlatoonCountBuildConditions.lua'
 local SAI = '/lua/ScenarioPlatoonAI.lua'
-local PlatoonFile = '/lua/platoon.lua'
 local SBC = '/lua/editor/SorianBuildConditions.lua'
 local SIBC = '/lua/editor/SorianInstantBuildConditions.lua'
 
@@ -185,7 +177,6 @@ BuilderGroup {
     Builder {
         BuilderName = 'Sorian T3 Engineer Assist Experimental Mobile Air - Excess Mass',
         PlatoonTemplate = 'T3EngineerAssistSorian',
-        Priority = 0.1,
         Priority = 981,
         InstanceCount = 15,
         BuilderConditions = {
@@ -1758,3 +1749,13 @@ BuilderGroup {
         },
     },
 }
+
+-- kept for mod compatibility, as they may depend on these
+local BBTmplFile = '/lua/basetemplates.lua'
+local BuildingTmpl = 'BuildingTemplates'
+local BaseTmpl = 'BaseTemplates'
+local Adj2x2Tmpl = 'Adjacency2x2'
+local MABC = '/lua/editor/MarkerBuildConditions.lua'
+local OAUBC = '/lua/editor/OtherArmyUnitCountBuildConditions.lua'
+local PCBC = '/lua/editor/PlatoonCountBuildConditions.lua'
+local PlatoonFile = '/lua/platoon.lua'
diff --git a/lua/AI/OpAI/BaseManagerPlatoonThreads.lua b/lua/AI/OpAI/BaseManagerPlatoonThreads.lua
@@ -6,12 +6,10 @@
 ------------------------------------------------------------------------------
 
 local AIUtils = import('/lua/ai/aiutilities.lua')
-local AIAttackUtils = import('/lua/ai/aiattackutilities.lua')
 local AMPlatoonHelperFunctions = import('/lua/editor/AMPlatoonHelperFunctions.lua')
 local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
 local SUtils = import('/lua/AI/sorianutilities.lua')
 local TriggerFile = import('/lua/scenariotriggers.lua')
-local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')
 local Buff = import('/lua/sim/Buff.lua')
 
 local BMBC = import('/lua/editor/basemanagerbuildconditions.lua')
@@ -1145,7 +1143,7 @@ function BaseManagerTMLAI(platoon)
                 if EntityCategoryContains(categories.STRUCTURE, target) or simpleTargetting then
                     IssueTactical({unit}, target)
                 else
-                    targPos = SUtils.LeadTarget(platoon, target)
+                    local targPos = SUtils.LeadTarget(platoon, target)
                     if targPos then
                         IssueTactical({unit}, targPos)
                     end
@@ -1291,3 +1289,7 @@ function UnitUpgradeThread(unit)
         WaitSeconds(5)
     end
 end
+
+-- kept for mod compatibility, as they may depend on these
+local AIAttackUtils = import('/lua/ai/aiattackutilities.lua')
+local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')