From 83d34460886fbfafd113ee3d84b38eaf30fb6cd4 Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Mon, 17 Jul 2017 00:51:53 +0200 Subject: [PATCH 1/7] Add "- categories.ENGINEERSTATION" to PlatoonTemplate this commit is a copy of the access violation error that uveso spotted (and that got fixed in normal faf) This prevents the Ai from using ENGINEERSTATION in functions: EngineerBuildAI TransferAI ENGINEERSTATION will still used inside function ManagerEngineerAssistAI. So they will assist but don't move. fixes #310 --- lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua b/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua index ae5e8ccd..bd887334 100644 --- a/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua +++ b/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua @@ -60,7 +60,7 @@ PlatoonTemplate { Name = 'T2EngineerBuilder', Plan = 'EngineerBuildAI', GlobalSquads = { - { categories.ENGINEER * categories.TECH2 - categories.FIELDENGINEER, 1, 1, 'support', 'None' } + { categories.ENGINEER * categories.TECH2 - categories.FIELDENGINEER - categories.ENGINEERSTATION, 1, 1, 'support', 'None' } }, } @@ -68,7 +68,7 @@ PlatoonTemplate { Name = 'T2EngineerTransfer', Plan = 'TransferAI', GlobalSquads = { - { categories.ENGINEER * categories.TECH2 - categories.FIELDENGINEER, 1, 1, 'support', 'none' }, + { categories.ENGINEER * categories.TECH2 - categories.FIELDENGINEER - categories.ENGINEERSTATION, 1, 1, 'support', 'none' }, }, } @@ -84,7 +84,7 @@ PlatoonTemplate { Name = 'CybranT2EngineerBuilder', Plan = 'EngineerBuildAI', GlobalSquads = { - { categories.CYBRAN * categories.ENGINEER * categories.TECH2, 1, 1, 'support', 'None' } + { categories.CYBRAN * categories.ENGINEER * categories.TECH2 - categories.ENGINEERSTATION, 1, 1, 'support', 'None' } }, } @@ -108,7 +108,7 @@ PlatoonTemplate { Name = 'T3EngineerTransfer', Plan = 'TransferAI', GlobalSquads = { - { categories.ENGINEER * categories.TECH3, 1, 1, 'support', 'none' }, + { categories.ENGINEER * categories.TECH3 - categories.ENGINEERSTATION, 1, 1, 'support', 'none' }, }, } @@ -132,7 +132,7 @@ PlatoonTemplate { Name = 'CybranT3EngineerBuilder', Plan = 'EngineerBuildAI', GlobalSquads = { - { categories.CYBRAN * categories.ENGINEER * ( categories.TECH3 + categories.SUBCOMMANDER ), 1, 1, 'support', 'None' } + { categories.CYBRAN * categories.ENGINEER * ( categories.TECH3 + categories.SUBCOMMANDER ) - categories.ENGINEERSTATION, 1, 1, 'support', 'None' } }, } @@ -207,4 +207,4 @@ PlatoonTemplate { { 'inu2001', 1, 1, 'support', 'None' } }, } -} \ No newline at end of file +} From 4449f5f8a02f6ce09ba434e4855efcde8f2341aa Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Thu, 20 Jul 2017 13:42:40 +0200 Subject: [PATCH 2/7] fix/ t3 arty adjacency not handled correctly Adds a callback after firing the satellite that checks if the rate of fire of the arty building was changed (by adjacency for example) from the last time it was fired and adjusts the satellite accordingly --- units/INB2302/INB2302_script.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/units/INB2302/INB2302_script.lua b/units/INB2302/INB2302_script.lua index 5cfff1e9..ad507820 100644 --- a/units/INB2302/INB2302_script.lua +++ b/units/INB2302/INB2302_script.lua @@ -147,6 +147,10 @@ INB2302 = Class(NStructureUnit) { OnArtilleryUnitFired = function(self) -- called each time the gun fires a projectile + if self.oldRoF ~= self.GetWeaponByLabel('TargetFinder').RateOfFire then + self.oldRoF = self.GetWeaponByLabel('TargetFinder').RateOfFire + self.ArtilleryUnit:GetWeaponByLabel('MainGun'):ChangeRateOfFire(oldRoF) + end end, OnArtilleryUnitKilledUnit = function(self, unitKilled) @@ -177,4 +181,4 @@ INB2302 = Class(NStructureUnit) { end, } -TypeClass = INB2302 \ No newline at end of file +TypeClass = INB2302 From 719a3422b85f6e1d7713a8afaef3ca2c62b62f7a Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Fri, 21 Jul 2017 00:56:54 +0200 Subject: [PATCH 3/7] remove unused LOD from orbital frigate --- units/INO0001/INO0001_unit.bp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/units/INO0001/INO0001_unit.bp b/units/INO0001/INO0001_unit.bp index 139f27e5..f61a8ae0 100644 --- a/units/INO0001/INO0001_unit.bp +++ b/units/INO0001/INO0001_unit.bp @@ -37,11 +37,6 @@ UnitBlueprint { Mesh = { IconFadeInZoom = 130, LODs = { - { - LODCutoff = 10000, - Scrolling = true, - ShaderName = 'NomadsUnit', - }, { LODCutoff = 10000, ShaderName = 'NomadsUnit', From 1f21a789e6ace9c7fbbfa1e380856cd97e383910 Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Fri, 21 Jul 2017 00:57:30 +0200 Subject: [PATCH 4/7] enh/ small fixes for t3 arty buff handling --- units/INB2302/INB2302_script.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/units/INB2302/INB2302_script.lua b/units/INB2302/INB2302_script.lua index ad507820..9b6300a4 100644 --- a/units/INB2302/INB2302_script.lua +++ b/units/INB2302/INB2302_script.lua @@ -145,11 +145,12 @@ INB2302 = Class(NStructureUnit) { self:ForkThread( self.WatchFireState ) end, + --oldRoF = 0.05, OnArtilleryUnitFired = function(self) -- called each time the gun fires a projectile - if self.oldRoF ~= self.GetWeaponByLabel('TargetFinder').RateOfFire then - self.oldRoF = self.GetWeaponByLabel('TargetFinder').RateOfFire - self.ArtilleryUnit:GetWeaponByLabel('MainGun'):ChangeRateOfFire(oldRoF) + if self.oldRoF ~= self:GetWeaponByLabel('TargetFinder').RateOfFire then + self.oldRoF = self:GetWeaponByLabel('TargetFinder').RateOfFire + self.ArtilleryUnit:GetWeaponByLabel('MainGun'):ChangeRateOfFire(self.oldRoF) end end, From 02c25766c4fd054dea10d1297f6ed64682432925 Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Fri, 21 Jul 2017 00:59:51 +0200 Subject: [PATCH 5/7] fix/ remove not existent sinking animation from INA0001 --- units/INA0001/INA0001_unit.bp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/units/INA0001/INA0001_unit.bp b/units/INA0001/INA0001_unit.bp index 06ea21f5..8f10061c 100644 --- a/units/INA0001/INA0001_unit.bp +++ b/units/INA0001/INA0001_unit.bp @@ -33,17 +33,16 @@ UnitBlueprint { Description = 'Meteor Dropship', Display = { AnimationOpen = '/units/INA0001/INA0001_AOpen.sca', - AnimationSink = '/units/INA0001/INA0001_ASink.sca', Mesh = { IconFadeInZoom = 2000, LODs = { { - AlbedoName = '/Units/INA0001/INA0001_Albedo.dds', + AlbedoName = '/units/INA0001/INA0001_Albedo.dds', LODCutoff = 215, - MeshName = '/Units/INA0001/INA0001_LOD0.scm', - NormalsName = '/UNITS/INA0001/INA0001_NormalsTS.dds', + MeshName = '/units/INA0001/INA0001_Lod0.scm', + NormalsName = '/units/INA0001/INA0001_normalsTS.dds', ShaderName = 'NomadsUnit', - SpecularName = '/Units/INA0001/INA0001_SpecTeam.dds', + SpecularName = '/units/INA0001/INA0001_SpecTeam.dds', }, }, }, From 667bbb5fadbf47e61239ace5f0f1d831b16d434f Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Thu, 10 Aug 2017 12:59:59 +0200 Subject: [PATCH 6/7] enh/ add nomads t3 missile arty to hotbuild key --- nomadhook/lua/keymap/unitkeygroups.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/nomadhook/lua/keymap/unitkeygroups.lua b/nomadhook/lua/keymap/unitkeygroups.lua index ce1c64c3..4e57edbf 100644 --- a/nomadhook/lua/keymap/unitkeygroups.lua +++ b/nomadhook/lua/keymap/unitkeygroups.lua @@ -172,6 +172,7 @@ unitkeygroups = { ["Arties"] = { "Artillery_Installation", + "inb3303", --Nomads t3 missile artillery "Heavy_Artillery_Installation", "T3_Strategic_Bomber", From 919dd3c8740d1549eab52b2402d7665228a0840e Mon Sep 17 00:00:00 2001 From: CookieNoob Date: Sat, 12 Aug 2017 09:01:59 +0200 Subject: [PATCH 7/7] bump version --- mod_info.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod_info.lua b/mod_info.lua index 4de67c81..b1d85e2f 100644 --- a/mod_info.lua +++ b/mod_info.lua @@ -1,9 +1,9 @@ name = "nomads" -version = 67 +version = 68 copyright = "brute51" description = "adds a new faction to the game" author = "CookieNoob, Exotic_Retard, Brute51, original nomads team" -uid = "50423624-1e83-4fc2-85b3-nomadsv00067" +uid = "50423624-1e83-4fc2-85b3-nomadsv00068" url = "" icon = "" identifier = ""