diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 373cc8a..88b3bad 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -56,7 +56,7 @@ (add-player-experience player 3)) (progn (format t "~&Ouch! That hurt! You take 2 HP fall damage.") (change-player-health player -2))) - (read-line) + (sleep 4) (goto player "Pooh's porch")) (defun kanga-healing (player) @@ -177,7 +177,7 @@ (defun leave-bee-tree (player) "Make sure you've climbed down before leaving the bee tree." - (when climbed (climb-down player) (read-line)))) + (when climbed (climb-down player) (pause 4)))) (let ((honey-found NIL)) (defun climb-rock (player &optional arg) diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 373cc8a..88b3bad 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -56,7 +56,7 @@ (add-player-experience player 3)) (progn (format t "~&Ouch! That hurt! You take 2 HP fall damage.") (change-player-health player -2))) - (read-line) + (sleep 4) (goto player "Pooh's porch")) (defun kanga-healing (player) @@ -177,7 +177,7 @@ (defun leave-bee-tree (player) "Make sure you've climbed down before leaving the bee tree." - (when climbed (climb-down player) (read-line)))) + (when climbed (climb-down player) (pause 4)))) (let ((honey-found NIL)) (defun climb-rock (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c11507c..4172058 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -85,7 +85,7 @@ description "You can feel the ground becoming soft underneath your feet as you approach the marshes and bogs to the south of the 100 Acre wood. Plenty of moss grows around the roots of - the trees. Here and there a willow bends its branches." + the trees. A couple of willows bend their branches here." item "Stick" neighbour "Central woods" neighbour "Eastern woods" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 373cc8a..88b3bad 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -56,7 +56,7 @@ (add-player-experience player 3)) (progn (format t "~&Ouch! That hurt! You take 2 HP fall damage.") (change-player-health player -2))) - (read-line) + (sleep 4) (goto player "Pooh's porch")) (defun kanga-healing (player) @@ -177,7 +177,7 @@ (defun leave-bee-tree (player) "Make sure you've climbed down before leaving the bee tree." - (when climbed (climb-down player) (read-line)))) + (when climbed (climb-down player) (pause 4)))) (let ((honey-found NIL)) (defun climb-rock (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c11507c..4172058 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -85,7 +85,7 @@ description "You can feel the ground becoming soft underneath your feet as you approach the marshes and bogs to the south of the 100 Acre wood. Plenty of moss grows around the roots of - the trees. Here and there a willow bends its branches." + the trees. A couple of willows bend their branches here." item "Stick" neighbour "Central woods" neighbour "Eastern woods" diff --git a/doc/TODO b/doc/TODO index 49e4524..1d50250 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,6 +1,7 @@ ATLANTIS TODO LISP +* implement autosave? * split ui.lisp into two modules (one for interaction functions) ATL @@ -21,6 +22,12 @@ 6. Kanga's quest 7. Eeyore's quest 8. Bee tree - 9. + 9. Cave (?) 10. - \ No newline at end of file + +Quests: + 1. Find the tail + 2. Bring jacket + 3. Bring mushrooms + 4. Reading material + 5. Bring honey \ No newline at end of file diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 373cc8a..88b3bad 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -56,7 +56,7 @@ (add-player-experience player 3)) (progn (format t "~&Ouch! That hurt! You take 2 HP fall damage.") (change-player-health player -2))) - (read-line) + (sleep 4) (goto player "Pooh's porch")) (defun kanga-healing (player) @@ -177,7 +177,7 @@ (defun leave-bee-tree (player) "Make sure you've climbed down before leaving the bee tree." - (when climbed (climb-down player) (read-line)))) + (when climbed (climb-down player) (pause 4)))) (let ((honey-found NIL)) (defun climb-rock (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c11507c..4172058 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -85,7 +85,7 @@ description "You can feel the ground becoming soft underneath your feet as you approach the marshes and bogs to the south of the 100 Acre wood. Plenty of moss grows around the roots of - the trees. Here and there a willow bends its branches." + the trees. A couple of willows bend their branches here." item "Stick" neighbour "Central woods" neighbour "Eastern woods" diff --git a/doc/TODO b/doc/TODO index 49e4524..1d50250 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,6 +1,7 @@ ATLANTIS TODO LISP +* implement autosave? * split ui.lisp into two modules (one for interaction functions) ATL @@ -21,6 +22,12 @@ 6. Kanga's quest 7. Eeyore's quest 8. Bee tree - 9. + 9. Cave (?) 10. - \ No newline at end of file + +Quests: + 1. Find the tail + 2. Bring jacket + 3. Bring mushrooms + 4. Reading material + 5. Bring honey \ No newline at end of file diff --git a/doc/bugreport.txt b/doc/bugreport.txt new file mode 100644 index 0000000..934cb07 --- /dev/null +++ b/doc/bugreport.txt @@ -0,0 +1,37 @@ +Hi Daniel, + +mein bisheriger Bericht: + + * Erklärung gut, bis auf: Speichern und Laden des putty-Setups + (Namen eingeben, speichern und drauf klicken zum laden). + -> TODO + * Wäre es sinnvoll über ‚quit‘ putty nicht komplett zu beenden, sondern nur + aufs Atlantis-Hauptmenü zurückzuführen? + -> Won't fix + * Das Spiel ist zweimal abgestürzt, als ich vom Floody Place zu Eeyore’s + Gloomy Place gehen wollte und einmal, als ich vom Hill zu Galleons Lap + gehen wollte. Das gleiche bei: Northern Woods -> Rapids. Eastern Woods -> + Christopher Robin’s House. Beim Honig collecten ist es auch einmal + abgestürzt. Jedesmal bei dem Versuch, etwas zu equippen. Beim Versuch, + eine leere Nachricht (also nur ein . ) zu schreiben. + -> movement bug: Could not reproduce + -> equip bug: Could not reproduce + -> empty message bug: FIXED + * Der letzte Satz in der Beschreibung der Southern Woods ist glaube ich + nicht korrekt. + -> FIXED + * Kann man gewollt vom Stream zum Floody Place, aber nicht umgekehrt? + -> Won't fix + * Beim Bee Tree wäre die Erwähnung von ‚climb down‘ ganz gut denke ich + (auch wenn der command nicht notwendig ist). + -> Won't fix + * Wenn ich von Pooh’s Branch springe, gelange ich erst nach einem weiteren + command zu Pooh’s Porch. + -> FIXED + * Gerade stürzt das Spiel bei jedem Versuch, von den Central Woods woanders + hin zu kommen, ab. Schade. + -> Could not reproduce + * Cool, was für schöne Details du eingebaut hast! + +Liebe Grüße, +Chris diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 373cc8a..88b3bad 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -56,7 +56,7 @@ (add-player-experience player 3)) (progn (format t "~&Ouch! That hurt! You take 2 HP fall damage.") (change-player-health player -2))) - (read-line) + (sleep 4) (goto player "Pooh's porch")) (defun kanga-healing (player) @@ -177,7 +177,7 @@ (defun leave-bee-tree (player) "Make sure you've climbed down before leaving the bee tree." - (when climbed (climb-down player) (read-line)))) + (when climbed (climb-down player) (pause 4)))) (let ((honey-found NIL)) (defun climb-rock (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c11507c..4172058 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -85,7 +85,7 @@ description "You can feel the ground becoming soft underneath your feet as you approach the marshes and bogs to the south of the 100 Acre wood. Plenty of moss grows around the roots of - the trees. Here and there a willow bends its branches." + the trees. A couple of willows bend their branches here." item "Stick" neighbour "Central woods" neighbour "Eastern woods" diff --git a/doc/TODO b/doc/TODO index 49e4524..1d50250 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,6 +1,7 @@ ATLANTIS TODO LISP +* implement autosave? * split ui.lisp into two modules (one for interaction functions) ATL @@ -21,6 +22,12 @@ 6. Kanga's quest 7. Eeyore's quest 8. Bee tree - 9. + 9. Cave (?) 10. - \ No newline at end of file + +Quests: + 1. Find the tail + 2. Bring jacket + 3. Bring mushrooms + 4. Reading material + 5. Bring honey \ No newline at end of file diff --git a/doc/bugreport.txt b/doc/bugreport.txt new file mode 100644 index 0000000..934cb07 --- /dev/null +++ b/doc/bugreport.txt @@ -0,0 +1,37 @@ +Hi Daniel, + +mein bisheriger Bericht: + + * Erklärung gut, bis auf: Speichern und Laden des putty-Setups + (Namen eingeben, speichern und drauf klicken zum laden). + -> TODO + * Wäre es sinnvoll über ‚quit‘ putty nicht komplett zu beenden, sondern nur + aufs Atlantis-Hauptmenü zurückzuführen? + -> Won't fix + * Das Spiel ist zweimal abgestürzt, als ich vom Floody Place zu Eeyore’s + Gloomy Place gehen wollte und einmal, als ich vom Hill zu Galleons Lap + gehen wollte. Das gleiche bei: Northern Woods -> Rapids. Eastern Woods -> + Christopher Robin’s House. Beim Honig collecten ist es auch einmal + abgestürzt. Jedesmal bei dem Versuch, etwas zu equippen. Beim Versuch, + eine leere Nachricht (also nur ein . ) zu schreiben. + -> movement bug: Could not reproduce + -> equip bug: Could not reproduce + -> empty message bug: FIXED + * Der letzte Satz in der Beschreibung der Southern Woods ist glaube ich + nicht korrekt. + -> FIXED + * Kann man gewollt vom Stream zum Floody Place, aber nicht umgekehrt? + -> Won't fix + * Beim Bee Tree wäre die Erwähnung von ‚climb down‘ ganz gut denke ich + (auch wenn der command nicht notwendig ist). + -> Won't fix + * Wenn ich von Pooh’s Branch springe, gelange ich erst nach einem weiteren + command zu Pooh’s Porch. + -> FIXED + * Gerade stürzt das Spiel bei jedem Versuch, von den Central Woods woanders + hin zu kommen, ab. Schade. + -> Could not reproduce + * Cool, was für schöne Details du eingebaut hast! + +Liebe Grüße, +Chris diff --git a/lisp/ui.lisp b/lisp/ui.lisp index 32a3e3a..3a5bd38 100644 --- a/lisp/ui.lisp +++ b/lisp/ui.lisp @@ -16,7 +16,7 @@ ;; TODO Split module in two -;; XXX Change to 5 once the (string-from-list) bug is fixed +;; TODO Change to 5 once the (string-from-list) bug is fixed (setf *max-line-items* 10) (defun play-game () @@ -32,13 +32,13 @@ (let ((place (get-game-object 'place (player-place player)))) (describe-place place) (input-string command) - (while (or (zerop (length command)) - (eql (aref command 0) #\Escape)) - (input-string command)) (while (not (and (or (equalp command "quit") (equalp command "exit")) (y-or-n-p "~&Really quit?"))) - (game-command command player) + (cond ((zerop (length command))) + ((not (alpha-char-p (aref command 0))) + (format t "~&Invalid input.")) + (T (game-command command player))) (input-string command)) (format t "~&Goodbye!"))))