kistaro/mmbshmup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: kistaro:9ef762268f3a9405fd06bf46f6f981781bf3566f
Branches Tags
kistaro:main
kistaro:hud-update
kistaro:bullet_refactor
kistaro:level_parser
kistaro:color_theory
..
compare: kistaro:f9e28fa0e280aa0a03dc3c53218699de609fc221
Branches Tags
kistaro:main
kistaro:hud-update
kistaro:bullet_refactor
kistaro:level_parser
kistaro:color_theory

No commits in common. "9ef762268f3a9405fd06bf46f6f981781bf3566f" and "f9e28fa0e280aa0a03dc3c53218699de609fc221" have entirely different histories.
9ef762268f ... f9e28fa0e2

1 changed files with 9 additions and 11 deletions
Show Stats Expand all files Collapse all files

20
updatedshmup.p8
View File

@ -691,7 +691,7 @@ spewy = frownie.new{
} }
mknew(spewy, function(ship) mknew(spewy, function(ship)
ship.main_gun=ship.main_gun or protron_gun.new{enemy=true} ship.main_gun=ship.main_gun or protron_gun.new{enemy=true}
end) end})
chasey = ship_m.new{ chasey = ship_m.new{
sprite = 5, sprite = 5,
@ -872,7 +872,7 @@ function load_level(levelfile)
currentlevel[row[1]]=row currentlevel[row[1]]=row
end end
end end
assert(found_eol) assert found_eol
end end
function level_frame() function level_frame()
@ -889,7 +889,7 @@ function level_frame()
while cbs do while cbs do
assert(cbs[1] == distance) assert(cbs[1] == distance)
local f = _ENV[cbs[2]] local f = _ENV[cbs[2]]
assert(type(f) == "function", cbs[2].." at "..distance.." is not a function") assert(type(f) == "function", cbs[2].." at "..distance..." is not a function")
f(unpack(cbs, 3)) f(unpack(cbs, 3))
cbs=cbs.next cbs=cbs.next
end end
@ -914,7 +914,7 @@ function spawn_blocking_rnd_x(typ)
freeze -= self.ice freeze -= self.ice
self.ice = 0 self.ice = 0
self:orig_die() self:orig_die()
end, end
} }
eships:push_back(s) eships:push_back(s)
return s return s
@ -1020,14 +1020,14 @@ function spawn_rnd(typ, blocking, goodie,altspr)
freeze += blocking freeze += blocking
s = typ.new{ s = typ.new{
x = rnd(104), x = rnd(104),
y = -(typ.size * 8 - 1), y = -(typ.size * 8 - 1)
ice=blocking, ice=blocking
die=function(self) die=function(self)
freeze -= self.ice freeze -= self.ice
self.ice=0 self.ice=0
typ.die(self) typ.die(self)
spawn_goodie(goodie, self.x, self.y, self.size) spawn_goodie(goodie, self.x, self.y, self.size)
end, end
} }
if (altspr) s.spr = altspr if (altspr) s.spr = altspr
eships:push_back(s) eships:push_back(s)
@ -1043,7 +1043,7 @@ function spawn_goodie(goodie_name, x, y, sz)
end end
function multi(times, interval, fnm, ...) function multi(times, interval, fnm, ...)
local f,irm,vargs = _ENV[fnm],interval,pack(...) local f,irm = _ENV[fnm],interval
assert(type(f) == "function", fnm.." not a function") assert(type(f) == "function", fnm.." not a function")
fnm(...) fnm(...)
events:push_back{move=function() events:push_back{move=function()
@ -1051,7 +1051,7 @@ function multi(times, interval, fnm, ...)
if irm <= 0 then if irm <= 0 then
irm=interval irm=interval
times-=1 times-=1
fnm(unpack(vargs)) fnm(...)
return times <= 1 return times <= 1
end end
end} end}
@ -1943,7 +1943,6 @@ gun_swap = powerup.new{
mknew(gun_swap) mknew(gun_swap)
function spawn_main_gun_at(x, y, gunt) function spawn_main_gun_at(x, y, gunt)
if (type(gunt)=="string") gunt=_ENV[gunt]
local gun_p = gun_swap.new{ local gun_p = gun_swap.new{
gun = gunt.new() gun = gunt.new()
} }
@ -1957,7 +1956,6 @@ spec_gun_pl = {
} }
function spawn_spec_gun_at(x, y, gunt) function spawn_spec_gun_at(x, y, gunt)
if (type(gunt)=="string") gunt=_ENV[gunt]
local gun_p = gun_swap.new{ local gun_p = gun_swap.new{
gun = gunt.new(), gun = gunt.new(),
hitship = function(self, ship) hitship = function(self, ship)