make level less spewy, finish renaming s to icon

vacuum_gambit.p8

@@ -1476,11 +1476,11 @@ example_level_csv=[[1,spawn_frownie
 60,spawn_vulcan_chasey
 61,spawn_blocky
 85,spawn_spewy
-100,spawn_spewy
 115,spawn_spewy
 130,spawn_frownie
-145,spawn_spewy
-200,spawn_chasey
+145,spawn_frownie
+180,spawn_spewy
+230,spawn_chasey
 250,spawn_blocking_blocky
 310,spawn_blocking_blocky
 310,spawn_blocking_blocky
@@ -1493,7 +1493,7 @@ example_level_csv=[[1,spawn_frownie
 465,spawn_frownie
 480,spawn_chasey
 500,multi,20,12,spawn_blocking_blocky
-501,spawns_frownie
+501,spawn_frownie
 620,spawn_blocking_blocky
 630,spawn_vulcan_chasey
 720,spawn_blocking_boss_chasey
@@ -1644,7 +1644,7 @@ end
 -- all these return
 -- a [2] of rearm_t:
 --
--- s: sprite id
+-- icon: sprite id
 -- hdr: title text
 -- body: text
 -- action: callback
@@ -1678,13 +1678,13 @@ end
 -- major upgrades
 function big_opts()
  return {{
-  s=1,
+  icon=1,
   hdr="placeholder",
   body="placeholder",
   action = function() end,
  },
  {
-  s=1,
+  icon=1,
   hdr="placeholder",
   body="placeholder",
   action = function() end,
@@ -1694,13 +1694,13 @@ end
 -- ordinary upgrades
 function small_opts()
  return {{
-  s=1,
+  icon=1,
   hdr="placeholder",
   body="placeholder",
   action = function() end,
  },
  {
-  s=1,
+  icon=1,
   hdr="placeholder",
   body="placeholder",
   action = function() end,
@@ -1761,7 +1761,7 @@ end
 function rearm_mode:draw_option(id)
  local rec = self.options[id]
  self:glow_box(0,0,55,100,self:frame_col(self.sel == id),1)
- spr(rec.s,5, 5)
+ spr(rec.icon,5, 5)
  print(rec.hdr, 13, 8, 7)
  print(rec.body, 5, 15, 6)
 end