Skip to content

Commit a416588

Browse files
CookieNoobaeoncleanse
authored andcommitted
cleanup all FAF files
removes space at the end of lines removes tab at the end of lines replaces all tabs with spaces (also mixed cases are treated properly, i.e. 3*space and 1 tab)
1 parent 2e06fe2 commit a416588

File tree

604 files changed

+77215
-77215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

604 files changed

+77215
-77215
lines changed

effects/Entities/InainoEffectController01/InainoEffectController01_script.lua

+46-46
Original file line numberDiff line numberDiff line change
@@ -7,118 +7,118 @@
77
local NullShell = import('/lua/sim/defaultprojectiles.lua').NullShell
88
local RandomFloat = import('/lua/utilities.lua').GetRandomFloat
99
local EffectTemplate = import('/lua/EffectTemplates.lua')
10-
11-
local SIFInainoStrategicMissileEffect01 = '/effects/Entities/SIFInainoStrategicMissileEffect01/SIFInainoStrategicMissileEffect01_proj.bp'
12-
local SIFInainoStrategicMissileEffect02 = '/effects/Entities/SIFInainoStrategicMissileEffect02/SIFInainoStrategicMissileEffect02_proj.bp'
13-
local SIFInainoStrategicMissileEffect03 = '/effects/Entities/SIFInainoStrategicMissileEffect03/SIFInainoStrategicMissileEffect03_proj.bp'
14-
local SIFInainoStrategicMissileEffect04 = '/effects/Entities/SIFInainoStrategicMissileEffect04/SIFInainoStrategicMissileEffect04_proj.bp'
1510

