Version 65

Merge pull request #291 from Nomads-Project/develop

effects/Entities/Meteor/Meteor_script.lua

@@ -13,7 +13,7 @@ Meteor = Class(NullShell) {
     DamageFriendly = true,
     DamageRadius = 10,
     InitialHeight = 300,
-    
+
     FxScale = 1,
     ImpactLandFx = NomadsEffectTemplate.MeteorLandImpact,
     ImpactSeabedFx = NomadsEffectTemplate.MeteorSeabedImpact,
@@ -73,10 +73,10 @@ Meteor = Class(NullShell) {
     end,
 
     SetPosAndVelocity = function(self, ImpactPos, Time)
-    
+
         local dirVector
         local x,y,z
-        
+
         if GetArmyBrain( self:GetArmy() ).ACULaunched then
             dirVector = GetArmyBrain( self:GetArmy() ).DirVector
             x,y,z = unpack(GetArmyBrain( self:GetArmy() ).startingPositionWithOffset)
@@ -92,7 +92,7 @@ Meteor = Class(NullShell) {
             x = x + (offsetX * self.InitialHeight)
             z = z + (offsetZ * self.InitialHeight)
         end
-        
+
         local speed = ( y - GetTerrainHeight(x,z) ) / Time
         self:SetPosition( Vector(x,y,z), true)
         self:SetOrientation( OrientFromDir(Util.GetDirectionVector(ImpactPos, dirVector)), true)
@@ -293,7 +293,7 @@ Meteor = Class(NullShell) {
             proj = self:CreateProjectile('/effects/entities/MeteorDustCloud/MeteorDustCloud_proj.bp', x * offset , 2.5, z * offset, x, 0, z)
             proj:SetVelocity(velocity)
             table.insert( projectiles, proj )
-        end  
+        end
 
         local fn = function(self, projectiles)
             WaitSeconds( 1 )

effects/Entities/NBlackhole/NBlackhole_proj.bp

@@ -13,7 +13,7 @@ ProjectileBlueprint {
         CollideSurface = false,
         DestroyOnWater = false,
         InitialSpeed = 0,
-        Lifetime = 100,        
+        Lifetime = 100,
         RotationalVelocity = 0,
         RotationalVelocityRange = 0,
         UseGravity = false,

effects/Entities/NBlackhole/NBlackhole_script.lua

@@ -184,10 +184,10 @@ NBlackhole = Class(NullShell) {
         local surface = GetTerrainHeight(pos[1], pos[3]) + GetTerrainTypeOffset(pos[1], pos[3])
         pos[2] = surface + (wreckScale * 0.4)
 
-        if self.WreckageResources['m'] < 500 then 
+        if self.WreckageResources['m'] < 500 then
             return nil
         end
-        
+
         local prop = CreateProp( pos, wreckBp )
 
         prop:SetScale( wreckScale )
@@ -262,7 +262,7 @@ NBlackhole = Class(NullShell) {
 
         -- leave a wreckage to reclaim the sucked in mass (and energy)
         local wreck = self:CreateWreckage()
-        
+
         -- start effect threads
         threads:Add( self:ForkThread( self.AftermathExplosion, bag, lifetime, wreck ) )
         threads:Add( self:ForkThread( self.AftermathFireBalls, bag, lifetime, wreck ) )
@@ -437,7 +437,7 @@ NBlackhole = Class(NullShell) {
             end
             WaitSeconds( 0.1 )
         end
-    end, 
+    end,
 
     CloudsThread2 = function(self, bag, lifetime)
         -- creates the white clouds moving in the hole
@@ -471,7 +471,7 @@ NBlackhole = Class(NullShell) {
             end
             WaitSeconds( 0.1 )
         end
-    end, 
+    end,
 
     LightningThread = function(self, bag, lifetime)
         -- Creates a random lightning
@@ -721,10 +721,10 @@ NBlackhole = Class(NullShell) {
         if wreck ~= nil then
             wreck:SetCanTakeDamage(false)
         end
-        
+
         -- fire effect blueprints. The first is the close to the center so this should be a large effect. The last one is far away and should be smallish
-        local FireArmTempl = { NomadsEffectTemplate.NukeBlackholeFireArmSegment1, NomadsEffectTemplate.NukeBlackholeFireArmSegment2, 
-                               NomadsEffectTemplate.NukeBlackholeFireArmSegment3, NomadsEffectTemplate.NukeBlackholeFireArmSegment4, 
+        local FireArmTempl = { NomadsEffectTemplate.NukeBlackholeFireArmSegment1, NomadsEffectTemplate.NukeBlackholeFireArmSegment2,
+                               NomadsEffectTemplate.NukeBlackholeFireArmSegment3, NomadsEffectTemplate.NukeBlackholeFireArmSegment4,
                                NomadsEffectTemplate.NukeBlackholeFireArmSegment5, }
         local FireCntrTempl =  NomadsEffectTemplate.NukeBlackholeFireArmCenter1
 
@@ -788,7 +788,7 @@ NBlackhole = Class(NullShell) {
         if wreck ~= nil then
             wreck:SetCanTakeDamage(false)
         end
-        
+
         local FireArmTempl = { NomadsEffectTemplate.NukeBlackholeFireArmSegment4, NomadsEffectTemplate.NukeBlackholeFireArmSegment4,
                                NomadsEffectTemplate.NukeBlackholeFireArmSegment4, NomadsEffectTemplate.NukeBlackholeFireArmSegment4,
                                NomadsEffectTemplate.NukeBlackholeFireArmCenter2, }

effects/Entities/NBlackholeEffect01/NBlackholeEffect01_script.lua

@@ -28,7 +28,7 @@ NBlackholeEffect01 = Class(NullShell) {
         for k, v in NomadsEffectTemplate.NukeBlackholeDustCloud01 do
             emit = CreateEmitterOnEntity(self, army, v )
             self.Trash:Add(emit)
-        end	
+        end
     end,
 }
 

effects/Entities/NBlackholeEffect02/NBlackholeEffect02_script.lua

@@ -28,7 +28,7 @@ NBlackholeEffect02 = Class(NullShell) {
         for k, v in NomadsEffectTemplate.NukeBlackholeDustCloud02 do
             emit = CreateEmitterOnEntity(self, army, v )
             self.Trash:Add(emit)
-        end	
+        end
     end,
 }
 

effects/Entities/NBlackholeLeftover/NBlackholeLeftover_script.lua

@@ -27,7 +27,7 @@ NBlackholeLeftover = Class(Prop) {
     SetCanTakeDamage = function(self, bool)
         self.CanTakeDamage = bool
     end,
-    
+
     EffectThread = function(self)
         self.Emitters = EffectUtilities.CreateEffects( self, -1, self.PermanentFx )
         for k, emit in self.Emitters do

effects/Entities/NEnergyBomb/NEnergyBomb_proj.bp

@@ -13,7 +13,7 @@ ProjectileBlueprint {
         CollideSurface = false,
         DestroyOnWater = false,
         InitialSpeed = 0,
-        Lifetime = 10,        
+        Lifetime = 10,
         RotationalVelocity = 0,
         RotationalVelocityRange = 0,
         UseGravity = false,

effects/Entities/NomadsACUDropMeteor/NomadsACUDropMeteor_proj.bp

@@ -40,7 +40,7 @@ ProjectileBlueprint {
         CollideEntity = false,
         CollideSurface = true,
         DestroyOnWater = false,
-        Lifetime = 10,        
+        Lifetime = 10,
         RealisticOrdinance = false,
         RotationalVelocity = 0,
         RotationalVelocityRange = 0,

effects/Entities/NomadsACUDropPodCover/NomadsACUDropPodCover_script.lua

@@ -49,17 +49,17 @@ NomadsACUDropPodCover = Class(NullShell) {
             targetType = 'Underwater'
         end
 
-        NullShell.OnImpact(self, targetType, targetEntity)  
+        NullShell.OnImpact(self, targetType, targetEntity)
 
         -- create some additional effects
         local army = self:GetArmy()
         local ok = (targetType ~= 'Water' and targetType ~= 'Shield' and targetType ~= 'Air' and targetType ~= 'UnitAir' and targetType ~= 'UnitUnderwater')
-        if ok then 
+        if ok then
             local rotation = RandomFloat(0,2*math.pi)
             local size = RandomFloat(5, 6.5)
             local life = Random(40, 60)
             CreateDecal(self:GetPosition(), rotation, 'Scorch_010_albedo', '', 'Albedo', size, size, 300, life, self:GetArmy())
-        end	 
+        end	
     end,
 
     IsUnderWater = function(self)

effects/Entities/Shield05/Shield05_emit.bp

@@ -152,5 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-
-

effects/Entities/Shield05/Shield05b_emit.bp

@@ -152,5 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-
-

effects/Entities/Shield05/Shield05c_emit.bp

@@ -152,5 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-
-

effects/Entities/Shield05/Shield05d_emit.bp

@@ -152,5 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-
-

effects/emitters/MeteorImpact01.bp

@@ -153,4 +153,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact02.bp

@@ -155,4 +155,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact03.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact04.bp

@@ -153,4 +153,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact05.bp

@@ -154,4 +154,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact06.bp

@@ -156,4 +156,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact07.bp

@@ -158,4 +158,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact08.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact09.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact10.bp

@@ -181,4 +181,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact11.bp

@@ -154,4 +154,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorImpact12.bp

@@ -181,4 +181,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorResidualSmoke01.bp

@@ -153,4 +153,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorResidualSmoke02.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorResidualSmoke03.bp

@@ -153,4 +153,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorSmokeRing01.bp

@@ -157,4 +157,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorTrail01.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorTrail02.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorTrail03.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/MeteorTrail04.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/Nomads_surfacefire1.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/Nomads_surfacefire2.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/Nomads_surfacefire3.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact01_emit.bp

@@ -158,4 +158,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact02_emit.bp

@@ -158,4 +158,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact03_emit.bp

@@ -158,4 +158,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact04_emit.bp

@@ -154,4 +154,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact05_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact06_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/buoy_impact07_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_01_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_01_emit_air.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_02_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_02_emit_air.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_03_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_hit_03_emit_air.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_muzzle_flash_01_emit.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_muzzle_flash_01_emit_air.bp

@@ -152,4 +152,3 @@ EmitterBlueprint {
 		},
 	},
 }
-

effects/emitters/nomads_DarkMatterWeapon_muzzle_flash_02_emit.bp

@@ -154,4 +154,3 @@ EmitterBlueprint {
 		},
 	},
 }
-