Version 64

Merge pull request #273 from Nomads-Project/develop
FAForever · Apr 7, 2017 · 4000d82 · 4000d82
2 parents f0724f9 + a3bf1c5
commit 4000d82
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 37 deletions.
diff --git a/mod_info.lua b/mod_info.lua
@@ -1,5 +1,5 @@
 name = "nomads"
-version = 63
+version = 64
 copyright = "brute51"
 description = "adds a new faction to the game"
 author = "CookieNoob, Exotic_Retard, Brute51, original nomads team"

diff --git a/sounds/Voice/DE/NTaunts.xsb b/sounds/Voice/DE/NTaunts.xsb
diff --git a/sounds/Voice/DE/NTaunts.xwb b/sounds/Voice/DE/NTaunts.xwb
diff --git a/sounds/Voice/ES/NTaunts.xsb b/sounds/Voice/ES/NTaunts.xsb
diff --git a/sounds/Voice/ES/NTaunts.xwb b/sounds/Voice/ES/NTaunts.xwb
diff --git a/sounds/Voice/FR/NTaunts.xsb b/sounds/Voice/FR/NTaunts.xsb
diff --git a/sounds/Voice/FR/NTaunts.xwb b/sounds/Voice/FR/NTaunts.xwb
diff --git a/sounds/Voice/IT/NTaunts.xsb b/sounds/Voice/IT/NTaunts.xsb
diff --git a/sounds/Voice/IT/NTaunts.xwb b/sounds/Voice/IT/NTaunts.xwb
diff --git a/sounds/Voice/RU/NTaunts.xsb b/sounds/Voice/RU/NTaunts.xsb
diff --git a/sounds/Voice/RU/NTaunts.xwb b/sounds/Voice/RU/NTaunts.xwb
diff --git a/sounds/Voice/TZM/NTaunts.xsb b/sounds/Voice/TZM/NTaunts.xsb
diff --git a/sounds/Voice/TZM/NTaunts.xwb b/sounds/Voice/TZM/NTaunts.xwb
diff --git a/units/INB0103/INB0103_unit.bp b/units/INB0103/INB0103_unit.bp
@@ -1,11 +1,6 @@
 -- T1 Naval Factory
 
 UnitBlueprint {
-    AI = {
-        TargetBones = {
-            'INB0103',
-        },
-    },
     Audio = {
         Construct = Sound {
             Bank = 'NomadsBuildings',
@@ -59,9 +54,6 @@ UnitBlueprint {
         'SHOWQUEUE',
         'SORTCONSTRUCTION',
     },
-    CollisionOffsetX = -3,
-    CollisionOffsetY = -1.8,
-    CollisionOffsetZ = 0,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Structure',
@@ -223,8 +215,10 @@ UnitBlueprint {
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,
     SelectionThickness = 0.26,
-    SizeX = 4,
-    SizeY = 2,
+    SizeX = 2,
+    CollisionOffsetX = -1,
+    SizeY = 2.5,
+    CollisionOffsetY = -0.2,
     SizeZ = 12,
     StrategicIconName = 'icon_factory1_naval',
     StrategicIconSortPriority = 220,

diff --git a/units/INB0203/INB0203_unit.bp b/units/INB0203/INB0203_unit.bp
@@ -59,9 +59,6 @@ UnitBlueprint {
         'SORTCONSTRUCTION',
         'RESEARCH',
     },
-    CollisionOffsetX = -3,
-    CollisionOffsetY = -1.8,
-    CollisionOffsetZ = 0,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Structure',
@@ -191,7 +188,6 @@ UnitBlueprint {
             LAYER_Sub = false,
             LAYER_Water = true,
         },
-        CollisionOffsetX = 0,
         DragCoefficient = 0.2,
         MaxSteerForce = 0,
         MeshExtentsX = 6,
@@ -225,8 +221,10 @@ UnitBlueprint {
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,
     SelectionThickness = 0.26,
-    SizeX = 4,
-    SizeY = 2,
+    SizeX = 2,
+    CollisionOffsetX = -1,
+    SizeY = 2.5,
+    CollisionOffsetY = -0.2,
     SizeZ = 12,
     StrategicIconName = 'icon_factoryhq2_naval',
     StrategicIconSortPriority = 215,

diff --git a/units/INB0213/INB0213_unit.bp b/units/INB0213/INB0213_unit.bp
@@ -63,9 +63,6 @@ UnitBlueprint {
         'CONSTRUCTIONSORTDOWN',
         'SUPPORTFACTORY', --
     },
-    CollisionOffsetX = -1,
-    CollisionOffsetY = -1.8,
-    CollisionOffsetZ = 0,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Structure',
@@ -236,8 +233,10 @@ UnitBlueprint {
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,
     SelectionThickness = 0.26,
-    SizeX = 4,
-    SizeY = 2,
+    SizeX = 2,
+    CollisionOffsetX = -1,
+    SizeY = 2.5,
+    CollisionOffsetY = -0.2,
     SizeZ = 12,
     StrategicIconName = 'icon_factory2_naval',
     StrategicIconSortPriority = 215,

diff --git a/units/INB0303/INB0303_unit.bp b/units/INB0303/INB0303_unit.bp
@@ -59,9 +59,6 @@ UnitBlueprint {
         'SORTCONSTRUCTION',
         'RESEARCH',
     },
-    CollisionOffsetX = -3,
-    CollisionOffsetY = -1.8,
-    CollisionOffsetZ = 0,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Structure',
@@ -224,8 +221,10 @@ UnitBlueprint {
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,
     SelectionThickness = 0.26,
-    SizeX = 4,
-    SizeY = 2,
+    SizeX = 2,
+    CollisionOffsetX = -1,
+    SizeY = 2.5,
+    CollisionOffsetY = -0.2,
     SizeZ = 12,
     StrategicIconName = 'icon_factoryhq3_naval',
     StrategicIconSortPriority = 220,

diff --git a/units/INB0313/INB0313_unit.bp b/units/INB0313/INB0313_unit.bp
@@ -61,9 +61,6 @@ UnitBlueprint {
         'CONSTRUCTIONSORTDOWN',
         'SUPPORTFACTORY', --
     },
-    CollisionOffsetX = -3,
-    CollisionOffsetY = -1.8,
-    CollisionOffsetZ = 0,
     Defense = {
         AirThreatLevel = 0,
         ArmorType = 'Structure',
@@ -230,8 +227,10 @@ UnitBlueprint {
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,
     SelectionThickness = 0.26,
-    SizeX = 4,
-    SizeY = 2,
+    SizeX = 2,
+    CollisionOffsetX = -1,
+    SizeY = 2.5,
+    CollisionOffsetY = -0.2,
     SizeZ = 12,
     StrategicIconName = 'icon_factory3_naval',
     StrategicIconSortPriority = 220,

diff --git a/units/INB2208/INB2208_Albedo.dds b/units/INB2208/INB2208_Albedo.dds
diff --git a/units/INB2208/INB2208_SpecTeam.dds b/units/INB2208/INB2208_SpecTeam.dds
diff --git a/units/INU2004/INU2004_unit.bp b/units/INU2004/INU2004_unit.bp
@@ -55,8 +55,8 @@ UnitBlueprint {
         AirThreatLevel = 3,
         ArmorType = 'Normal',
         EconomyThreatLevel = 0,
-        Health = 900,
-        MaxHealth = 900,
+        Health = 1000,
+        MaxHealth = 1000,
         RegenRate = 0,
         SubThreatLevel = 0,
         SurfaceThreatLevel = 0,
@@ -224,10 +224,10 @@ UnitBlueprint {
             FiringTolerance = 2,
             LeadTarget = true,
             Label = 'AAGun',
-            MaxRadius = 50,
+            MaxRadius = 40,
             MuzzleSalvoDelay = 0,
             MuzzleSalvoSize = 3,
-            MuzzleVelocity = 28,
+            MuzzleVelocity = 20,
             ProjectileId = '/projectiles/NRocketFlakProj1/NRocketFlakProj1_proj.bp',
             ProjectileLifetimeUsesMultiplier = 1.25,
             ProjectilesPerOnFire = 2,

diff --git a/units/INU3003/INU3003_unit.bp b/units/INU3003/INU3003_unit.bp
@@ -269,7 +269,7 @@ UnitBlueprint {
                     Duration = 0.5,
                     Radius = 1.3,
                     TargetAllow = 'TECH3',
-                    TargetDisallow = 'UNSTUNABLE,TECH1,TECH2,EXPERIMENTAL,COMMAND,SHIELD,WALL',
+                    TargetDisallow = 'UNSTUNABLE,TECH1,TECH2,EXPERIMENTAL,COMMAND,WALL',
                 },
             },
             CollideFriendly = false,