diff --git a/updatedshmup.p8 b/updatedshmup.p8 index ebabd4c..e9957fe 100644 --- a/updatedshmup.p8 +++ b/updatedshmup.p8 @@ -118,7 +118,7 @@ function _init() init_blip_pals() wipe_level() primary_ship.main_gun = zap_gun.new() - load_level(example_level) + load_level(example_level_csv) state = game pal(2,129) pal() @@ -860,7 +860,8 @@ function load_level(levelfile) leveldone = false current_level = {} local found_eol = false - for row in all(csv(levelfile)) do + if (type(levelfile)=="string") levelfile = csv(levelfile) + for row in all(levelfile) do local x = current_level[row[1]] if row[2] == "eol" then found_eol = true @@ -1062,51 +1063,33 @@ end -- each row of level csv is offset,event,event-args... -- where offset,eol is a special case. -example_level = { - [1]=spawn_frownie, - [60]=spawn_bonus_vulcan_chasey, - [61]=spawn_blocky, - [85]=spawn_spewy, - [100]=spawn_spewy, - [115]=spawn_spewy, - [130]=spawn_bonus_frownie, - [145]=spawn_spewy, - [200]=spawn_chasey, - [250]=spawn_blocking_blocky, - [285]=function() - spawn_spec_gun_at(35, -11, blast_gun) - end, - [310]=function() - spawn_blocking_blocky() - spawn_blocking_blocky() - spawn_blocking_blocky() - end, - [311]=spawn_frownie, - [350]=function() - spawn_main_gun_at(70, -11, protron_gun) - end, - [401]=spawn_frownie, - [420]=spawn_blocking_frownie, - [430]=spawn_bonus_vulcan_chasey, - [450]=spawn_frownie, - [465]=spawn_bonus_frownie, - [480]=spawn_chasey, - [500]=function() - local tnext = lframe - local remain = 20 - events:push_back{move=function() - if (lframe < tnext) return false - spawn_blocking_blocky() - tnext = lframe + 0x0.000c - remain -= 1 - return (remain <= 0) - end} - end, - [501]=spawn_bonus_frownie, - [620]=spawn_blocking_blocky, - [700]=spawn_blocking_boss_chasey, - [701]=eol -} +example_level_csv=[[1,spawn_frownie +60,spawn_bonus_vulcan_chasey +61,spawn_blocky +85,spawn_spewy +100,spawn_spewy +115,spawn_spewy +130,spawn_bonus_frownie +145,spawn_spewy +200,spawn_chasey +250,spawn_blocking_blocky +285,spawn_spec_gun_at,35,-11,blast_gun +310,spawn_blocking_blocky +310,spawn_blocking_blocky +310,spawn_blocking_blocky +311,spawn_frownie +350,spawn_main_gun_at,70,-11,protron_gun +401,spawn_frownie +420,spawn_blocking_frownie +430,spawn_bonus_vulcan_chasey +450,spawn_frownie +465,spawn_bonus_frownie +480,spawn_chasey +500,multi,20,12,spawn_blocking_blocky +501,spawn_bonus_frownie +620,spawn_blocking_blocky +700,spawn_blocking_boss_chasey +701,eol]] -->8 -- bullet and gun behaviors