Skip to content

Commit 54b2d7f

Browse files
committed
move flame tweaks to separate object
1 parent 2a4b747 commit 54b2d7f

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

lovely/fixes.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ target = "functions/button_callbacks.lua"
116116
pattern = '''_F.timer = _F.timer + G.real_dt*(1 + _F.intensity*0.2)'''
117117
position = "at"
118118
payload = '''
119-
_F.intensity = clamp_bignum(_F.intensity, Talisman.flame_max)
120-
_F.timer = _F.timer + G.real_dt * math.min(1 + _F.intensity*0.2, Talisman.flame_dt_max)
119+
_F.intensity = clamp_bignum(_F.intensity, Talisman.flame_effect.max)
120+
_F.timer = _F.timer + G.real_dt * math.min(1 + _F.intensity*0.2, Talisman.flame_effect.dt_max)
121121
122122
if _F.intensity == 0 and not _F.less then
123123
_F.less = true
124-
if _F.timer > 60 * Talisman.flame_dt_max then _F.timer = 1 end
125-
if _F.real_intensity > Talisman.flame_decay then
126-
_F.real_intensity = Talisman.flame_decay
124+
if _F.timer > 60 * Talisman.flame_effect.dt_max then _F.timer = 1 end
125+
if _F.real_intensity > Talisman.flame_effect.decay then
126+
_F.real_intensity = Talisman.flame_effect.decay
127127
_F.intensity_vel = 0
128128
_F.change = 0
129129
end

talisman/configinit.lua

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ Talisman = {
33
mod_path = _mod_dir_amulet,
44

55
ante_switch_point = 1000000,
6-
flame_max = 1e100, -- Maximum flame intensity
7-
flame_decay = 25000, -- Maximum flame real intensity when intensity is switched to 0
8-
flame_dt_max = 131, -- Maximum flame deltatime (seconds)
96

107
cdataman = true,
118
Amulet = true
@@ -14,8 +11,6 @@ Talisman.api_version = {
1411
major = 3,
1512
minor = 4
1613
}
17-
Talisman.current_calc = {}
18-
Talisman.debug = {}
1914

2015
Talisman.config_file = {
2116
disable_anims = false,
@@ -88,5 +83,14 @@ function Talisman.update_debug()
8883
Talisman.debug.gfx_fix = Talisman.config_file.sanitize_graphics and 'yes' or nin
8984
end
9085

86+
Talisman.flame_effect = {
87+
max = 1e100, -- Maximum flame intensity
88+
decay = 25000, -- Maximum flame real intensity when intensity is switched to 0
89+
dt_max = 131, -- Maximum flame deltatime (seconds)
90+
}
91+
92+
Talisman.current_calc = {}
93+
Talisman.debug = {}
94+
9195
Talisman.config.load()
9296
Talisman.update_debug()

0 commit comments

Comments
 (0)