5 Commits

Author SHA1 Message Date
7e4833d567 very silly shot pattern 2025-06-28 23:11:27 -07:00
c752e8e1e3 fix hpcols_init
note that I need to re-call this whenever I have a new max hp

also note that vertmeter does not handle 1024 correctly. find out what max hp functions and hardcap it
2025-06-28 23:10:57 -07:00
507f06fb8c more efficient bullet spawning 2025-06-28 22:59:51 -07:00
14849101dd skip call to sparks if there are no sparks
Then don't check for nil spark colors in sparks itself.

Also uses a more verbose but more efficient exit check, and fixes a bug.
2025-06-28 22:49:10 -07:00
2cd7c64dd9 micro-optimize bullet details
Shots that miss are most likely to not be there yet, so check Y-top first.

If I assume shots will never be larger than 16 pixels per side, there is
no reason to check the ship's genuine width and height.
2025-06-28 22:35:36 -07:00

View File

@ -130,7 +130,7 @@ hpcols_lut = csv[[36
-- call after any change to maxhp
-- configures health gradient
function init_hpcols()
hpcols = hpcols_lut[min(primary_ship.maxhp,6)]
hpcols = hpcols_lut[min(primary_ship.maxhp,5)]
end
function wipe_game()
@ -539,7 +539,7 @@ function ship_m:move()
if (self.dead) return;
self:refresh_shield()
local dx, dy, shoot_spec1, shoot_spec2 = self:act()
local sg, xm, ym = self.special_guns, self.xmomentum, self.ymomentum
local sg, xm, ym, sp = self.special_guns, self.xmomentum, self.ymomentum, self.sparks
dx = self:constrain(self.x, xm, self.xmin, self.xmax, dx)
dy = self:constrain(self.y, ym, self.ymin, self.ymax, dy)
self:maybe_shoot(self.main_gun)
@ -547,7 +547,7 @@ function ship_m:move()
if (shoot_spec1) self:maybe_shoot(sg[1])
if (shoot_spec2) self:maybe_shoot(sg[2])
end
spark(self.sparks, self.x + 4*self.size, self.y + 4*self.size, dx*2.5, dy*2.5, self.sparkodds)
if(sp) spark(sp, self.x + 4*self.size, self.y + 4*self.size, dx*2.5, dy*2.5, self.sparkodds)
xm = self:calc_velocity(xm, dx)
ym = self:calc_velocity(ym, dy)
@ -618,14 +618,6 @@ end
-->8
-- bullet and gun behaviors
function player_blt_cat()
return pbullets
end
function enemy_blt_cat()
return ebullets
end
-- x, y: position
-- dx, dy: movement (linear)
-- f: frames remaining; nil for no limit
@ -638,9 +630,9 @@ end
-- details, check impl
-- damage -- damage to do to
-- a ship that gets hit
-- category -- function that
-- returns which bullet list
-- to spawn onto
-- category -- string naming
-- which bullet list to spawn
-- onto, from _ENV
-- hitship -- event handler,
-- takes ship as argument.
-- default: die, return true.
@ -775,7 +767,7 @@ end
function bullet_base:move()
local x,y = self.x + self.dx, self.y+self.dy
self.x,self.y=x,y
return (y<=128) and (y >= -(self.height<<3)) and (x <= 128) and (x >= -(self.width<<3))
return (y<=128) and (y >= -16) and (x <= 128) and (x >= -16)
end
function bullet_base:draw()
@ -785,7 +777,7 @@ end
function bullet_base:spawn_at(x, y)
self.x = x - self.x_off
self.y = y - self.y_off
add(self.category(), self)
add(_ENV[self.category], self)
end
function gun_base:shoot(x, y)
@ -855,7 +847,7 @@ zap_p = mknew(bullet_base.new{
hitship = const_fxn(true),
category = player_blt_cat,
category = "pbullets",
})
zap_gun_p = mknew(gun_base.new{
@ -914,7 +906,7 @@ blast = mknew(bullet_base.new{
end)
end
end,
category=player_blt_cat
category="pbullets"
})
blast_gun = mknew(gun_base.new{
@ -953,14 +945,14 @@ protron_e = mknew(bullet_base.new{
y_off = 4,
damage = 1,
category = enemy_blt_cat,
category = "ebullets",
})
protron_p = mknew(protron_e.new{
sprite=23,
dym = -1,
y_off = 0,
category=player_blt_cat,
category="pbullets",
})
protron_gun_e = mknew(gun_base.new{
@ -1007,13 +999,13 @@ vulcan_e = mknew(bullet_base.new{
y_off = 0,
damage = 0.5,
category=enemy_blt_cat
category="ebullets"
})
vulcan_p = mknew(vulcan_e.new{
sprite=22,
y_off = 4,
category=player_blt_cat
category="pbullets"
})
vulcan_gun_e = mknew(gun_base.new{
@ -1030,7 +1022,7 @@ machine_gun_e = mknew(vulcan_gun_e.new{
icon = 38,
clip_size = 12,
clip_interval = 0x0.005a,
shots = {{{0, 2}}, {{0, -2}}}
shots = {{{0.0625, 2}}, {{-0.0625, -2}}}
})
vulcan_gun_p = mknew(vulcan_gun_e.new{
@ -1072,8 +1064,8 @@ player = mknew(ship_m.new{
boss = true, -- dramatic special effects
-- health
hp = 3, -- current health, non-regenerating
maxhp = 3, -- player only; other ships never heal
hp = 1024, -- current health, non-regenerating
maxhp = 1024, -- player only; other ships never heal
shield = 2, -- regenerates
maxshield = 2,
@ -1351,11 +1343,11 @@ end
-- box: x1, y1, x2, y2
function collides(b1, b2)
return
b1.x1<=b2.x2
and b1.y1<=b2.y2
and b1.x2>=b2.x1
return
b1.y1<=b2.y2
and b1.y2>=b2.y1
and b1.x1<=b2.x2
and b1.x2>=b2.x1
end
collider = mknew{
@ -1637,7 +1629,7 @@ function spark_particle:draw()
end
function spark(sprs, x, y, dx, dy, odds, fg)
if (sprs==nil or flr(rnd(odds) or (abs(dx) < 0.5 and abs(dy))) ~= 0) return
if ((dx > -0.5 and dx < 0.5 and dy > -0.5 and dy < 0.5) or rnd(odds) >= 1) return
local target = fg and intangibles_fg or intangibles_bg
target[#target+1] = spark_particle.new{
x = x + rnd(4) - 2,
@ -1656,7 +1648,7 @@ xp_gem = mknew(bullet_base.new{
dy = 0.75,
width=1, -- not used for spr but
height=1,-- bullet_base uses it
category = enemy_blt_cat,
category = "ebullets",
damage = 0,
hurt = {
x_off = -2,