vacation.p8

@@ -382,13 +382,8 @@ function wave(toff)
  return 2.5 * sin((t()+toff)>>1)
 end
 
-sea = {}
-mknew(sea)
-
-function sea:draw()
- rectfill(0, 72+wave(), 128, 84, 1)
-
-end
+waves={}
+mknew(waves)
 
 arcade_level = {
  score=0,
@@ -398,7 +393,8 @@ mknew(arcade_level, function(x)
  x.phin = toyphin.new{splasher=x}
  -- TODO: decent looking sky and sea
  x.sky = bg.new{c=12}
- x.sea = sea.new()
+ x.sea = bg.new{y=72, c=1}
+ x.waves = waves.new()
  -- event list includes words
  x.e = event_list.new()
  -- TODO: score renderer
@@ -446,38 +442,26 @@ function arcade_level:landing_splash(x, force, harder)
  -- TODO: sfx, vfx for landing from a jump
 end
 
--- palette use:
--- 0: shallow sea blue (1)
--- 1: black (for sprites)
--- 2: dolphin shading
--- 3: azure water, maybe score display? (140)
--- 4, 5, 6: unassigned, layer-specific
--- 7: dolphin highlights
--- 8, 9: unassigned, layer specific
--- 10: word primary (yellow 10?)
--- 11: word shadow (wood 132?)
--- 12: dolphin eye
--- 13: light splashy water (12), maybe sky?
--- 14: dolphin primary color
--- 15: highlight white (all layers)
---
--- dolphin colors are different
--- between zones; correlated.
--- wave, text, and black colors
--- are the same between zones.
--- other colors are for
--- elements that only ever
--- appear in one zone.
---
--- TODO: consider changing sky
--- colors in different stages;
--- document what colors those
--- are (nrm_pal) if so.
-game_nrm_pal = {
- [0] = 1, 0, 2, 140, 4, 5, 6, 7, 8, 9, 10, 132, 12, 12, 14, 7
+-- dolphin sprite states:
+-- spr args
+-- hitbox offset; it's always
+-- some fixed size (trying to
+-- figure out what that size is)
+-- multiple sprites: do the
+-- entire thing as multiple
+-- sprites, or only the tail?
+-- single sprite is bigger on
+-- the sprite sheet but easier
+-- to render.
+phin_nrm_pal = {
+ [2]=2,
+ [7]=7,
+ [14]=14,
 }
-game_uw_pal = {
- [0]=1, 0, 130, 140, 4, 5, 6, 13, 8, 9, 10, 132, 131, 12, 141, 7
+phin_uw_pal = {
+ [2]=130,
+ [7]=13,
+ [14]=141,
 }
 identity = {
  [0]=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
@@ -490,8 +474,8 @@ function setup_arcade_pal()
  memset(0x5f79,0xff,7)
  pal()
  pal(identity, 2)
- pal(game_nrm_pal, 1)
- pal(game_uw_pal, 2)
+ pal(phin_nrm_pal, 1)
+ pal(phin_uw_pal, 2)
 end
 
 phinstate_nrm = {