Version 73

Merge pull request #336 from FAForever/develop

README.md

@@ -11,6 +11,8 @@ We can use all the help we can get :
 - mission making
 - ...
 
+The work on this project happens with the consent of the original creators under the condition that all changes that are implemented are only for the purpose of fixing bugs or adjusting to the current balance of FAF. Changes that are only a matter of taste are explicitly not wanted.
+
 How do I start contributing?
 ----------------------------
 If you want to contribute, then you'll need to know how **git** works. 

mod_info.lua

@@ -1,9 +1,9 @@
 name = "Nomads"
-version = 70
+version = 73
 copyright = "brute51"
 description = "Adds a new faction to the game"
 author = "CookieNoob, Exotic_Retard, Brute51, original nomads team"
-uid = "50423624-1e83-4fc2-85b3-nomadsv00070"
+uid = "50423624-1e83-4fc2-85b3-nomadsv00073"
 url = ""
 icon = ""
 identifier = ""
@@ -17,3 +17,20 @@ conflicts = { }
 before = { }
 after = { }
 _faf_modname='Nomads'
+mountpoints = {
+    ['effects'] = '/effects',
+    ['env'] = '/env',
+    ['loc'] = '/loc',
+    ['lua'] = '/lua',
+    ['meshes'] = '/meshes',
+    ['movies'] = '/movies',
+    ['nomadhook'] = '/nomadhook',
+    ['projectiles'] = '/projectiles',
+    ['sounds'] = '/sounds',
+    ['textures'] = '/textures',
+    ['units'] = '/units',
+}
+hooks = {
+    '/nomadhook',
+    '/sounds',
+}

nomadhook/lua/sim/defaultweapons.lua

@@ -5,54 +5,6 @@ local oldDefaultProjectileWeapon = DefaultProjectileWeapon
 
 DefaultProjectileWeapon = Class(oldDefaultProjectileWeapon) {
 
--- Another way to disable a weapon below, use SuspendWeaponFire(). This is less invasive and doesn't disable the aiming manip, etc.
--- Had to change the RackSalvoFireReadyState for this though
-
-    SuspendWeaponFire = function(self, bool)
-        self.WeaponSuspended = (bool == true)
-    end,
-
-    OnCreate = function(self)
-        oldDefaultProjectileWeapon.OnCreate(self)
-        self.WeaponSuspended = false
-    end,
-
-    RackSalvoFireReadyState = State (oldDefaultProjectileWeapon.RackSalvoFireReadyState) {
-        Main = function(self)
-            local bp = self:GetBlueprint()
-            if (bp.CountedProjectile == true and bp.WeaponUnpacks == true) then
-                self.unit:SetBusy(true)
-            else
-                self.unit:SetBusy(false)
-            end
-            self.WeaponCanFire = true
-            if self.EconDrain then
-                self.WeaponCanFire = false
-                WaitFor(self.EconDrain)
-                if self.EconDrain then
-                    RemoveEconomyEvent(self.unit, self.EconDrain)
-                end
-                self.EconDrain = nil
-                self.WeaponCanFire = true
-            end
-            if self.WeaponSuspended then  -- allowing weapons to be suspended
-                self.WeaponCanFire = false
-                while self.WeaponSuspended do
-                    WaitTicks(1)
-                end
-                self.WeaponCanFire = true
-            end
-            if bp.CountedProjectile == true  or bp.AnimationReload then
-                ChangeState(self, self.RackSalvoFiringState)
-            end
-        end,
-
-        OnFire = function(self)
-            oldDefaultProjectileWeapon.RackSalvoFireReadyState.OnFire(self)
-        end,
-    },
-
-
     OnWeaponFired = function(self)
         self:SwitchAimController()
         oldDefaultProjectileWeapon.OnWeaponFired(self)

projectiles/NTacticalMissile1_HighArc/NTacticalMissile1_HighArc_Script.lua

@@ -1,5 +1,26 @@
 local ArcingTacticalMissile = import('/lua/nomadsprojectiles.lua').ArcingTacticalMissile
 
-NTacticalMissile1_HighArc = Class(ArcingTacticalMissile) {}
+NTacticalMissile1_HighArc = Class(ArcingTacticalMissile) {
+	OnCreate = function(self, inWater)
+        ArcingTacticalMissile.OnCreate(self, inWater)
+
+        self:SetTurnRate(0)
+        self:ChangeMaxZigZag(0)
+        self:ChangeZigZagFrequency(0)
+        self:ForkThread(self.StageThread)
+    end,
+
+    StageThread = function(self)
+        WaitSeconds(1.1)
+        local bp = self:GetBlueprint().Physics
+        self:SetTurnRate(bp.TurnRate)
+        self:ChangeMaxZigZag(bp.MaxZigZag)
+        self:ChangeZigZagFrequency(bp.ZigZagFrequency)
+        WaitSeconds(1.3)
+        self:ChangeMaxZigZag(0)
+        self:ChangeZigZagFrequency(0)
+    end,
+
+}
 
 TypeClass = NTacticalMissile1_HighArc

projectiles/NTacticalMissile1_HighArc/NTacticalMissile1_HighArc_proj.bp

@@ -44,13 +44,13 @@ ProjectileBlueprint {
         UniformScale = 0.11,
     },
     General = {
-        Category = 'Direct Fire',
+        Category = 'Missile',
         EntityCategory = {
             'NOMADS',
             'PROJECTILE',
+            'INDIRECTFIRE',
             'TACTICAL',
             'MISSILE',
-            'ARTILLERY',
         },
         Faction = 'Nomads',
         Weapon = 'NTacticalMissile1_HighArc',
@@ -64,10 +64,12 @@ ProjectileBlueprint {
         DestroyOnWaterAfterExitingWater = true,
         InitialSpeed = 35,
         MaxSpeed = 50,
-        MaxZigZag = 0,
-        TrackTarget = false,
-        TurnRate = 360,
+        MaxZigZag = 25,
+        TurnRate = 100,
+        TrackTarget = true,
+		TrackTargetGround = true,
+        UseGravity = false,
         VelocityAlign = true,
-        ZigZagFrequency = 0,
+        ZigZagFrequency = 5,
     },
 }

units/INA1003/INA1003_Script.lua

@@ -6,11 +6,7 @@ local RocketWeapon1Bomber = import('/lua/nomadsweapons.lua').RocketWeapon1Bomber
 INA1003 = Class(NAirUnit) {
     Weapons = {
         Rocket1 = Class(RocketWeapon1Bomber) {},
-        Rocket2 = Class(RocketWeapon1Bomber) {},
-        Rocket3 = Class(RocketWeapon1Bomber) {},
-        Rocket4 = Class(RocketWeapon1Bomber) {},
     },
 }
 
 TypeClass = INA1003
-