Skip to content

Commit

Permalink
Fix for Sorian AI to be able to use support factories (FAForever#3173)
Browse files Browse the repository at this point in the history
Fixed Sorian, so He'll be able to make support factories.
  • Loading branch information
Azraeel authored Nov 19, 2020
1 parent 12a4533 commit 6d78157
Show file tree
Hide file tree
Showing 14 changed files with 997 additions and 575 deletions.
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianExpansionAirFull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuildersExpansion',
'SorianT2BalancedUpgradeBuildersExpansion',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianExpansionBalancedFull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuildersExpansion',
'SorianT2BalancedUpgradeBuildersExpansion',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianExpansionBalancedSmall.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuildersExpansion',
'SorianT2BalancedUpgradeBuildersExpansion',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianExpansionTurtleFull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuildersExpansion',
'SorianT2BalancedUpgradeBuildersExpansion',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianExpansionWaterFull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuildersExpansion',
'SorianT2BalancedUpgradeBuildersExpansion',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianMainAir.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ BaseBuilderTemplate {
'SorianT1BalancedUpgradeBuilders',
'SorianT2BalancedUpgradeBuilders',
'SorianEmergencyUpgradeBuilders',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',
'SorianMassFabPause',

# Engineer Builders
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianMainBalanced.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuilders',
'SorianT2BalancedUpgradeBuilders',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',
'SorianEmergencyUpgradeBuilders',
'SorianMassFabPause',

Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianMainRush.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ BaseBuilderTemplate {
'SorianT1RushUpgradeBuilders',
'SorianT2BalancedUpgradeBuilders',
'SorianEmergencyUpgradeBuilders',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',
'SorianMassFabPause',

# Engineer Builders
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianMainTurtle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ BaseBuilderTemplate {
'SorianT1BalancedUpgradeBuilders',
'SorianT2BalancedUpgradeBuilders',
'SorianEmergencyUpgradeBuilders',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',
'SorianMassFabPause',

# Engineer Builders
Expand Down
2 changes: 2 additions & 0 deletions lua/AI/AIBaseTemplates/SorianMainWater.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ BaseBuilderTemplate {
'SorianT1NavalUpgradeBuilders',
'SorianT2NavalUpgradeBuilders',
'SorianEmergencyUpgradeBuilders',
'SorianSupportFactoryUpgrades',
'SorianSupportFactoryUpgradesNAVY',
'SorianMassFabPause',

# Engineer Builders
Expand Down
1 change: 1 addition & 0 deletions lua/AI/AIBaseTemplates/SorianNavalExpansionLarge.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1NavalUpgradeBuilders',
'SorianT2NavalUpgradeBuilders',
'SorianSupportFactoryUpgradesNAVY',

# Pass engineers to main as needed
#'Engineer Transfers',
Expand Down
1 change: 1 addition & 0 deletions lua/AI/AIBaseTemplates/SorianNavalExpansionSmall.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BaseBuilderTemplate {
# Factory upgrades
'SorianT1BalancedUpgradeBuilders',
'SorianT2BalancedUpgradeBuilders',
'SorianSupportFactoryUpgradesNAVY',

# Engineer Builders
'SorianEngineerFactoryBuilders',
Expand Down
1,404 changes: 829 additions & 575 deletions lua/AI/AIBuilders/SorianEconomyUpgradeBuilders.lua

Large diffs are not rendered by default.

146 changes: 146 additions & 0 deletions lua/AI/PlatoonTemplates/SorianPlatoonTemplatesFactory.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
-- Factory upgrade templates are not implemented into FAF !!!

-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandFactoryUpgrade',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.FACTORY * categories.LAND - categories.SUPPORTFACTORY, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandSupFactoryUpgrade1',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.UEF * categories.TECH2 * categories.SUPPORTFACTORY * categories.LAND, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandSupFactoryUpgrade2',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.AEON * categories.TECH2 * categories.SUPPORTFACTORY * categories.LAND, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandSupFactoryUpgrade3',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.CYBRAN * categories.TECH2 * categories.SUPPORTFACTORY * categories.LAND, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandSupFactoryUpgrade4',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.SERAPHIM * categories.TECH2 * categories.SUPPORTFACTORY * categories.LAND, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2LandSupFactoryUpgrade5',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.SUPPORTFACTORY * categories.LAND - categories.SERAPHIM - categories.CYBRAN - categories.AEON - categories.UEF, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirFactoryUpgrade',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.FACTORY * categories.AIR - categories.SUPPORTFACTORY, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirSupFactoryUpgrade1',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.UEF * categories.TECH2 * categories.SUPPORTFACTORY * categories.AIR, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirSupFactoryUpgrade2',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.AEON * categories.TECH2 * categories.SUPPORTFACTORY * categories.AIR, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirSupFactoryUpgrade3',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.CYBRAN * categories.TECH2 * categories.SUPPORTFACTORY * categories.AIR, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirSupFactoryUpgrade4',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.SERAPHIM * categories.TECH2 * categories.SUPPORTFACTORY * categories.AIR, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2AirSupFactoryUpgrade5',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.SUPPORTFACTORY * categories.AIR - categories.SERAPHIM - categories.CYBRAN - categories.AEON - categories.UEF, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaFactoryUpgrade',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.FACTORY * categories.NAVAL - categories.SUPPORTFACTORY, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaSupFactoryUpgrade1',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.UEF * categories.TECH2 * categories.SUPPORTFACTORY * categories.NAVAL, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaSupFactoryUpgrade2',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.AEON * categories.TECH2 * categories.SUPPORTFACTORY * categories.NAVAL, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaSupFactoryUpgrade3',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.CYBRAN * categories.TECH2 * categories.SUPPORTFACTORY * categories.NAVAL, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaSupFactoryUpgrade4',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.SERAPHIM * categories.TECH2 * categories.SUPPORTFACTORY * categories.NAVAL, 1, 1, 'support', 'none' }
}
}
-- AI Patch. Fix Support factory upgrade
PlatoonTemplate {
Name = 'T2SeaSupFactoryUpgrade5',
Plan = 'UnitUpgradeAI',
GlobalSquads = {
{ categories.TECH2 * categories.SUPPORTFACTORY * categories.NAVAL - categories.SERAPHIM - categories.CYBRAN - categories.AEON - categories.UEF, 1, 1, 'support', 'none' }
}
}

0 comments on commit 6d78157

Please sign in to comment.