Minor LOUD and FAF compatibilities, hovercraft build listing.

The-Balthazar · Dec 29, 2018 · e6ace29 · e6ace29
1 parent d8c4d23
commit e6ace29
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/mods/BrewLAN/documentation/Changelog.md b/mods/BrewLAN/documentation/Changelog.md
@@ -456,6 +456,14 @@ All changes by Sean Wheeldon (Balthazar) unless otherwise stated.
   * RPS: Finished the script to generate the armor definitions table, which was more complicated than I was planning.
   * RPS: Corrected the blueprint script not properly handling experimental footfall damage.
 
+  ### 2018-12-23
+
+  * R&D: Removed some dependencies on BrewLAN.
+
+  ### 2018-12-23
+
+  * Caffe Corretto: Removed hard requirement for BrewLAN.
+
 ## 2018-08-09|81-FAF-develop (FAF exclusive release)
 
 * Fixed transports.

diff --git a/mods/BrewLAN_Gameplay/StolenTech/mod_info.lua b/mods/BrewLAN_Gameplay/StolenTech/mod_info.lua
@@ -2,9 +2,8 @@ name = "Stolen Tech"
 uid = "16678e1e-7fc9-11e5-8bcf-STOLENTECH00"
 version = 0
 copyright = "© Various"
-description = "Some FA, FAF, & LOUD features for SC and FA. With a BrewLAN flavour."
+description = "Modifies the ALT-F2 cheatspawn menu, inspired by the FAF variant of it, for use with FA and the original Supreme Commander."
 author = "Sean Wheeldon"
---icon = "/mods/BrewLAN_Gameplay/TeaD/mod_icon.dds"
 selectable = true
 enabled = true
 exclusive = false

diff --git a/mods/BrewLAN_Units/BrewResearch/hook/lua/defaultunits.lua b/mods/BrewLAN_Units/BrewResearch/hook/lua/defaultunits.lua
@@ -2,8 +2,7 @@
 -- Research item stuff
 --------------------------------------------------------------------------------
 local Game = import('/lua/game.lua')
