Skip to content

Commit 114594f

Browse files
BeherithBeherith
committed
Merge branch 'GL4-Lights-3.0-Upgrade---including-Night-Mode' of https://github.com/beyond-all-reason/Beyond-All-Reason 
2 parents bddc599 + a0f7bc1 commit 114594f

16 files changed

+234
-60
lines changed

‎effects/burn.lua

+24-23
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ return {
5353
numparticles = [[0.49 r0.60]],
5454
particlelife = 24,
5555
particlelifespread = 9,
56-
particlesize = 12.4,
57-
particlesizespread = 12.8,
56+
particlesize = 6.4,
57+
particlesizespread = 6.8,
5858
particlespeed = 0.3,
5959
particlespeedspread = 0.6,
6060
rotParams = [[-24 r48, -60 r120, -180 r360]],
6161
animParams = [[16,6,40 r80]],
6262
pos = [[-2 r4, 32 r8, -2 r4]],
63-
sizegrowth = [[1.4 r2.1 d+2]],
63+
sizegrowth = [[1.6 r1.3 d+7]],
6464
sizemod = 0.93,
6565
texture = [[BARFlame02]],
6666
drawOrder = 1,
@@ -703,7 +703,7 @@ return {
703703
emitrotspread = 1,
704704
emitvector = [[dir]],
705705
gravity = [[0, 0.22, 0]],
706-
numparticles = [[0.77 r0.80]],
706+
numparticles = [[0.88 r0.85]],
707707
particlelife = 8,
708708
particlelifespread = 6,
709709
particlesize = -19,
@@ -966,6 +966,7 @@ return {
966966
class = [[CSimpleParticleSystem]],
967967
count = 1,
968968
ground = true,
969+
unit = true,
969970
properties = {
970971
airdrag = 0.91,
971972
colormap = [[0.75 0.45 0.99 0.3 0.96 0.90 0.95 0.95 0.98 0.95 0.90 0.33 0.94 0.88 0.80 0.12 0.78 0.45 0.1 0.07 0.01 0 0 0.01]],
@@ -1128,7 +1129,7 @@ return {
11281129
extrafire = {
11291130
air = true,
11301131
class = [[CSimpleParticleSystem]],
1131-
count = 1,
1132+
count = 0,
11321133
ground = true,
11331134
properties = {
11341135
airdrag = 0.15,
@@ -1159,26 +1160,26 @@ return {
11591160
count = 1,
11601161
ground = true,
11611162
properties = {
1162-
airdrag = 0.97,
1163+
airdrag = 0.92,
11631164
colormap = [[0.8 0.78 0.6 0.9 1.0 0.97 0.7 1 0.8 0.7 0.55 0.88 0.22 0.13 0.1 0.7 0.023 0.022 0.022 0.3 0 0 0 0.01]],
11641165
--colormap = [[0.8 0.78 0.6 0.9 1.0 0.97 0.7 1 0.8 0.7 0.55 0.88 0.22 0.13 0.1 0.66 0.023 0.022 0.022 0.25 0 0 0 0.01]],
11651166
directional = false,
11661167
emitrot = 70,
1167-
emitrotspread = 40,
1168-
emitvector = [[0.3, 0.7, 0.3]],
1169-
gravity = [[-0.03 r0.05, 0.06 r0.08, -0.03 r0.05]],
1170-
numparticles = [[0.45 r0.80]],
1171-
particlelife = 25,
1168+
emitrotspread = 5,
1169+
emitvector = [[0.3, 1.0, 0.3]],
1170+
gravity = [[-0.06 r0.12, 0.06 r0.08, -0.06 r0.12]],
1171+
numparticles = [[0.45 r0.75]],
1172+
particlelife = 23,
11721173
particlelifespread = 8,
11731174
particlesize = 32,
11741175
particlesizespread = 44,
1175-
particlespeed = 0.3,
1176-
particlespeedspread = 0.6,
1176+
particlespeed = 0.4,
1177+
particlespeedspread = 0.9,
11771178
rotParams = [[-24 r48, -60 r120, -180 r360]],
11781179
animParams = [[16,6,50 r60]],
11791180
texture = [[BARFlame02]],
11801181
pos = [[-2 r4, 32 r12, -2 r4]],
1181-
sizegrowth = [[1.9 d+14 r3.0]],
1182+
sizegrowth = [[1.9 d+10 r3.0]],
11821183
sizemod = 0.82,
11831184
drawOrder = 1,
11841185
},
@@ -1230,18 +1231,18 @@ return {
12301231
emitrot = 70,
12311232
emitrotspread = 40,
12321233
emitvector = [[0.3, 0.7, 0.3]],
1233-
gravity = [[-0.03 r0.05, 0.06 r0.08, -0.03 r0.05]],
1234-
numparticles = [[0.45 r0.80]],
1234+
gravity = [[-0.04 r0.08, 0.06 r0.08, -0.04 r0.08]],
1235+
numparticles = [[0.45 r0.75]],
12351236
particlelife = 25,
12361237
particlelifespread = 8,
1237-
particlesize = 32,
1238-
particlesizespread = 44,
1238+
particlesize = 26,
1239+
particlesizespread = 36,
12391240
particlespeed = 0.3,
12401241
particlespeedspread = 0.6,
12411242
rotParams = [[-24 r48, -60 r120, -180 r360]],
12421243
animParams = [[16,6,50 r60]],
12431244
pos = [[-2 r4, 32 r12, -2 r4]],
1244-
sizegrowth = [[2.9 r4.0]],
1245+
sizegrowth = [[2.5 d+9 r4.0]],
12451246
sizemod = 0.92,
12461247
texture = [[BARFlame02]],
12471248
drawOrder = 1,
@@ -1277,7 +1278,7 @@ return {
12771278
emitrot = 90,
12781279
emitrotspread = 30,
12791280
emitvector = [[dir]],
1280-
gravity = [[0, 0.12, 0]],
1281+
gravity = [[-0.06 r0.12, 0.06 r0.08, -0.06 r0.12]],
12811282
numparticles = [[0.2 r0.81]],
12821283
particlelife = 7,
12831284
particlelifespread = 12,
@@ -1311,14 +1312,14 @@ return {
13111312
numparticles = [[0.40 r0.73]],
13121313
particlelife = 25,
13131314
particlelifespread = 8,
1314-
particlesize = 44,
1315-
particlesizespread = 59,
1315+
particlesize = 40,
1316+
particlesizespread = 50,
13161317
particlespeed = 0.3,
13171318
particlespeedspread = 0.6,
13181319
rotParams = [[-24 r48, -60 r120, -180 r360]],
13191320
animParams = [[16,6,50 r60]],
13201321
pos = [[-6 r12, 32 r12, -6 r12]],
1321-
sizegrowth = [[2.4 r3.0 d+22]],
1322+
sizegrowth = [[2.4 r3.0 d+20]],
13221323
sizemod = 0.82,
13231324
texture = [[BARFlame02]],
13241325
drawOrder = 1,

‎effects/footsteps.lua

+92
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,98 @@
11
-- unit footsteps CURRENTLY DISABLED
22

33
return {
4+
["footstep-small"] = {
5+
dirtsplat = {
6+
class = [[CSimpleParticleSystem]],
7+
count = 2, -- 2
8+
ground = true,
9+
properties = {
10+
airdrag = 0.95,
11+
colormap = [[0.08 0.06 0.02 0.88 0.1 0.07 0.033 0.68 0 0 0 0]],
12+
directional = false,
13+
emitrot = 180,
14+
emitrotspread = 45,
15+
emitvector = [[0, -0.3, 0]],
16+
gravity = [[0, -0.08, 0]],
17+
numparticles = 1,
18+
particlelife = 13,
19+
particlelifespread = 25,
20+
particlesize = 4.0,
21+
particlesizespread = 6,
22+
particlespeed = 2.5,
23+
particlespeedspread = 10,
24+
pos = [[0, 3, 0]],
25+
rotParams = [[-20 r40, 0, -180 r360]],
26+
sizegrowth = [[-0.05 r0.18]],
27+
sizemod = 1,
28+
texture = [[randdots]],
29+
useairlos = false,
30+
alwaysvisible = false,
31+
castShadow = true,
32+
},
33+
},
34+
dirtg2 = {
35+
air = true,
36+
class = [[CSimpleParticleSystem]],
37+
count = 1,-- 1
38+
ground = true,
39+
properties = {
40+
airdrag = 0.67,
41+
--colormap = [[0.20 0.18 0.14 0.55 0.35 0.30 0.27 0.50 0 0 0 0.01]],
42+
colormap = [[0.15 0.12 0.07 0.7 0.06 0.04 0.04 0.4 0 0 0 0.01]],
43+
directional = false,
44+
emitrot = 60,
45+
emitrotspread = 45,
46+
emitvector = [[0, 1, 0]],
47+
gravity = [[0, 0.11 r0.07, 0]],
48+
numparticles = 1,
49+
particlelife = 23,
50+
particlelifespread = 13,
51+
particlesize = 34,
52+
particlesizespread = 19,
53+
particlespeed = 2,
54+
particlespeedspread = 2,
55+
pos = [[-0.05 r0.1, 2 r2, -0.05 r0.1]],
56+
rotParams = [[-10 r20, 0, -180 r360]],
57+
sizegrowth = 0.04,
58+
sizemod = 1.002,
59+
texture = [[smoke-ice-anim]],
60+
animParams = [[8,8,80 r45]],
61+
useairlos = false,
62+
alwaysvisible = false,
63+
castShadow = true,
64+
},
65+
},
66+
-- extradebree = {
67+
-- air = true,
68+
-- class = [[CSimpleParticleSystem]],
69+
-- count = 0, -- 1
70+
-- ground = true,
71+
-- water = true,
72+
-- underwater = true,
73+
-- properties = {
74+
-- airdrag = 0.94,
75+
-- colormap = [[0.15 0.15 0.15 1 0.1 0.1 0.1 0.7 0 0 0 0]],
76+
-- directional = false,
77+
-- emitrot = 45,
78+
-- emitrotspread = 45,
79+
-- emitvector = [[0, 0.5, 0]],
80+
-- gravity = [[0, -0.07, 0]],
81+
-- numparticles = 2,
82+
-- particlelife = 20,
83+
-- particlelifespread = 30,
84+
-- particlesize = 1,
85+
-- particlesizespread = 4,
86+
-- particlespeed = 6,
87+
-- particlespeedspread = 14,
88+
-- pos = [[0, 4, 0]],
89+
-- sizegrowth = 0.2,
90+
-- sizemod = 0.98,
91+
-- texture = [[shard3]],
92+
-- useairlos = false,
93+
-- },
94+
-- },
95+
},
496
["footstep-medium"] = {
597
dirtsplat = {
698
class = [[CSimpleParticleSystem]],

‎gamedata/sounds.lua

+6-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,12 @@ local soundData = {
145145
-- WEAPON SOUNDS MULTI (more concurrent)
146146
['weapons-mult'] = {
147147
gain = 1.2 * 0.3,
148-
pitchmod = 0.17,
148+
pitchmod = {
149+
default = 0.17,
150+
custom = {
151+
['^lasr'] = 0.03,
152+
},
153+
},
149154
gainmod = 0.2 * 0.3,
150155
dopplerscale = 1.0,
151156
maxconcurrent = 15,

‎luaui/Widgets/gfx_decals_gl4.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -1701,16 +1701,16 @@ local UnitScriptDecalsNames = {
17011701
['corsumo'] = {
17021702
[1] = { -- LFOOT
17031703
texture = footprintsPath..'f_corsumo_a.png',
1704-
offsetx = 0, --offset from what the UnitScriptDecal returns
1705-
offsetz = 0, --
1704+
offsetx = -1, --offset from what the UnitScriptDecal returns
1705+
offsetz = -1, --
17061706
offsetrot = 0.0, -- in radians
1707-
width = 30,
1707+
width = 26,
17081708
height = 30,
17091709
heatstart = 0,
17101710
heatdecay = 0,
1711-
alphastart = 0.85,
1711+
alphastart = 0.80,
17121712
alphadecay = 0.0010,
1713-
maxalpha = 1.0,
1713+
maxalpha = 0.9,
17141714
bwfactor = 0.1,
17151715
glowsustain = 0.0,
17161716
glowadd = 0.0,

0 commit comments

Comments
 (0)