Day 2 progress.

1 files changed, 17 insertions, 7 deletions

diff --git a/apple-town-fair/save-state.scm b/apple-town-fair/save-state.scm
index 2ff27a7..abeb3e6 100644
--- a/apple-town-fair/save-state.scm
+++ b/apple-town-fair/save-state.scm
@@ -14,21 +14,31 @@
 ;;; along with this program.  If not, see
 ;;; <http://www.gnu.org/licenses/>.
 (define-module (apple-town-fair save-state)
+  #:use-module (apple-town-fair common)
   #:use-module (catbird config)
   #:use-module (oop goops)
   #:export (<save-state>
-            place
-            story-points
+            %day-end
+            %day-start
+            %money-start
+            %time-sleep
+            %time-wake
+            flags
             inventory
             money
-            flags))
+            story-points))
+
+(define %time-wake 6)
+(define %time-sleep 22)
+(define %day-start 0)
+(define %day-end 2)
+(define %money-start 20.0)
 
 (define-root-class <save-state> ()
-  (place #:accessor place #:init-keyword #:place #:init-value 'home)
   (story-points #:accessor story-points #:init-keyword #:story-points
                 #:init-value 0)
-  (day #:accessor day #:init-keyword #:day #:init-value 0)
-  (time #:accessor time #:init-keyword #:time #:init-value 0)
+  (day #:accessor day #:init-keyword #:day #:init-value %day-start)
+  (time #:accessor time #:init-keyword #:time #:init-value %time-wake)
+  (money #:accessor money #:init-keyword #:money #:init-value %money-start)
   (inventory #:accessor inventory #:init-keyword #:inventory #:init-value '())
-  (money #:accessor money #:init-keyword #:money #:init-value 20.0)
   (flags #:accessor flags #:init-keyword #:flags #:init-value '()))