Skip to content

Commit 1c4c060

Browse files
BeherithBeherith
authored
Revert "Merge branch 'GL4-Lights-3.0-Upgrade---including-Night-Mode' … (#4228)
…of https://github.com/beyond-all-reason/Beyond-All-Reason" This reverts commit 114594f, reversing changes made to bddc599. <!-- PR Template! Please make sure to give your PR a relevant title so a squash merge remains descriptive If any commented sections are not relevant to this PR, remove them. Please fill out the uncommented sections with any relevant information. --> ### Work done <!-- Describe the changes or additions made in this PR, and why they are necessary or important. If there is unusual complexity in the code or functionality, please explain it so reviewers can understand. --> <!-- If relevant #### Addresses Issue(s) - Issue URL --> <!-- If relevant #### Setup Describe any setup requirements to test this work (Specific settings, widgets, etc)) --> #### Test steps - [ ] Write the steps needed to test out the changes. Include the expected result. <!-- If relevant ### Screenshots: If you're making visible changes, add before/after screenshots or videos of the major changes so it's easier for reviewers to see what is different in this PR #### BEFORE: (screenshot from master) #### AFTER: (screenshot from branch) -->
1 parent 114594f commit 1c4c060

16 files changed

+60
-234
lines changed

‎effects/burn.lua

+23-24
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 = 6.4,
57-
particlesizespread = 6.8,
56+
particlesize = 12.4,
57+
particlesizespread = 12.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.6 r1.3 d+7]],
63+
sizegrowth = [[1.4 r2.1 d+2]],
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.88 r0.85]],
706+
numparticles = [[0.77 r0.80]],
707707
particlelife = 8,
708708
particlelifespread = 6,
709709
particlesize = -19,
@@ -966,7 +966,6 @@ return {
966966
class = [[CSimpleParticleSystem]],
967967
count = 1,
968968
ground = true,
969-
unit = true,
970969
properties = {
971970
airdrag = 0.91,
972971
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]],
@@ -1129,7 +1128,7 @@ return {
11291128
extrafire = {
11301129
air = true,
11311130
class = [[CSimpleParticleSystem]],
1132-
count = 0,
1131+
count = 1,
11331132
ground = true,
11341133
properties = {
11351134
airdrag = 0.15,
@@ -1160,26 +1159,26 @@ return {
11601159
count = 1,
11611160
ground = true,
11621161
properties = {
1163-
airdrag = 0.92,
1162+
airdrag = 0.97,
11641163
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]],
11651164
--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]],
11661165
directional = false,
11671166
emitrot = 70,
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,
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,
11731172
particlelifespread = 8,
11741173
particlesize = 32,
11751174
particlesizespread = 44,
1176-
particlespeed = 0.4,
1177-
particlespeedspread = 0.9,
1175+
particlespeed = 0.3,
1176+
particlespeedspread = 0.6,
11781177
rotParams = [[-24 r48, -60 r120, -180 r360]],
11791178
animParams = [[16,6,50 r60]],
11801179
texture = [[BARFlame02]],
11811180
pos = [[-2 r4, 32 r12, -2 r4]],
1182-
sizegrowth = [[1.9 d+10 r3.0]],
1181+
sizegrowth = [[1.9 d+14 r3.0]],
11831182
sizemod = 0.82,
11841183
drawOrder = 1,
11851184
},
@@ -1231,18 +1230,18 @@ return {
12311230
emitrot = 70,
12321231
emitrotspread = 40,
12331232
emitvector = [[0.3, 0.7, 0.3]],
1234-
gravity = [[-0.04 r0.08, 0.06 r0.08, -0.04 r0.08]],
1235-
numparticles = [[0.45 r0.75]],
1233+
gravity = [[-0.03 r0.05, 0.06 r0.08, -0.03 r0.05]],
1234+
numparticles = [[0.45 r0.80]],
12361235
particlelife = 25,
12371236
particlelifespread = 8,
1238-
particlesize = 26,
1239-
particlesizespread = 36,
1237+
particlesize = 32,
1238+
particlesizespread = 44,
12401239
particlespeed = 0.3,
12411240
particlespeedspread = 0.6,
12421241
rotParams = [[-24 r48, -60 r120, -180 r360]],
12431242
animParams = [[16,6,50 r60]],
12441243
pos = [[-2 r4, 32 r12, -2 r4]],
1245-
sizegrowth = [[2.5 d+9 r4.0]],
1244+
sizegrowth = [[2.9 r4.0]],
12461245
sizemod = 0.92,
12471246
texture = [[BARFlame02]],
12481247
drawOrder = 1,
@@ -1278,7 +1277,7 @@ return {
12781277
emitrot = 90,
12791278
emitrotspread = 30,
12801279
emitvector = [[dir]],
1281-
gravity = [[-0.06 r0.12, 0.06 r0.08, -0.06 r0.12]],
1280+
gravity = [[0, 0.12, 0]],
12821281
numparticles = [[0.2 r0.81]],
12831282
particlelife = 7,
12841283
particlelifespread = 12,
@@ -1312,14 +1311,14 @@ return {
13121311
numparticles = [[0.40 r0.73]],
13131312
particlelife = 25,
13141313
particlelifespread = 8,
1315-
particlesize = 40,
1316-
particlesizespread = 50,
1314+
particlesize = 44,
1315+
particlesizespread = 59,
13171316
particlespeed = 0.3,
13181317
particlespeedspread = 0.6,
13191318
rotParams = [[-24 r48, -60 r120, -180 r360]],
13201319
animParams = [[16,6,50 r60]],
13211320
pos = [[-6 r12, 32 r12, -6 r12]],
1322-
sizegrowth = [[2.4 r3.0 d+20]],
1321+
sizegrowth = [[2.4 r3.0 d+22]],
13231322
sizemod = 0.82,
13241323
texture = [[BARFlame02]],
13251324
drawOrder = 1,

‎effects/footsteps.lua

-92
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,6 @@
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-
},
964
["footstep-medium"] = {
975
dirtsplat = {
986
class = [[CSimpleParticleSystem]],

‎gamedata/sounds.lua

+1-6
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,7 @@ local soundData = {
145145
-- WEAPON SOUNDS MULTI (more concurrent)
146146
['weapons-mult'] = {
147147
gain = 1.2 * 0.3,
148-
pitchmod = {
149-
default = 0.17,
150-
custom = {
151-
['^lasr'] = 0.03,
152-
},
153-
},
148+
pitchmod = 0.17,
154149
gainmod = 0.2 * 0.3,
155150
dopplerscale = 1.0,
156151
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 = -1, --offset from what the UnitScriptDecal returns
1705-
offsetz = -1, --
1704+
offsetx = 0, --offset from what the UnitScriptDecal returns
1705+
offsetz = 0, --
17061706
offsetrot = 0.0, -- in radians
1707-
width = 26,
1707+
width = 30,
17081708
height = 30,
17091709
heatstart = 0,
17101710
heatdecay = 0,
1711-
alphastart = 0.80,
1711+
alphastart = 0.85,
17121712
alphadecay = 0.0010,
1713-
maxalpha = 0.9,
1713+
maxalpha = 1.0,
17141714
bwfactor = 0.1,
17151715
glowsustain = 0.0,
17161716
glowadd = 0.0,

0 commit comments

Comments
 (0)