Add a ship status update every tick for testing.

darcs-hash:20081026040323-d53a8-6057d91e7389df98931cf6033ce1d335ad7e8602.gz
bshepherdson · Oct 26, 2008 · c24d40a · c24d40a
1 parent 4f78071
commit c24d40a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Main.hs b/Main.hs
@@ -128,7 +128,6 @@ tick x = do
     (ws,wh) <- gets wind
     cs' <- mapM (\c -> tickShip ws wh (cid c) (ship c) >>= \s -> return c { ship = s }) cs
     tickWind
-
 
 tickWind :: P ()
 tickWind = return ()   -- TODO: to be defined

diff --git a/Ship.hs b/Ship.hs
@@ -82,6 +82,7 @@ tickShip ws wh cid s@(Ship { course = c, orCourse = oc, rudder = r, turnRate = d
   when overshoot $ to cid ("Steady on course " ++ roundShow nc ++ ", Cap'n")
   let s'  = if overshoot then s { course = nc } else s { course = oc', orCourse = Nothing, rudder = 0 }
       s'' = moveShip ws wh s'
+  to cid $ showShip s''
   return s''
 
 moveShip :: Speed -> Heading -> Ship -> Ship
@@ -112,6 +113,10 @@ turnReport (Ship { rudder=r}) = "Rudder " ++ rudderReport r ++ ", aye."
 
 roundShow = show . round
 
+
+showShip :: Ship -> String
+showShip (Ship { course = c, orCourse = oc, sails = s, rudder = r, sx = x, sy = y }) = "Ship: ("++ show x ++","++ show y++"), course "++ show c ++", ordered course "++show oc++", rudder " ++ rudderReport r
+
 -----------------------------
 ----- utility functions  ----
 -----------------------------