Version 70

Merge pull request #328 from FAForever/develop
FAForever · May 27, 2018 · 75a1aa4 · 75a1aa4
2 parents 89ddbe4 + f52ee68
commit 75a1aa4
Show file tree

Hide file tree

Showing 40 changed files with 543 additions and 319 deletions.
diff --git a/mod_info.lua b/mod_info.lua
@@ -1,9 +1,9 @@
 name = "Nomads"
-version = 69
+version = 70
 copyright = "brute51"
 description = "Adds a new faction to the game"
 author = "CookieNoob, Exotic_Retard, Brute51, original nomads team"
-uid = "50423624-1e83-4fc2-85b3-nomadsv00069"
+uid = "50423624-1e83-4fc2-85b3-nomadsv00070"
 url = ""
 icon = ""
 identifier = ""

diff --git a/projectiles/NTorpedo2/NTorpedo2_proj.bp b/projectiles/NTorpedo2/NTorpedo2_proj.bp
@@ -0,0 +1,71 @@
+ProjectileBlueprint {
+    Audio = {
+        EnterWater = Sound {
+            Bank = 'URAWeapon',
+            Cue = 'URA0204_Torpedo_Water',
+            LodCutoff = 'UnitMove_LodCutoff',
+        },
+        Impact = Sound {
+            Bank = 'Impacts',
+            Cue = 'Impact_Water_Splash_AEON',
+            LodCutoff = 'Weapon_LodCutoff',
+        },
+        ImpactWater = Sound {
+            Bank = 'Impacts',
+            Cue = 'Impact_Water_Splash_AEON',
+            LodCutoff = 'Weapon_LodCutoff',
+        },
+    },
+    Categories = {
+        'NOMADS',
+        'PROJECTILE',
+        'ANTINAVY',
+        'NOSPLASHDAMAGE',
+    },
+    Defense = {
+        Health = 1,
+    },
+    Display = {
+        CameraFollowTimeout = 2,
+        CameraFollowsProjectile = true,
+        Mesh = {
+            LODs = {
+                {
+                    AlbedoName = '/projectiles/TANAnglerTorpedo01/TANAnglerTorpedo01_albedo.dds',
+                    LODCutoff = 150,
+                    MeshName = '/projectiles/TANAnglerTorpedo01/TANAnglerTorpedo01_lod0.scm',
+                    ShaderName = 'TMeshGlow',
+                },
+            },
+        },
+        StrategicIconSize = 1,
+        UniformScale = 0.15,
+    },
+    DoNotCollideList = {
+        'TORPEDO',
+    },
+    General = {
+        Category = 'Anti Navy',
+        EntityCategory = {
+            'NOMADS',
+            'PROJECTILE',
+            'ANTINAVY',
+        },
+        Faction = 'Nomads',
+        Weapon = 'Torpedo2Proj',
+    },
+    Interface = {
+        HelpText = 0,
+    },
+    Physics = {
+        Acceleration = 5,
+        DestroyOnWater = false,
+        InitialSpeed = 4,
+        Lifetime = 25,
+        MaxSpeed = 18,
+        StayUnderwater = true,
+        TrackTarget = true,
+        TurnRate = 230,
+        VelocityAlign = true,
+    },
+}
diff --git a/projectiles/NTorpedo2/NTorpedo2_script.lua b/projectiles/NTorpedo2/NTorpedo2_script.lua
@@ -0,0 +1,5 @@
+local Torpedo2 = import('/lua/nomadsprojectiles.lua').Torpedo2
+
+NTorpedo2 = Class(Torpedo2) {}
+
+TypeClass = NTorpedo2
diff --git a/units/INA1003/INA1003_unit.bp b/units/INA1003/INA1003_unit.bp
@@ -152,14 +152,20 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 120,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INA1003/INA1003_albedo.dds',
+                LODCutoff = 120,
+                MeshName = '/units/INA1003/INA1003_lod0.scm',
+                NormalsName = '/units/INA1003/INA1003_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INA1003/INA1003_SpecTeam.dds',
                 },
                 {
-                    AlbedoName = 'INA1003_lod1_albedo.dds',
-                    LODCutoff = 215,
-                    ShaderName = 'NomadsUnit',
-                    SpecularName = 'INA1003_lod1_SpecTeam.dds',
+                AlbedoName = '/units/INA1003/INA1003_lod1_albedo.dds',
+                LODCutoff = 215,
+                MeshName = '/units/INA1003/INA1003_LOD1.scm',
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INA1003/INA1003_lod1_SpecTeam.dds',
                 },
             },
         },
