Skip to content

Commit ec21023

Browse files
committed
Simplify some of the code
1 parent 3ef24aa commit ec21023

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

dklavapanic/init.lua

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ function dklavapanic.startplugin()
7676
if mode2 == 7 or mode2 == 10 or mode2 == 11 or mode2 == 1 then
7777
-- recalculate difficulty at start of level or when in attract mode
7878
local level = mem:read_i8(0x6229)
79-
lava_difficulty = math_floor(1.2 * (22 - level))
8079
if stage == 4 then
81-
lava_difficulty = math_floor(1.5 * (22 - level)) -- more time for rivets
80+
lava_difficulty = math_floor(1.5 * (22 - level)) -- more time for rivets
8281
elseif stage == 3 then
83-
lava_difficulty = math_floor(0.75 * (22 - level)) -- less time for elevators
82+
lava_difficulty = math_floor(0.75 * (22 - level)) -- less time for elevators
83+
else
84+
lava_difficulty = math_floor(1.2 * (22 - level))
8485
end
8586
-- reset lava level
8687
lava_y = -7
@@ -104,12 +105,12 @@ function dklavapanic.startplugin()
104105
jumpman_y = 264 - mem:read_u8(0x6205)
105106
if lava_y + 10 > jumpman_y then
106107
-- Dim the screen above lava flow
107-
version_draw_box(256, 224, lava_y, 0, 0x66990000, 0x0)
108+
version_draw_box(256, 224, lava_y, 0, 0x44000000, 0x0)
108109

109110
-- PANIC! text with flashing colour palette for dramatic effect
110111
if math_fmod(mem:read_u8(0x601a), 32) <= 16 then
111112
mem:write_i8(0x7d86, 0)
112-
block_characters("PANIC!", 128, 16, 0xffEE7511, 0xffffff99)
113+
block_characters("PANIC!", 128, 16, 0xffff0000, 0xffffff99)
113114
else
114115
mem:write_i8(0x7d86, 1)
115116
end
@@ -146,21 +147,14 @@ function dklavapanic.startplugin()
146147
-- Add dancing flames above lava
147148
for _, i in pairs({8, 24, 40, 56, 72, 88, 104, 120, 136, 152, 168, 184, 200, 216}) do
148149
if math_random(3) == 1 then
149-
local adjust_y = math_random(-5, 4)
150-
local flame_y = lava_y + adjust_y
151-
local flame_color = 0xfff4bA15
150+
local flame_y = lava_y + math_random(-5, 4)
152151
if flame_y > 0 then
153-
if adjust_y > 0 then
154-
flame_color = 0xfff4bA15
155-
else
156-
flame_color = 0xffe8070a
157-
end
158152
-- Draw flame graphic
159-
version_draw_box(flame_y + 1, i - 1, flame_y + 2, i - 2, flame_color, 0x0)
160-
version_draw_box(flame_y + 2, i - 2, flame_y + 3, i - 3, flame_color, 0x0)
161-
version_draw_box(flame_y + 3, i - 1, flame_y + 4, i - 2, flame_color, 0x0)
162-
version_draw_box(flame_y + 4, i - 0, flame_y + 5, i - 1, flame_color, 0x0)
163-
version_draw_box(flame_y + 5, i - 1, flame_y + 6, i - 2, flame_color, 0x0)
153+
version_draw_box(flame_y + 1, i - 1, flame_y + 2, i - 2, 0xfff4bA15, 0x0)
154+
version_draw_box(flame_y + 2, i - 2, flame_y + 3, i - 3, 0xfff4bA15, 0x0)
155+
version_draw_box(flame_y + 3, i - 1, flame_y + 4, i - 2, 0xfff4bA15, 0x0)
156+
version_draw_box(flame_y + 4, i - 0, flame_y + 5, i - 1, 0xfff4bA15, 0x0)
157+
version_draw_box(flame_y + 5, i - 1, flame_y + 6, i - 2, 0xfff4bA15, 0x0)
164158
end
165159
end
166160
end

0 commit comments

Comments
 (0)