Version 68

Merge pull request #312 from Nomads-Project/develop
FAForever · Aug 12, 2017 · 5c7709c · 5c7709c
2 parents a2bb4e0 + 919dd3c
commit 5c7709c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua b/lua/AI/PlatoonTemplates/EngineerPlatoonTemplates.lua
@@ -60,15 +60,15 @@ 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' }
     },
 }
 
 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' }
         },
     }
-}
+}
diff --git 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 = ""

diff --git 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",

diff --git a/units/INA0001/INA0001_unit.bp b/units/INA0001/INA0001_unit.bp
@@ -33,17 +33,16 @@ UnitBlueprint {
     Description = '<LOC ina0001_desc>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',
                 },
             },
         },

diff --git a/units/INB2302/INB2302_script.lua b/units/INB2302/INB2302_script.lua
@@ -145,8 +145,13 @@ 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(self.oldRoF)
+        end
     end,
 
     OnArtilleryUnitKilledUnit = function(self, unitKilled)
@@ -177,4 +182,4 @@ INB2302 = Class(NStructureUnit) {
     end,
 }
 
-TypeClass = INB2302
+TypeClass = INB2302
diff --git 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',