@@ -189,7 +195,7 @@ UnitBlueprint {
     Economy = {
         BuildCostEnergy = 2400,
         BuildCostMass = 120,
-        BuildTime = 800,
+        BuildTime = 700,
     },
     Footprint = {
         MaxSlope = 0.25,
@@ -281,7 +287,7 @@ UnitBlueprint {
             AutoInitiateAttackCommand = true,
             BallisticArc = 'RULEUBA_LowArc',
             CollideFriendly = false,
-            Damage = 75,
+            Damage = 70,
             DamageFriendly = true,
             DamageRadius = 2.6,
             DamageType = 'Normal',
@@ -354,7 +360,7 @@ UnitBlueprint {
             AutoInitiateAttackCommand = true,
             BallisticArc = 'RULEUBA_LowArc',
             CollideFriendly = false,
-            Damage = 75,
+            Damage = 70,
             DamageFriendly = true,
             DamageRadius = 2.6,
             DamageType = 'Normal',
@@ -428,7 +434,7 @@ UnitBlueprint {
             AutoInitiateAttackCommand = true,
             BallisticArc = 'RULEUBA_LowArc',
             CollideFriendly = false,
-            Damage = 75,
+            Damage = 70,
             DamageFriendly = true,
             DamageRadius = 2.6,
             DamageType = 'Normal',
@@ -502,7 +508,7 @@ UnitBlueprint {
             AutoInitiateAttackCommand = true,
             BallisticArc = 'RULEUBA_LowArc',
             CollideFriendly = false,
-            Damage = 75,
+            Damage = 70,
             DamageFriendly = true,
             DamageRadius = 2.6,
             DamageType = 'Normal',

diff --git a/units/INA2003/INA2003_unit.bp b/units/INA2003/INA2003_unit.bp
@@ -28,7 +28,7 @@ UnitBlueprint {
         KTurn = 0.8,
         KTurnDamping = 1.5,
         LiftFactor = 7,
-        MaxAirspeed = 12,
+        MaxAirspeed = 15,
         MinAirspeed = 3,
         StartTurnDistance = 5,
         Winged = false,
@@ -183,8 +183,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 215,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INA2003/INA2003_albedo.dds',
+                LODCutoff = 215,
+                MeshName = '/units/INA2003/INA2003_lod0.scm',
+                NormalsName = '/units/INA2003/INA2003_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INA2003/INA2003_SpecTeam.dds',
                 },
             },
         },
@@ -389,7 +394,7 @@ UnitBlueprint {
             MuzzleVelocity = 0,
             NotExclusive = true,
             PrefersPrimaryWeaponTarget = true,
-            ProjectileId = '/projectiles/NTorpedo1/NTorpedo1_proj.bp',
+            ProjectileId = '/mods/nomad_fix/projectiles/NTorpedo2/NTorpedo2_proj.bp',
             ProjectileLifetime = 20,
             ProjectilesPerOnFire = 3,
             RackBones = {

diff --git a/units/INA4001/INA4001_unit.bp b/units/INA4001/INA4001_unit.bp
@@ -32,7 +32,7 @@ UnitBlueprint {
         KTurn = 1,
         KTurnDamping = 4,
         LiftFactor = 10,
-        MaxAirspeed = 12,
+        MaxAirspeed = 18,
         StartTurnDistance = 10,
         TransportHoverHeight = 4,
     },
@@ -256,8 +256,8 @@ UnitBlueprint {
     },
     Economy = {
         BuildCostEnergy = 450000,
-        BuildCostMass = 18000,
-        BuildTime = 15000,
+        BuildCostMass = 15000,
+        BuildTime = 30000,
     },
     Footprint = {
         MaxSlope = 0.25,

diff --git a/units/INB0101/INB0101_unit.bp b/units/INB0101/INB0101_unit.bp
@@ -142,8 +142,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0101/INB0101_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0101/INB0101_lod0.scm',
+                NormalsName = '/units/INB0101/INB0101_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0101/INB0101_SpecTeam.dds',
                 },
             },
         },
@@ -179,7 +184,7 @@ UnitBlueprint {
             'inb0101',
         },
         StorageEnergy = 0,
-        StorageMass = 0,
+        StorageMass = 80,
     },
     Footprint = {
         SizeX = 5,

diff --git a/units/INB0102/INB0102_unit.bp b/units/INB0102/INB0102_unit.bp
@@ -86,8 +86,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0102/INB0102_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0102/INB0102_lod0.scm',
+                NormalsName = '/units/INB0102/INB0102_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0102/INB0102_SpecTeam.dds',
                 },
             },
         },
@@ -123,7 +128,7 @@ UnitBlueprint {
             'inb0102',
         },
         StorageEnergy = 0,
-        StorageMass = 0,
+        StorageMass = 80,
     },
     Footprint = {
         SizeX = 5,

diff --git a/units/INB0103/INB0103_unit.bp b/units/INB0103/INB0103_unit.bp
@@ -96,8 +96,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0103/INB0103_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0103/INB0103_lod0.scm',
+                NormalsName = '/units/INB0103/INB0103_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0103/INB0103_SpecTeam.dds',
                 },
             },
         },

