version 67

Merge pull request #308 from Nomads-Project/develop

effects/emitters/nomads_orbital_frigate_thruster03_emit.bp

@@ -11,7 +11,7 @@ EmitterBlueprint {
 	AlignToBone = false,
 	Flat = true,
 	LODCutoff = 250.00,
-	EmitIfVisible = true,
+	EmitIfVisible = false,
 	CatchupEmit = true,
 	CreateIfVisible = false,
 	SnapToWaterline = false,

loc/US/nomads_strings_core.lua

@@ -253,6 +253,15 @@ ino0001_desc = "Surface Operations Support"
 ino0001_help = "Provides a number of services to the ACU."
 ino0001_name = "Surface Operations Support"
 
+inc0001_desc = "Orbital Frigate"
+inc0001_help = "Provides a number of services to the ACU."
+inc0001_name = "Planetary Operations Support Ship"
+
+inc0002_desc = "Orbital Cruiser"
+inc0002_help = "Heavily damaged orbital cruiser."
+inc0002_name = "Orbital Cruiser"
+
+
 -- orbital dropship
 ina0001_desc = "Drop pod"
 ina0001_help = "Transports units to the planets surface. Acts like a meteor."
@@ -913,17 +922,17 @@ inu9002_name = "NC1001B"
 --------------------------------------------------------
 ---- TAUNTS
 --------------------------------------------------------
-Nicols = "Nicols"
-NTaunts_MP1_010_010 = '[{i Nicols}]: You will never escape, I will make you suffer!'
-NTaunts_MP1_010_011 = '[{i Nicols}]: Your resistance is futile, you will be destroyed!'
-NTaunts_MP1_010_012 = '[{i Nicols}]: Orbital strike initiated, goodbye.'
-NTaunts_MP1_010_013 = '[{i Nicols}]: We are back. It\'s time for you to die.'
-NTaunts_MP1_010_014 = '[{i Nicols}]: Once we were lost, but now we will reign supreme.'
-NTaunts_MP1_010_015 = '[{i Nicols}]: You have what we call a very terrestrial mindset.'
-NTaunts_MP1_010_016 = '[{i Nicols}]: I think the space between your ears is best left unexplored!'
-NTaunts_MP1_010_017 = '[{i Nicols}]: You can\'t hope to contain the vastness of the nomad fleet.'
-NTaunts_MP1_010_018 = '[{i Nicols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?'
-NTaunts_MP1_010_019 = '[{i Nicols}]: It is amazing that you made it this far without hurting yourself.'
+Nichols = "Nichols"
+NTaunts_MP1_010_010 = '[{i Nichols}]: You will never escape, I will make you suffer!'
+NTaunts_MP1_010_011 = '[{i Nichols}]: Your resistance is futile, you will be destroyed!'
+NTaunts_MP1_010_012 = '[{i Nichols}]: Orbital strike initiated, goodbye.'
+NTaunts_MP1_010_013 = '[{i Nichols}]: We are back. It\'s time for you to die.'
+NTaunts_MP1_010_014 = '[{i Nichols}]: Once we were lost, but now we will reign supreme.'
+NTaunts_MP1_010_015 = '[{i Nichols}]: You have what we call a very terrestrial mindset.'
+NTaunts_MP1_010_016 = '[{i Nichols}]: I think the space between your ears is best left unexplored!'
+NTaunts_MP1_010_017 = '[{i Nichols}]: You can\'t hope to contain the vastness of the nomad fleet.'
+NTaunts_MP1_010_018 = '[{i Nichols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?'
+NTaunts_MP1_010_019 = '[{i Nichols}]: It is amazing that you made it this far without hurting yourself.'
 
 Benson = "Benson"
 NTaunts_MP1_011_010 = '[{i Benson}]: Even my ships docking sensors have better aim than your gun.'

lua/nomadsprojectiles.lua

@@ -785,7 +785,7 @@ EnergyProj = Class(SinglePolyTrailProjectile) {
         local pos = self:GetPosition()
         DamageArea(self, pos, (self.DamageData.DamageRadius or 1) * 1.2, 1, 'BigFire', true)  -- light trees on fire
         local army = self:GetArmy()
-        local ok = (targetType ~= 'Water' and targetType ~= 'Shield' and targetType ~= 'Air' and targetType ~= 'UnitAir' and targetType ~= 'UnitUnderwater')
+        local ok = (GetSurfaceHeight(pos[1],pos[3]) == GetTerrainHeight(pos[1],pos[3]) and targetType ~= 'Water' and targetType ~= 'Shield' and targetType ~= 'Air' and targetType ~= 'UnitAir' and targetType ~= 'UnitUnderwater')
         if ok then
             local rotation = RandomFloat(0,2*math.pi)
             local size = RandomFloat(8, 10)
@@ -1595,7 +1595,7 @@ Buoy1 = Class(SinglePolyTrailProjectile) {
 
     OnImpact = function(self, targetType, targetEntity)
         SinglePolyTrailProjectile.OnImpact(self, targetType, targetEntity)
-        local ok = (targetType ~= 'None' and targetType ~= 'Shield' and targetType ~= 'Air' and targetType ~= 'UnitAir')  -- removed water
+        local ok = (targetType ~= 'Water' and targetType ~= 'None' and targetType ~= 'Shield' and targetType ~= 'Air' and targetType ~= 'UnitAir')
         if ok then
             local spec = self:GetSpec( targetType, targetEntity )
             self:CreateBuoy( spec, targetType, targetEntity )

nomadhook/lua/skins/skins.lua

@@ -19,7 +19,7 @@ skins = table.merged( skins, {
         factionBackColor = "FFD68E00",
         fontOverColor = "FFFFFFFF",
         fontDownColor = "FF513923",
-        --fontColor = "FFFC8F00",
+        fontColor = "FFFC8F00",
         dialogCaptionColor = "FFD6C6BC",
         dialogColumnColor = "FFAD976E",
         dialogButtonColor = "FF4EAA7F",

nomadhook/lua/ui/game/taunt.lua

@@ -4,16 +4,16 @@
 
 taunts = table.cat( taunts, {
 
-    {text = '<LOC NTaunts_MP1_010_010>[{i Nicols}]: You will never escape, I will make you suffer!', bank = 'NTaunts', cue = 'NTaunt_Nicols_001'},
-    {text = '<LOC NTaunts_MP1_010_011>[{i Nicols}]: Your resistance is futile, you will be destroyed!', bank = 'NTaunts', cue = 'NTaunt_Nicols_002'},
-    {text = '<LOC NTaunts_MP1_010_012>[{i Nicols}]: Orbital strike initiated, goodbye.', bank = 'NTaunts', cue = 'NTaunt_Nicols_003'},
-    {text = '<LOC NTaunts_MP1_010_013>[{i Nicols}]: We are back. It\'s time for you to die.', bank = 'NTaunts', cue = 'NTaunt_Nicols_004'},
-    {text = '<LOC NTaunts_MP1_010_014>[{i Nicols}]: Once we were lost, but now we will reign supreme.', bank = 'NTaunts', cue = 'NTaunt_Nicols_005'},
-    {text = '<LOC NTaunts_MP1_010_015>[{i Nicols}]: You have what we call a very terrestrial mindset.', bank = 'NTaunts', cue = 'NTaunt_Nicols_006'},
-    {text = '<LOC NTaunts_MP1_010_016>[{i Nicols}]: I think the space between your ears is best left unexplored!', bank = 'NTaunts', cue = 'NTaunt_Nicols_007'},
-    {text = '<LOC NTaunts_MP1_010_017>[{i Nicols}]: You can\'t hope to contain the vastness of the nomad fleet.', bank = 'NTaunts', cue = 'NTaunt_Nicols_008'},
-    {text = '<LOC NTaunts_MP1_010_018>[{i Nicols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?', bank = 'NTaunts', cue = 'NTaunt_Nicols_009'},
-    {text = '<LOC NTaunts_MP1_010_019>[{i Nicols}]: It is amazing that you made it this far without hurting yourself.', bank = 'NTaunts', cue = 'NTaunt_Nicols_010'},
+    {text = '<LOC NTaunts_MP1_010_010>[{i Nichols}]: You will never escape, I will make you suffer!', bank = 'NTaunts', cue = 'NTaunt_Nicols_001'},
+    {text = '<LOC NTaunts_MP1_010_011>[{i Nichols}]: Your resistance is futile, you will be destroyed!', bank = 'NTaunts', cue = 'NTaunt_Nicols_002'},
+    {text = '<LOC NTaunts_MP1_010_012>[{i Nichols}]: Orbital strike initiated, goodbye.', bank = 'NTaunts', cue = 'NTaunt_Nicols_003'},
+    {text = '<LOC NTaunts_MP1_010_013>[{i Nichols}]: We are back. It\'s time for you to die.', bank = 'NTaunts', cue = 'NTaunt_Nicols_004'},
+    {text = '<LOC NTaunts_MP1_010_014>[{i Nichols}]: Once we were lost, but now we will reign supreme.', bank = 'NTaunts', cue = 'NTaunt_Nicols_005'},
+    {text = '<LOC NTaunts_MP1_010_015>[{i Nichols}]: You have what we call a very terrestrial mindset.', bank = 'NTaunts', cue = 'NTaunt_Nicols_006'},
+    {text = '<LOC NTaunts_MP1_010_016>[{i Nichols}]: I think the space between your ears is best left unexplored!', bank = 'NTaunts', cue = 'NTaunt_Nicols_007'},
+    {text = '<LOC NTaunts_MP1_010_017>[{i Nichols}]: You can\'t hope to contain the vastness of the nomad fleet.', bank = 'NTaunts', cue = 'NTaunt_Nicols_008'},
+    {text = '<LOC NTaunts_MP1_010_018>[{i Nichols}]: I\'m afraid, we\'re out of mercy today. How would you like an ass kicking instead?', bank = 'NTaunts', cue = 'NTaunt_Nicols_009'},
+    {text = '<LOC NTaunts_MP1_010_019>[{i Nichols}]: It is amazing that you made it this far without hurting yourself.', bank = 'NTaunts', cue = 'NTaunt_Nicols_010'},
 
     {text = '<LOC NTaunts_MP1_011_010>[{i Benson}]: Even my ships docking sensors have better aim than your gun.', bank = 'NTaunts', cue = 'NTaunt_Benson_001'},
     {text = '<LOC NTaunts_MP1_011_011>[{i Benson}]: When we came back to the earth empire space we expected an advanced civilization, but you merely progressed beyond bow and arrow.', bank = 'NTaunts', cue = 'NTaunt_Benson_002'},

units/INA2001/INA2001_Script.lua

@@ -57,6 +57,7 @@ INA2001 = Class(NAirTransportUnit) {
         if self.UnfoldAnim then
             self.UnfoldAnim:SetRate(0)
         end
+        self:DestroyThrusterEffects()
         NAirTransportUnit.OnKilled(self, instigator, type, overkillRatio)
         self:TransportDetachAllUnits(true)
     end,
@@ -334,4 +335,4 @@ INA2001 = Class(NAirTransportUnit) {
     end,
 }
 
-TypeClass = INA2001
+TypeClass = INA2001

units/INA2001/INA2001_unit.bp

@@ -129,6 +129,14 @@ UnitBlueprint {
             '<LOC ability_transport>Transport',
             '<LOC ability_flares>Flares',
         },
+        AnimationDeath = {
+            {
+                Animation = '/units/INA2001/INA2001_Unfold.sca',
+                AnimationRateMax = 1.25,
+                AnimationRateMin = 0.75,
+                Weight = 100,
+            },
+        },
         BuildEffect = {
             ExtendsFront = 0,
             ExtendsRear = 0,

units/INA2002/INA2002_unit.bp

@@ -93,7 +93,7 @@ UnitBlueprint {
             Level5 = 10,
         },
     },
-    BuildIconSortPriority = 15,
+    BuildIconSortPriority = 16,
     Categories = {
         'SELECTABLE',
         'BUILTBYTIER2FACTORY',

units/INB0103/INB0103_unit.bp

@@ -209,8 +209,8 @@ UnitBlueprint {
         SkirtSizeZ = 19,
         TurnRate = 0,
     },
-    SelectionMeshScaleX = 0.3,
-    SelectionMeshScaleZ = 0.4,
+    SelectionMeshScaleX = 0.8,
+    SelectionMeshScaleZ = 0.8,
     SelectionMeshUseTopAmount = 0.15,
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,

units/INB0203/INB0203_unit.bp

@@ -215,8 +215,8 @@ UnitBlueprint {
         SkirtSizeZ = 19,
         TurnRate = 0,
     },
-    SelectionMeshScaleX = 0.3,
-    SelectionMeshScaleZ = 0.4,
+    SelectionMeshScaleX = 0.8,
+    SelectionMeshScaleZ = 0.8,
     SelectionMeshUseTopAmount = 0.15,
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,

units/INB0213/INB0213_unit.bp

@@ -227,8 +227,8 @@ UnitBlueprint {
         SkirtSizeZ = 19,
         TurnRate = 0,
     },
-    SelectionMeshScaleX = 0.3,
-    SelectionMeshScaleZ = 0.4,
+    SelectionMeshScaleX = 0.8,
+    SelectionMeshScaleZ = 0.8,
     SelectionMeshUseTopAmount = 0.15,
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,

units/INB0303/INB0303_unit.bp

@@ -215,8 +215,8 @@ UnitBlueprint {
         SkirtSizeZ = 19,
         TurnRate = 0,
     },
-    SelectionMeshScaleX = 0.3,
-    SelectionMeshScaleZ = 0.4,
+    SelectionMeshScaleX = 0.8,
+    SelectionMeshScaleZ = 0.8,
     SelectionMeshUseTopAmount = 0.15,
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,

units/INB0313/INB0313_unit.bp

@@ -221,8 +221,8 @@ UnitBlueprint {
         SkirtSizeZ = 19,
         TurnRate = 0,
     },
-    SelectionMeshScaleX = 0.3,
-    SelectionMeshScaleZ = 0.4,
+    SelectionMeshScaleX = 0.8,
+    SelectionMeshScaleZ = 0.8,
     SelectionMeshUseTopAmount = 0.15,
     SelectionSizeX = 2.2,
     SelectionSizeZ = 6.9,

units/INB2302/INB2302_unit.bp

@@ -69,10 +69,8 @@ UnitBlueprint {
             IconFadeInZoom = 130,
             LODs = {
                 {
-                    AlbedoName = 'INB2302_lod1_albedo.dds',
                     LODCutoff = 500,
                     ShaderName = 'NomadsUnit',
-                    SpecularName = 'INB2302_lod1_specteam.dds',
                 },
             },
         },

units/INB3201/INB3201_unit.bp

@@ -144,7 +144,7 @@ UnitBlueprint {
         BuildableCategory = {
             'inb3301',
         },
-        MaintenanceConsumptionPerSecondEnergy = 250,
+        MaintenanceConsumptionPerSecondEnergy = 200,
         RebuildBonusIds = {
             'inb3201',
         },

units/INB5101/INB5101_unit.bp

@@ -160,7 +160,7 @@ UnitBlueprint {
         HealthMult = 0.2,
         MassMult = 0.9,
         ReclaimTimeMultiplier = 1,
-        UseCustomMesh = true,
+        UseCustomMesh = false,
         WreckageLayers = {
             Air = false,
             Land = true,

units/INC0001/INC0001_script.lua

@@ -33,8 +33,41 @@ INC0001 = Class(NCivilianStructureUnit) {
                 self:AddToConstructionQueue('inu1001', army)
             end
         end]]
+        --[[ForkThread(function()
+            WaitSeconds(2)
+            WARN("stop now")
+            self:StopRotators()
+            WaitSeconds(4)
+            WARN("start now")
+            self:StartRotators()
+            end
+        )]]
     end,
 
+    StopRotators = function(self)
+        if self.RotatorManipulator1 then
+            self.RotatorManipulator1:SetTargetSpeed( 0 )
+        end
+        if self.RotatorManipulator2 then
+            self.RotatorManipulator2:SetTargetSpeed( 0 )
+        end
+        if self.RotatorManipulator3 then
+            self.RotatorManipulator3:SetTargetSpeed( 0 )
+        end        
+    end,
+
+    StartRotators = function(self)
+        if self.RotatorManipulator1 then
+            self.RotatorManipulator1:SetTargetSpeed( self:GetBlueprint().Rotators.PrimarySpeed )
+        end
+        if self.RotatorManipulator2 then
+            self.RotatorManipulator2:SetTargetSpeed( self:GetBlueprint().Rotators.SecondarySpeed )
+        end
+        if self.RotatorManipulator3 then
+            self.RotatorManipulator3:SetTargetSpeed( self:GetBlueprint().Rotators.PrimarySpeed )
+        end
+    end,
+
     RotatingAngle = function(self)
         -- spinner 1 and 3
         if not self.RotatorManipulator1 then
@@ -45,8 +78,8 @@ INC0001 = Class(NCivilianStructureUnit) {
         end
         if not self.RotatorManipulator3 then
             self.RotatorManipulator3 = CreateRotator( self, 'Spinner3', 'z' )
-            self.RotatorManipulator3:SetAccel( 5 )
-            self.RotatorManipulator3:SetTargetSpeed( 30 )
+            self.RotatorManipulator3:SetAccel( self:GetBlueprint().Rotators.PrimaryAccel )
+            self.RotatorManipulator3:SetTargetSpeed( self:GetBlueprint().Rotators.PrimarySpeed )
             self.Trash:Add( self.RotatorManipulator3 )
         end
 

units/INC0001/INC0001_unit.bp

@@ -110,7 +110,7 @@ UnitBlueprint {
         Icon = 'air',
         SelectionPriority = 5,
         TechLevel = 'RULEUTL_Secret',
-        UnitName = '<LOC inc0001>Planet operations support ship',
+        UnitName = '<LOC inc0001>Planetary Operations Support Ship',
         UnitWeight = 1,
     },
     Intel = {
@@ -155,6 +155,7 @@ UnitBlueprint {
     SizeX = 2,
     SizeY = 3,
     SizeZ = 11.25,
+    CollisionOffsetY = 2.7,
     StrategicIconName = 'icon_structure_generic',
     StrategicIconSortPriority = 55,
     Wreckage = {