16-
InainoEffectController01 = Class(NullShell) {
11+
local SIFInainoStrategicMissileEffect01 = '/effects/Entities/SIFInainoStrategicMissileEffect01/SIFInainoStrategicMissileEffect01_proj.bp'
12+
local SIFInainoStrategicMissileEffect02 = '/effects/Entities/SIFInainoStrategicMissileEffect02/SIFInainoStrategicMissileEffect02_proj.bp'
13+
local SIFInainoStrategicMissileEffect03 = '/effects/Entities/SIFInainoStrategicMissileEffect03/SIFInainoStrategicMissileEffect03_proj.bp'
14+
local SIFInainoStrategicMissileEffect04 = '/effects/Entities/SIFInainoStrategicMissileEffect04/SIFInainoStrategicMissileEffect04_proj.bp'
15+
16+
InainoEffectController01 = Class(NullShell) {
1717
EffectThread = function(self, Data)
1818
local army = self:GetArmy()
1919
self:ForkThread(self.CreateInitialHit, army)
2020
self:ForkThread(self.CreateInitialBuildup, army)
2121
self:ForkThread(self.CreateGroundFingers )
2222
self:ForkThread(self.CreateInitialFingers )
2323
self:ForkThread(self.MainBlast, army)
24-
end,
25-
24+
end,
25+
2626
CreateInitialHit = function( self, army )
2727
for k, v in EffectTemplate.SIFInainoHit01 do
2828
emit = CreateEmitterAtEntity(self,army,v)
29-
end
29+
end
3030
end,
31-
31+
3232
CreateInitialBuildup = function( self, army )
3333
WaitSeconds(2.0)
3434
for k, v in EffectTemplate.SIFInainoHit02 do
3535
emit = CreateEmitterAtEntity(self,army,v)
36-
end
36+
end
3737
end,
38-
38+
3939
MainBlast = function( self, army )
4040
WaitSeconds(5.00)
4141

4242
-- Create a light for this thing's flash.
4343
CreateLightParticle(self, -1, self:GetArmy(), 160, 14, 'flare_lens_add_03', 'ramp_white_07' )
44-
44+
4545
-- Create our decals
46-
CreateDecal( self:GetPosition(), RandomFloat(0.0,6.28), 'Scorch_012_albedo', '', 'Albedo', 80, 80, 1000, 0, self:GetArmy())
46+
CreateDecal( self:GetPosition(), RandomFloat(0.0,6.28), 'Scorch_012_albedo', '', 'Albedo', 80, 80, 1000, 0, self:GetArmy())
4747

4848
-- Create explosion effects
4949
for k, v in EffectTemplate.SIFInainoDetonate01 do
5050
emit = CreateEmitterAtEntity(self,army,v)
5151
end
52-
self:ShakeCamera( 55, 10, 0, 2.5 )
52+
self:ShakeCamera( 55, 10, 0, 2.5 )
5353

5454
WaitSeconds(0.3)
55-
55+
5656
-- Create upward moving smoke plume
5757
local plume = self:CreateProjectile('/effects/entities/SIFInainoStrategicMissileEffect04/SIFInainoStrategicMissileEffect04_proj.bp', 0, 3, 0, 0, 0, 0)
5858
plume:SetLifetime(5.35)
5959
plume:SetVelocity(10.0)
60-
plume:SetAcceleration(-0.35)
60+
plume:SetAcceleration(-0.35)
6161
plume:SetCollision(false)
6262
plume:SetVelocityAlign(true)
63-
63+
6464
-- Create explosion dust ring
6565
local vx, vy, vz = self:GetVelocity()
66-
local num_projectiles = 16
66+
local num_projectiles = 16
6767
local horizontal_angle = (2*math.pi) / num_projectiles
68-
local angleInitial = RandomFloat( 0, horizontal_angle )
68+
local angleInitial = RandomFloat( 0, horizontal_angle )
6969
local xVec, zVec
7070
local offsetMultiple = 30.0
7171
local px, pz
7272

73-
for i = 0, (num_projectiles -1) do
73+
for i = 0, (num_projectiles -1) do
7474
xVec = (math.sin(angleInitial + (i*horizontal_angle)))
7575
zVec = (math.cos(angleInitial + (i*horizontal_angle)))
7676
px = (offsetMultiple*xVec)
7777
pz = (offsetMultiple*zVec)
78-
78+
7979
local proj = self:CreateProjectile(SIFInainoStrategicMissileEffect03, px, 1, pz, xVec, 0, zVec)
8080
proj:SetLifetime(12.0)
8181
proj:SetVelocity(10.0)
82-
proj:SetAcceleration(-0.35)
82+
proj:SetAcceleration(-0.35)
8383
end
8484
end,
85-
86-
CreateGroundFingers = function(self)
85+
86+
CreateGroundFingers = function(self)
8787
-- Outward rushing fingers that spawn the upward fingers
88-
local num_projectiles = 5
88+
local num_projectiles = 5
8989
local horizontal_angle = (2*math.pi) / num_projectiles
90-
local xVec, zVec
91-
local px, pz
92-
93-
for i = 0, (num_projectiles -1) do
94-
xVec = math.sin(i*horizontal_angle)
95-
zVec = math.cos(i*horizontal_angle)
90+
local xVec, zVec
91+
local px, pz
92+
93+
for i = 0, (num_projectiles -1) do
94+
xVec = math.sin(i*horizontal_angle)
95+
zVec = math.cos(i*horizontal_angle)
9696
px = 1 * xVec
9797
pz = 1 * zVec
98-
98+
9999
local proj = self:CreateProjectile(SIFInainoStrategicMissileEffect02, px, 2.0, pz, xVec, 0.0, zVec)
100-
proj:SetVelocity(15)
101-
end
100+
proj:SetVelocity(15)
101+
end
102102
end,
103-
103+
104104
CreateInitialFingers = function(self)
105105
WaitSeconds(1.75)
106106
-- Upward rising fingers that join to form explosion
107-
local num_projectiles = 5
107+
local num_projectiles = 5
108108
local horizontal_angle = (2*math.pi) / num_projectiles
109-
local xVec, zVec
110-
local px, pz
111-
112-
for i = 0, (num_projectiles -1) do
113-
xVec = math.sin(i*horizontal_angle)
114-
zVec = math.cos(i*horizontal_angle)
109+
local xVec, zVec
110+
local px, pz
111+
112+
for i = 0, (num_projectiles -1) do
113+
xVec = math.sin(i*horizontal_angle)
114+
zVec = math.cos(i*horizontal_angle)
115115
px = 25.0 * xVec
116116
pz = 25.0 * zVec
117-
117+
118118
local proj = self:CreateProjectile(SIFInainoStrategicMissileEffect01, px, 2.0, pz, -xVec, 2.0, -zVec)
119119
proj:SetVelocity(20)
120-
proj:SetBallisticAcceleration(-5.0)
121-
end
120+
proj:SetBallisticAcceleration(-5.0)
121+
end
122122
end,
123123
}
124124
TypeClass = InainoEffectController01

effects/Entities/SeraphimNukeEffectController01/SeraphimNukeEffectController01_proj.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ProjectileBlueprint {
1313
CollideSurface = false,
1414
DestroyOnWater = false,
1515
InitialSpeed = 0,
16-
Lifetime = 100,
16+
Lifetime = 100,
1717
RotationalVelocity = 0,
1818
RotationalVelocityRange = 0,
1919
UseGravity = false,

effects/Entities/SeraphimNukeEffectController01/SeraphimNukeEffectController01_script.lua

+32-32
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ local NullShell = import('/lua/sim/defaultprojectiles.lua').NullShell
88
local EffectTemplate = import('/lua/EffectTemplates.lua')
99
local RandomFloat = import('/lua/utilities.lua').GetRandomFloat
1010

11-
local SIFExperimentalStrategicMissileEffect02 = '/effects/Entities/SIFExperimentalStrategicMissileEffect02/SIFExperimentalStrategicMissileEffect02_proj.bp'
12-
local SIFExperimentalStrategicMissileEffect04 = '/effects/Entities/SIFExperimentalStrategicMissileEffect04/SIFExperimentalStrategicMissileEffect04_proj.bp'
11+
local SIFExperimentalStrategicMissileEffect02 = '/effects/Entities/SIFExperimentalStrategicMissileEffect02/SIFExperimentalStrategicMissileEffect02_proj.bp'
12+
local SIFExperimentalStrategicMissileEffect04 = '/effects/Entities/SIFExperimentalStrategicMissileEffect04/SIFExperimentalStrategicMissileEffect04_proj.bp'
1313
local SIFExperimentalStrategicMissileEffect05 = '/effects/Entities/SIFExperimentalStrategicMissileEffect05/SIFExperimentalStrategicMissileEffect05_proj.bp'
1414
local SIFExperimentalStrategicMissileEffect06 = '/effects/Entities/SIFExperimentalStrategicMissileEffect06/SIFExperimentalStrategicMissileEffect06_proj.bp'
1515

16-
SeraphimNukeEffectController01 = Class(NullShell) {
17-
-- Create inner explosion plasma
16+
SeraphimNukeEffectController01 = Class(NullShell) {
17+
-- Create inner explosion plasma
1818
CreateEffectInnerPlasma = function(self)
1919
local vx, vy, vz = self:GetVelocity()
2020
local num_projectiles = 12
@@ -24,21 +24,21 @@ SeraphimNukeEffectController01 = Class(NullShell) {
2424
local offsetMultiple = 10.0
2525
local px, pz
2626

27-
WaitSeconds( 3.5 )
28-
for i = 0, (num_projectiles -1) do
27+
WaitSeconds( 3.5 )
28+
for i = 0, (num_projectiles -1) do
2929
xVec = (math.sin(angleInitial + (i*horizontal_angle)))
3030
zVec = (math.cos(angleInitial + (i*horizontal_angle)))
3131
px = (offsetMultiple*xVec)
3232
pz = (offsetMultiple*zVec)
33-
33+
3434
local proj = self:CreateProjectile(SIFExperimentalStrategicMissileEffect05, px, -10, pz, xVec, 0, zVec)
3535
proj:SetLifetime(5.0)
3636
proj:SetVelocity(7.0)
3737
proj:SetAcceleration(-0.35)
3838
end
39-
end,
40-
41-
-- Create random wavy electricity lines
39+
end,
40+
41+
-- Create random wavy electricity lines
4242
CreateEffectElectricity = function(self)
4343
local vx, vy, vz = self:GetVelocity()
4444
local num_projectiles = 7
@@ -48,26 +48,26 @@ SeraphimNukeEffectController01 = Class(NullShell) {
4848
local offsetMultiple = 0.0
4949
local px, pz
5050

51-
WaitSeconds( 3.5 )
52-
for i = 0, (num_projectiles -1) do
51+
WaitSeconds( 3.5 )
52+
for i = 0, (num_projectiles -1) do
5353
xVec = (math.sin(angleInitial + (i*horizontal_angle)))
5454
zVec = (math.cos(angleInitial + (i*horizontal_angle)))
5555
px = (offsetMultiple*xVec)
5656
pz = (offsetMultiple*zVec)
57-
57+
5858
local proj = self:CreateProjectile( SIFExperimentalStrategicMissileEffect06, px, -8, pz, xVec, 0, zVec )
5959
proj:SetLifetime(3.0)
6060
proj:SetVelocity(RandomFloat( 11, 20 ))
6161
proj:SetAcceleration(-0.35)
6262
end
63-
end,
63+
end,
6464

6565
EffectThread = function(self)
6666
self:ForkThread(self.CreateEffectInnerPlasma)
6767
self:ForkThread(self.CreateEffectElectricity)
6868
local army = self:GetArmy()
6969
local position = self:GetPosition()
70-
70+
7171
-- Knockdown force rings
7272
DamageRing(self, position, 0.1, 45, 1, 'Force', true)
7373
WaitSeconds(0.1)
@@ -77,27 +77,27 @@ SeraphimNukeEffectController01 = Class(NullShell) {
7777
CreateLightParticle(self, -1, army, 140, 10, 'glow_02', 'ramp_blue_22')
7878
WaitSeconds(0.3)
7979
CreateLightParticle(self, -1, army, 80, 36, 'glow_02', 'ramp_blue_16')
80-
81-
-- Create explosion effects
80+
81+
-- Create explosion effects
8282
for k, v in EffectTemplate.SIFExperimentalStrategicMissileHit01 do
8383
emit = CreateEmitterAtEntity(self,army,v)
84-
end
85-
84+
end
85+
8686
WaitSeconds(3.0)
8787
CreateLightParticle(self, -1, army, 160, 6, 'glow_02', 'ramp_blue_16')
8888
WaitSeconds(0.1)
8989
CreateLightParticle(self, -1, army, 60, 60, 'glow', 'ramp_blue_22')
90-
90+
9191
-- Create detonate effects
9292
for k, v in EffectTemplate.SIFExperimentalStrategicMissileDetonate01 do
9393
emit = CreateEmitterAtEntity(self,army,v)
9494
end
95-
95+
9696
-- Create ground decals
9797
local orientation = RandomFloat(0,2*math.pi)
9898
CreateDecal(position, orientation, 'Scorch_012_albedo', '', 'Albedo', 300, 300, 1200, 0, army)
99-
CreateDecal(position, orientation, 'Crater01_normals', '', 'Normals', 150, 150, 1200, 0, army)
100-
99+
CreateDecal(position, orientation, 'Crater01_normals', '', 'Normals', 150, 150, 1200, 0, army)
100+
101101
-- Create explosion dust ring
102102
local vx, vy, vz = self:GetVelocity()
103103
local num_projectiles = 24
@@ -107,44 +107,44 @@ SeraphimNukeEffectController01 = Class(NullShell) {
107107
local offsetMultiple = 60.0
108108
local px, pz
109109

110-
for i = 0, (num_projectiles -1) do
110+
for i = 0, (num_projectiles -1) do
111111
xVec = (math.sin(angleInitial + (i*horizontal_angle)))
112112
zVec = (math.cos(angleInitial + (i*horizontal_angle)))
113113
px = (offsetMultiple*xVec)
114114
pz = (offsetMultiple*zVec)
115-
115+
116116
local proj = self:CreateProjectile( SIFExperimentalStrategicMissileEffect02, px, -12, pz, xVec, 0, zVec )
117117
proj:SetLifetime(12.0)
118118
proj:SetVelocity(10.0)
119119
proj:SetAcceleration(-0.35)
120120
end
121-
121+
122122
-- Create upward moving plasma plume
123123
local plume = self:CreateProjectile('/effects/entities/SIFExperimentalStrategicMissileEffect03/SIFExperimentalStrategicMissileEffect03_proj.bp', 0, 3, 0, 0, 1, 0)
124124
plume:SetLifetime(6.0)
125125
plume:SetVelocity(20.0)
126126
plume:SetAcceleration(-0.35)
127127
plume:SetCollision(false)
128128
plume:SetVelocityAlign(true)
129-
129+
130130
WaitSeconds(1.0)
131-
131+
132132
-- Create fireball plumes to accentuate the explosive detonation
133133
local num_projectiles = 15
134134
local horizontal_angle = (2*math.pi) / num_projectiles
135135
local angleInitial = RandomFloat(0, horizontal_angle)
136136
local xVec, yVec, zVec
137137
local angleVariation = 0.5
138138
local px, py, pz
139-
139+
140140
for i = 0, (num_projectiles -1) do
141-
xVec = math.sin(angleInitial + (i*horizontal_angle) + RandomFloat(-angleVariation, angleVariation))
141+
xVec = math.sin(angleInitial + (i*horizontal_angle) + RandomFloat(-angleVariation, angleVariation))
142142
yVec = RandomFloat(0.3, 1.5) + 1.2
143-
zVec = math.cos(angleInitial + (i*horizontal_angle) + RandomFloat(-angleVariation, angleVariation))
143+
zVec = math.cos(angleInitial + (i*horizontal_angle) + RandomFloat(-angleVariation, angleVariation))
144144
px = RandomFloat(7.5, 14.0) * xVec
145145
py = RandomFloat(7.5, 14.0) * yVec
146146
pz = RandomFloat(7.5, 14.0) * zVec
147-
147+
148148
local proj = self:CreateProjectile(SIFExperimentalStrategicMissileEffect04, px, py, pz, xVec, yVec, zVec)
149149
proj:SetVelocity(RandomFloat(10, 30))
150150
proj:SetBallisticAcceleration(-9.8)

0 commit comments

Comments
 (0)