-local BrewLANPath = Game.BrewLANPath()
-local VersionIsFAF = import(BrewLANPath .. "/lua/legacy/versioncheck.lua").VersionIsFAF()
+local VersionIsFAF = function() return string.sub(GetVersion(),1,3) == '1.5' and tonumber(string.sub(GetVersion(),5)) > 3603 end
 --------------------------------------------------------------------------------
 ResearchItem = Class(DummyUnit) {
     OnCreate = function(self)
@@ -65,7 +64,7 @@ ResearchItem = Class(DummyUnit) {
         elseif VersionIsFAF then
             --FAF restrictions
             local restrictedCategories = categories.NOTHINGIMPORTANT
-            for id, bool in import('/lua/game.lua').GetRestrictions().Global do
+            for id, bool in Game.GetRestrictions().Global do
                 restrictedCategories = restrictedCategories + categories[id]
                 --Also restrict research items of blocked things.
                 --The there is no easy way to do this the other ways.
@@ -109,7 +108,9 @@ ResearchItem = Class(DummyUnit) {
 --------------------------------------------------------------------------------
 -- Research Center AI
 --------------------------------------------------------------------------------
-local Buff = import(BrewLANPath .. '/lua/legacy/VersionCheck.lua').Buff
+local Buff = {}
+--Wizardry to make FA buff scripts not break the game on original SupCom.
+if not string.sub(GetVersion(),1,3) == '1.1' or string.sub(GetVersion(),1,3) == '1.0' then Buff = import('/lua/sim/Buff.lua') else Buff.ApplyBuff = function() end end
 --------------------------------------------------------------------------------
 ResearchFactoryUnit = Class(FactoryUnit) {
 

diff --git a/mods/BrewLAN_Units/BrewResearch/hook/lua/sim/AdjacencyBuffs.lua b/mods/BrewLAN_Units/BrewResearch/hook/lua/sim/AdjacencyBuffs.lua
@@ -8,6 +8,7 @@ BuffBlueprint {
     Stacks = 'ALWAYS',
     Duration = -1,
     EntityCategory = 'STRUCTURE WINDTURBINE SIZE4',
+    ParsedEntityCategory = categories.STRUCTURE * categories.WINDTURBINE * categories.SIZE4,
     BuffCheckFunction = AdjBuffFuncs.EnergyProductionBuffCheck,
     OnBuffAffect = AdjBuffFuncs.EnergyProductionBuffAffect,
     OnBuffRemove = AdjBuffFuncs.EnergyProductionBuffRemove,
@@ -150,6 +151,7 @@ BuffBlueprint {Name = 'Tier2ResearchEnergyBuildBonus',
     Stacks = 'ALWAYS',
     Duration = -1,
     EntityCategory = 'STRUCTURE',
+    ParsedEntityCategory = categories.STRUCTURE,
     BuffCheckFunction = AdjBuffFuncs.EnergyBuildBuffCheck,
     OnBuffAffect = AdjBuffFuncs.EnergyBuildBuffAffect,
     OnBuffRemove = AdjBuffFuncs.EnergyBuildBuffRemove,
@@ -167,6 +169,7 @@ BuffBlueprint {Name = 'ResearchEnergyBuildNerf',
     Stacks = 'ALWAYS',
     Duration = -1,
     EntityCategory = 'STRUCTURE',
+    ParsedEntityCategory = categories.STRUCTURE,
     BuffCheckFunction = AdjBuffFuncs.EnergyBuildBuffCheck,
     OnBuffAffect = AdjBuffFuncs.EnergyBuildBuffAffect,
     OnBuffRemove = AdjBuffFuncs.EnergyBuildBuffRemove,
@@ -184,6 +187,7 @@ BuffBlueprint {Name = 'Tier2ResearchMassBuildBonus',
     Stacks = 'ALWAYS',
     Duration = -1,
     EntityCategory = 'STRUCTURE',
+    ParsedEntityCategory = categories.STRUCTURE,
     BuffCheckFunction = AdjBuffFuncs.MassBuildBuffCheck,
     OnBuffAffect = AdjBuffFuncs.MassBuildBuffAffect,
     OnBuffRemove = AdjBuffFuncs.MassBuildBuffRemove,
@@ -201,6 +205,7 @@ BuffBlueprint {Name = 'ResearchMassBuildBonusNerf',
     Stacks = 'ALWAYS',
     Duration = -1,
     EntityCategory = 'STRUCTURE',
+    ParsedEntityCategory = categories.STRUCTURE,
     BuffCheckFunction = AdjBuffFuncs.MassBuildBuffCheck,
     OnBuffAffect = AdjBuffFuncs.MassBuildBuffAffect,
     OnBuffRemove = AdjBuffFuncs.MassBuildBuffRemove,

diff --git a/mods/BrewLAN_Units/BrewResearch/lua/CustomUnits/RND.lua b/mods/BrewLAN_Units/BrewResearch/lua/CustomUnits/RND.lua
@@ -1,4 +1,11 @@
 UnitList = {
+
+    ----------------------------------------------------------------------------
+    -- Hovercraft factory
+    ----------------------------------------------------------------------------
+    T1LandFactory = {
+        Aeon = {'sab0105', 15},
+    },
     ----------------------------------------------------------------------------
     -- T2 Bombers
     ----------------------------------------------------------------------------

diff --git a/mods/BrewLAN_Units/BrewTurrets/mod_info.lua b/mods/BrewLAN_Units/BrewTurrets/mod_info.lua
@@ -9,10 +9,10 @@ selectable = true
 enabled = true
 exclusive = false
 ui_only = false
-requires = {"25D57D85-7D84-27HT-A501-BR3WL4N000082"}
-requiresNames = {
-    ["25D57D85-7D84-27HT-A501-BR3WL4N000082"] = "BrewLAN 0.8",
-}
+--requires = {"25D57D85-7D84-27HT-A501-BR3WL4N000082"}
+--requiresNames = {
+--    ["25D57D85-7D84-27HT-A501-BR3WL4N000082"] = "BrewLAN 0.8",
+--}
 conflicts = { }
 before = { }
 after = { }