diff --git a/units/INB0201/INB0201_unit.bp b/units/INB0201/INB0201_unit.bp
@@ -107,8 +107,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0201/INB0201_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0201/INB0201_lod0.scm',
+                NormalsName = '/units/INB0201/INB0201_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0201/INB0201_SpecTeam.dds',
                 },
             },
         },
@@ -131,8 +136,8 @@ UnitBlueprint {
         UniformScale = 0.45,
     },
     Economy = {
-        BuildCostEnergy = 13300,
-        BuildCostMass = 1520,
+        BuildCostEnergy = 11200,
+        BuildCostMass = 1410,
         BuildRate = 40,
         BuildTime = 2600,
         DifferentialUpgradeCostCalculation = true,
@@ -143,7 +148,7 @@ UnitBlueprint {
             'FIELDENGINEER NOMADS MOBILE LAND',
         },
         StorageEnergy = 0,
-        StorageMass = 0,
+        StorageMass = 160,
     },
     Footprint = {
         SizeX = 5,

diff --git a/units/INB0202/INB0202_unit.bp b/units/INB0202/INB0202_unit.bp
@@ -103,8 +103,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0202/INB0202_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0202/INB0202_lod0.scm',
+                NormalsName = '/units/INB0202/INB0202_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0202/INB0202_SpecTeam.dds',
                 },
             },
         },
@@ -139,7 +144,7 @@ UnitBlueprint {
             'FIELDENGINEER NOMADS MOBILE LAND',
         },
         StorageEnergy = 0,
-        StorageMass = 0,
+        StorageMass = 160,
     },
     Footprint = {
         SizeX = 5,

diff --git a/units/INB0203/INB0203_unit.bp b/units/INB0203/INB0203_unit.bp
@@ -101,8 +101,13 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    LODCutoff = 500,
-                    ShaderName = 'NomadsUnit',
+                AlbedoName = '/units/INB0203/INB0203_albedo.dds',
+                LODCutoff = 500,
+                MeshName = '/units/INB0203/INB0203_lod0.scm',
+                NormalsName = '/units/INB0203/INB0203_NormalsTS.dds',
+                Scrolling = true,
+                ShaderName = 'NomadsUnit',
+                SpecularName = '/units/INB0203/INB0203_SpecTeam.dds',
                 },
             },
         },

diff --git a/units/INB0211/INB0211_unit.bp b/units/INB0211/INB0211_unit.bp
@@ -139,10 +139,10 @@ UnitBlueprint {
         UniformScale = 0.45,
     },
     Economy = {
-        BuildCostEnergy = 4800, --
-        BuildCostMass = 540, --
+        BuildCostEnergy = 4800,
+        BuildCostMass = 580,
         BuildRate = 40,
-        BuildTime = 1300, --
+        BuildTime = 1600, --
         BuildableCategory = {
             'BUILTBYTIER2FACTORY NOMADS MOBILE CONSTRUCTION',
             'BUILTBYTIER2SUPPORTFACTORY NOMADS STRUCTURE LAND',

diff --git a/units/INB0212/INB0212_unit.bp b/units/INB0212/INB0212_unit.bp
@@ -114,8 +114,8 @@ UnitBlueprint {
         UniformScale = 0.42,
     },
     Economy = {
-        BuildCostEnergy = 7971, --
-        BuildCostMass = 510, --
+        BuildCostEnergy = 8000,
+        BuildCostMass = 510,
         BuildRate = 40,
         BuildTime = 1300, --
         BuildableCategory = {

diff --git a/units/INB0213/INB0213_unit.bp b/units/INB0213/INB0213_unit.bp
@@ -119,10 +119,10 @@ UnitBlueprint {
         UniformScale = 0.32,
     },
     Economy = {
-        BuildCostEnergy = 4000, --
-        BuildCostMass = 800, --
-        BuildRate = 60, --
-        BuildTime = 2000, --
+        BuildCostEnergy = 5500,
+        BuildCostMass = 1100,
+        BuildRate = 90, --
+        BuildTime = 3000, --
         BuildableCategory = {
             'BUILTBYTIER2FACTORY NOMADS MOBILE CONSTRUCTION',
             'BUILTBYTIER2SUPPORTFACTORY NOMADS STRUCTURE NAVAL',