Skip to content

Commit

Permalink
Revert "Merge branch 'GL4-Lights-3.0-Upgrade---including-Night-Mode' … (
Browse files Browse the repository at this point in the history 
#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)
-->
  • Loading branch information
@Beherith
Beherith authored Jan 25, 2025
1 parent 114594f commit 1c4c060
Show file tree
Hide file tree
Showing 16 changed files with 60 additions and 234 deletions.
47 changes: 23 additions & 24 deletions effects/burn.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ return {
numparticles = [[0.49 r0.60]],
particlelife = 24,
particlelifespread = 9,
particlesize = 6.4,
particlesizespread = 6.8,
particlesize = 12.4,
particlesizespread = 12.8,
particlespeed = 0.3,
particlespeedspread = 0.6,
rotParams = [[-24 r48, -60 r120, -180 r360]],
animParams = [[16,6,40 r80]],
pos = [[-2 r4, 32 r8, -2 r4]],
sizegrowth = [[1.6 r1.3 d+7]],
sizegrowth = [[1.4 r2.1 d+2]],
sizemod = 0.93,
texture = [[BARFlame02]],
drawOrder = 1,
Expand Down Expand Up @@ -703,7 +703,7 @@ return {
emitrotspread = 1,
emitvector = [[dir]],
gravity = [[0, 0.22, 0]],
numparticles = [[0.88 r0.85]],
numparticles = [[0.77 r0.80]],
particlelife = 8,
particlelifespread = 6,
particlesize = -19,
Expand Down Expand Up @@ -966,7 +966,6 @@ return {
class = [[CSimpleParticleSystem]],
count = 1,
ground = true,
unit = true,
properties = {
airdrag = 0.91,
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]],
Expand Down Expand Up @@ -1129,7 +1128,7 @@ return {
extrafire = {
air = true,
class = [[CSimpleParticleSystem]],
count = 0,
count = 1,
ground = true,
properties = {
airdrag = 0.15,
Expand Down Expand Up @@ -1160,26 +1159,26 @@ return {
count = 1,
ground = true,
properties = {
airdrag = 0.92,
airdrag = 0.97,
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]],
--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]],
directional = false,
emitrot = 70,
emitrotspread = 5,
emitvector = [[0.3, 1.0, 0.3]],
gravity = [[-0.06 r0.12, 0.06 r0.08, -0.06 r0.12]],
numparticles = [[0.45 r0.75]],
particlelife = 23,
emitrotspread = 40,
emitvector = [[0.3, 0.7, 0.3]],
gravity = [[-0.03 r0.05, 0.06 r0.08, -0.03 r0.05]],
numparticles = [[0.45 r0.80]],
particlelife = 25,
particlelifespread = 8,
particlesize = 32,
particlesizespread = 44,
particlespeed = 0.4,
particlespeedspread = 0.9,
particlespeed = 0.3,
particlespeedspread = 0.6,
rotParams = [[-24 r48, -60 r120, -180 r360]],
animParams = [[16,6,50 r60]],
texture = [[BARFlame02]],
pos = [[-2 r4, 32 r12, -2 r4]],
sizegrowth = [[1.9 d+10 r3.0]],
sizegrowth = [[1.9 d+14 r3.0]],
sizemod = 0.82,
drawOrder = 1,
},
Expand Down Expand Up @@ -1231,18 +1230,18 @@ return {
emitrot = 70,
emitrotspread = 40,
emitvector = [[0.3, 0.7, 0.3]],
gravity = [[-0.04 r0.08, 0.06 r0.08, -0.04 r0.08]],
numparticles = [[0.45 r0.75]],
gravity = [[-0.03 r0.05, 0.06 r0.08, -0.03 r0.05]],
numparticles = [[0.45 r0.80]],
particlelife = 25,
particlelifespread = 8,
particlesize = 26,
particlesizespread = 36,
particlesize = 32,
particlesizespread = 44,
particlespeed = 0.3,
particlespeedspread = 0.6,
rotParams = [[-24 r48, -60 r120, -180 r360]],
animParams = [[16,6,50 r60]],
pos = [[-2 r4, 32 r12, -2 r4]],
sizegrowth = [[2.5 d+9 r4.0]],
sizegrowth = [[2.9 r4.0]],
sizemod = 0.92,
texture = [[BARFlame02]],
drawOrder = 1,
Expand Down Expand Up @@ -1278,7 +1277,7 @@ return {
emitrot = 90,
emitrotspread = 30,
emitvector = [[dir]],
gravity = [[-0.06 r0.12, 0.06 r0.08, -0.06 r0.12]],
gravity = [[0, 0.12, 0]],
numparticles = [[0.2 r0.81]],
particlelife = 7,
particlelifespread = 12,
Expand Down Expand Up @@ -1312,14 +1311,14 @@ return {
numparticles = [[0.40 r0.73]],
particlelife = 25,
particlelifespread = 8,
particlesize = 40,
particlesizespread = 50,
particlesize = 44,
particlesizespread = 59,
particlespeed = 0.3,
particlespeedspread = 0.6,
rotParams = [[-24 r48, -60 r120, -180 r360]],
animParams = [[16,6,50 r60]],
pos = [[-6 r12, 32 r12, -6 r12]],
sizegrowth = [[2.4 r3.0 d+20]],
sizegrowth = [[2.4 r3.0 d+22]],
sizemod = 0.82,
texture = [[BARFlame02]],
drawOrder = 1,
Expand Down
92 changes: 0 additions & 92 deletions effects/footsteps.lua
View file
Original file line number Diff line number Diff line change
@@ -1,98 +1,6 @@
-- unit footsteps CURRENTLY DISABLED

return {
["footstep-small"] = {
dirtsplat = {
class = [[CSimpleParticleSystem]],
count = 2, -- 2
ground = true,
properties = {
airdrag = 0.95,
colormap = [[0.08 0.06 0.02 0.88 0.1 0.07 0.033 0.68 0 0 0 0]],
directional = false,
emitrot = 180,
emitrotspread = 45,
emitvector = [[0, -0.3, 0]],
gravity = [[0, -0.08, 0]],
numparticles = 1,
particlelife = 13,
particlelifespread = 25,
particlesize = 4.0,
particlesizespread = 6,
particlespeed = 2.5,
particlespeedspread = 10,
pos = [[0, 3, 0]],
rotParams = [[-20 r40, 0, -180 r360]],
sizegrowth = [[-0.05 r0.18]],
sizemod = 1,
texture = [[randdots]],
useairlos = false,
alwaysvisible = false,
castShadow = true,
},
},
dirtg2 = {
air = true,
class = [[CSimpleParticleSystem]],
count = 1,-- 1
ground = true,
properties = {
airdrag = 0.67,
--colormap = [[0.20 0.18 0.14 0.55 0.35 0.30 0.27 0.50 0 0 0 0.01]],
colormap = [[0.15 0.12 0.07 0.7 0.06 0.04 0.04 0.4 0 0 0 0.01]],
directional = false,
emitrot = 60,
emitrotspread = 45,
emitvector = [[0, 1, 0]],
gravity = [[0, 0.11 r0.07, 0]],
numparticles = 1,
particlelife = 23,
particlelifespread = 13,
particlesize = 34,
particlesizespread = 19,
particlespeed = 2,
particlespeedspread = 2,
pos = [[-0.05 r0.1, 2 r2, -0.05 r0.1]],
rotParams = [[-10 r20, 0, -180 r360]],
sizegrowth = 0.04,
sizemod = 1.002,
texture = [[smoke-ice-anim]],
animParams = [[8,8,80 r45]],
useairlos = false,
alwaysvisible = false,
castShadow = true,
},
},
-- extradebree = {
-- air = true,
-- class = [[CSimpleParticleSystem]],
-- count = 0, -- 1
-- ground = true,
-- water = true,
-- underwater = true,
-- properties = {
-- airdrag = 0.94,
-- colormap = [[0.15 0.15 0.15 1 0.1 0.1 0.1 0.7 0 0 0 0]],
-- directional = false,
-- emitrot = 45,
-- emitrotspread = 45,
-- emitvector = [[0, 0.5, 0]],
-- gravity = [[0, -0.07, 0]],
-- numparticles = 2,
-- particlelife = 20,
-- particlelifespread = 30,
-- particlesize = 1,
-- particlesizespread = 4,
-- particlespeed = 6,
-- particlespeedspread = 14,
-- pos = [[0, 4, 0]],
-- sizegrowth = 0.2,
-- sizemod = 0.98,
-- texture = [[shard3]],
-- useairlos = false,
-- },
-- },
},
["footstep-medium"] = {
dirtsplat = {
class = [[CSimpleParticleSystem]],
Expand Down
7 changes: 1 addition & 6 deletions gamedata/sounds.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,7 @@ local soundData = {
-- WEAPON SOUNDS MULTI (more concurrent)
['weapons-mult'] = {
gain = 1.2 * 0.3,
pitchmod = {
default = 0.17,
custom = {
['^lasr'] = 0.03,
},
},
pitchmod = 0.17,
gainmod = 0.2 * 0.3,
dopplerscale = 1.0,
maxconcurrent = 15,
Expand Down
10 changes: 5 additions & 5 deletions luaui/Widgets/gfx_decals_gl4.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1701,16 +1701,16 @@ local UnitScriptDecalsNames = {
['corsumo'] = {
[1] = { -- LFOOT
texture = footprintsPath..'f_corsumo_a.png',
offsetx = -1, --offset from what the UnitScriptDecal returns
offsetz = -1, --
offsetx = 0, --offset from what the UnitScriptDecal returns
offsetz = 0, --
offsetrot = 0.0, -- in radians
width = 26,
width = 30,
height = 30,
heatstart = 0,
heatdecay = 0,
alphastart = 0.80,
alphastart = 0.85,
alphadecay = 0.0010,
maxalpha = 0.9,
maxalpha = 1.0,
bwfactor = 0.1,
glowsustain = 0.0,
glowadd = 0.0,
Expand Down
Loading

0 comments on commit 1c4c060

Please sign in to comment.