Move characters to separate modules.

1 files changed, 5 insertions, 160 deletions

diff --git a/scenes/game.scm b/scenes/game.scm
index f34787d..bc3f690 100644
--- a/scenes/game.scm
+++ b/scenes/game.scm
@@ -33,6 +33,9 @@
   #:use-module (engine node-2d)
   #:use-module (engine scene)
   #:use-module (oop goops)
+  #:use-module (characters)
+  #:use-module (characters lorenzo)
+  #:use-module (characters reaper)
   #:export (game))
 
 (use-modules (chickadee)
@@ -45,15 +48,6 @@
 (define %message-margin 3.0)
 
 
-(define-class <character> (<node-2d>)
-  (conversations #:accessor conversations #:init-keyword #:conversations)
-  (accepted-messages #:accessor accepted-messages #:init-form '(hello))
-  (speaking? #:accessor speaking? #:init-form #f)
-  (velocity #:getter velocity #:init-form (vec2 0.0 0.0))
-  (walk-speed #:accessor walk-speed #:init-form 0.8)
-  (direction #:accessor direction #:init-form '(idle))
-  (hitbox #:getter hitbox #:init-form (make-rect 8.0 0.0 16.0 16.0)))
-
 (define-class <stats> (<node-2d>)
   (object #:accessor object #:init-form #f #:init-keyword #:object))
 
@@ -83,55 +77,6 @@
                 directions)
       (set! (direction character) directions))))
 
-(define-class <player> (<character>)
-  (previous-key-presses #:accessor previous-key-presses #:init-form (list))
-  (selecting-message? #:accessor selecting-message? #:init-form #f)
-  (action-held #:accessor action-held #:init-form #f)
-  (lifetime #:accessor lifetime #:init-form 100)
-  (happiness #:accessor happiness #:init-form 50)
-  (weight #:accessor weight #:init-form 50)
-  (music #:accessor music #:init-form 50)
-  (talking? #:accessor talking? #:init-form #f))
-
-(define (load-atlas file-name tile-width tile-height)
-  (split-texture (load-image file-name) tile-width tile-height))
-
-(define-asset player-atlas
-  (load-atlas "assets/images/lorenzo.png" 32 32))
-
-(define-method (populate (player <player>))
-  (list
-   (make <animated-sprite>
-     #:name 'sprite
-     #:atlas player-atlas
-     #:animations '((idle-right . #(8 8 8 8 8 7 7 7 7 7))
-                    (idle-left  . #(0 0 0 0 0 15 15 15 15 15))
-                    (idle-front . #(24 24 24 24 24 32 32 32 32 32))
-                    (idle-back  . #(16))
-                    (left       . #(1 35 2 35))
-                    (right      . #(9 34 10 34))
-                    (up         . #(17 16 18 16))
-                    (down       . #(25 24 26 24)))
-     #:current-animation 'idle-front
-     #:frame-duration 10)))
-
-
-(define-class <reaper> (<character>))
-
-(define-asset reaper-atlas
-  (load-atlas "assets/images/reaper.png" 32 32))
-
-(define-method (populate (reaper <reaper>))
-  (list
-   (make <animated-sprite>
-     #:name 'sprite
-     #:atlas reaper-atlas
-     #:animations '((idle  . #(0 0 0 1 1 1 9 1 1 1 8 8 8 8 8 8 5 4 4 4 0 0 0 3 3))
-                    (pause . #(4 4 4 4 4 4 4 5))
-                    (talk  . #(0 3 2 7 5 4 6 5 3 2 2 2 4 4 0 0 0)))
-     #:current-animation 'idle
-     #:frame-duration 20)))
-
 
 (define-asset test-map (load-tile-map "assets/maps/01.tmx"))
 
@@ -167,108 +112,8 @@ map's object layer."
         (vec2 0.0 0.0))))
 
 (define-method (populate (game <game>))
-  (let ((player (make <player>
-                  #:name 'player
-                  #:position (start-position game "player")
-                  #:children
-                  ;; Simple player shadow.  This should better be done
-                  ;; with a single ellipse shader.
-                  (let ((color (make-color 0 0 0 0.2)))
-                    (map (lambda (n x w)
-                           (make <filled-rect>
-                             #:region (make-rect 0.0 0.0 w 1.0)
-                             #:position (vec2 x (- 2 n))
-                             #:color color))
-                         ;; position in the stack
-                         (iota 5)
-                         ;; x offsets
-                         (list 12 10 8 10 12)
-                         ;; widths
-                         (list 8 12 16 12 8))))))
-    (list (make <reaper>
-            #:name 'reaper
-            #:position (start-position game "reaper")
-            #:conversations
-            '((hello
-               "Salutations!"
-               ((who-are-you? "Who are you?")
-                (bye "I have to leave now. Bye!")))
-              (who-are-you?
-               "It's complicated. People have given me too many names to recount.
-Paul Celan called me a master from Germany, but he must have confused
-me with somebody else. Some call me a part of life, but I think that's
-missing the point. Others call me the grim reaper, but do I look grim
-to you?"
-               ((grim-no "No, not at all.")
-                (grim-yes "Well, actually you kinda do...")
-                (grim-bye "I can't answer, I need to go.")))
-              (grim-bye
-               "Well, I guess that's a 'yes'..."
-               ())
-              (grim-no
-               "Ah, that's a relief!"
-               ((what-do-you-do?
-                 "I hope you don't mind me asking: what is it you're
-doing here?")
-                (bye
-                 "Well, it was nice meeting you. See you around!")))
-              (grim-yes
-               "Hmm, that's very unfortunate. I just can't figure out
-why people have that impression. It's rather depressing."
-               ((its-the-robe "Maybe it's the robe?")
-                (dont-worry "Aww, don't feel bad about it!")
-                (bye "I'm sure you'll be okay. Gotta go!")))
-              (its-the-robe
-               "I don't see how this comfortable robe could have that
-effect. The fabric is a little coarse, I admit, but it's really
-durable and doesn't chafe on my bones. Excellent quality."
-               ((what-do-you-do?
-                 "So... what do you do around here?")
-                (bye "That's really interesting, but I'm afraid I need
-to hurry. Bye!")))
-              (dont-worry
-               "Yeah, I guess I shouldn't. It just tears me
-down. Luckily, the garden keeps me distracted."
-               ((what-do-you-grow? "Oh, you have a garden? What do you
-grow there?")
-                (bye "That's good. Well, I should go now. Bye!")))
-              (what-do-you-do?
-               "Well, you may have noticed the garden behind the house.
-For the past few eons I have been tending to it."
-               ((eons? "Did you say 'eons'?")
-                (what-do-you-grow? "Oh, that's nice! What do you grow there?")
-                (bye "I see. Unfortunately, I must get going now.")))
-              (eons?
-               "Oh yes, I have been here long before you appeared and
-I will be here long after you will have rejoined the void. You could
-say that I /am/ the void, occasionally receding just enough for a
-little bit of inconsequential folly before eventually and invariably
-restoring equilibrium."
-               ;; TODO
-               ())
-              (what-do-you-grow?
-               "You know, this and that. I enjoy soul food, and it's
-best when the ingredients are fresh."
-               ())
-              (bye
-               "Farewell! Don't be afraid, for I'm always here for
-you.  I'm sure we will meet again sooner than you expect."
-               ()))
-            #:children
-            ;; Simple shadow.  This should better be done with a
-            ;; single ellipse shader.
-            (let ((color (make-color 0 0 0 0.2)))
-              (map (lambda (n x w)
-                     (make <filled-rect>
-                       #:region (make-rect 0.0 0.0 w 1.0)
-                       #:position (vec2 (+ 3 x) (- 2 n))
-                       #:color color))
-                   ;; position in the stack
-                   (iota 5)
-                   ;; x offsets
-                   (list 12 10 8 10 12)
-                   ;; widths
-                   (list 12 16 20 16 12))))
+  (let ((player (lorenzo (start-position game "player"))))
+    (list (reaper (start-position game "reaper"))
           (make <filled-rect>
             #:name 'hit
             #:region (make-rect 0.0 0.0 0.0 0.0)