diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index a720ff6..ac8cdc6 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -34,6 +34,13 @@ useful, especially as it's stuck to five-to-eleven. So surely it's time for a little something now, isn't it?" fixed + +define-item "Birthday card" + description "A friend gave this to you on your last birthday and you pinned + it to your wall. It shows the statue of a man deep in thought, with + the caption (added by your friend): + DON'T FORGET TO THINK!" + fixed define-item "Pooh's sign" description " @@ -192,6 +199,23 @@ a good idea to carry this around with you..." command "read" +define-item "Foot path" + description "A worn-out path snakes its way from Christopher Robin's front + door towards the eastern woods. He must be going that way regularly." + fixed + +define-item "Flattened undergrowth" + description "Looking closely, you see that somebody has been pushing + through the undergrowth here, flattening it and breaking + some twigs. Whoever it was seems to have been on his way + to the central woods." + fixed + +define-item "Boot print" + description "On a particularly soft piece of ground, somebody has left his + mark. A solitary boot print, pointing towards the hill..." + fixed + define-item "Foot prints" description "These foot prints look as if they were made by a pair of gum boots going up the hill towards Galleons Lap. Now, why would a diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index a720ff6..ac8cdc6 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -34,6 +34,13 @@ useful, especially as it's stuck to five-to-eleven. So surely it's time for a little something now, isn't it?" fixed + +define-item "Birthday card" + description "A friend gave this to you on your last birthday and you pinned + it to your wall. It shows the statue of a man deep in thought, with + the caption (added by your friend): + DON'T FORGET TO THINK!" + fixed define-item "Pooh's sign" description " @@ -192,6 +199,23 @@ a good idea to carry this around with you..." command "read" +define-item "Foot path" + description "A worn-out path snakes its way from Christopher Robin's front + door towards the eastern woods. He must be going that way regularly." + fixed + +define-item "Flattened undergrowth" + description "Looking closely, you see that somebody has been pushing + through the undergrowth here, flattening it and breaking + some twigs. Whoever it was seems to have been on his way + to the central woods." + fixed + +define-item "Boot print" + description "On a particularly soft piece of ground, somebody has left his + mark. A solitary boot print, pointing towards the hill..." + fixed + define-item "Foot prints" description "These foot prints look as if they were made by a pair of gum boots going up the hill towards Galleons Lap. Now, why would a diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 67195e3..61cd8da 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -65,7 +65,7 @@ (unless current-jars (setf current-jars 0)) (if (member "Hunny" (player-item player) :test #'equalp) (unless (= current-jars 12) - (format t "~&You deposit one jar of honey in your larder.") + (format t "~&You deposit one jar of honey in your cupboard.") (remove-object-attribute player 'item "Hunny") (incf current-jars) (save-state 'HONEY-JARS current-jars) @@ -373,7 +373,7 @@ "The Woozle scratches when you try to pick him up." (change-player-health player -1) (format t "~&The woozle scratches you! -1 HP") - (when (> 75 (random 100)) + (when (> 80 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -382,7 +382,8 @@ (defun woozle-disappear (player &optional arg) "If you drop him, the Woozle escapes." (let ((place (get-game-object 'place (player-place player)))) - (remove-object-attribute place 'item "Woozle") + (unless (equalp (place-name place) "Woozle hideout") + (remove-object-attribute place 'item "Woozle")) (format t "~&The Woozle runs away!"))) (defun craft (player &optional arg) diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index a720ff6..ac8cdc6 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -34,6 +34,13 @@ useful, especially as it's stuck to five-to-eleven. So surely it's time for a little something now, isn't it?" fixed + +define-item "Birthday card" + description "A friend gave this to you on your last birthday and you pinned + it to your wall. It shows the statue of a man deep in thought, with + the caption (added by your friend): + DON'T FORGET TO THINK!" + fixed define-item "Pooh's sign" description " @@ -192,6 +199,23 @@ a good idea to carry this around with you..." command "read" +define-item "Foot path" + description "A worn-out path snakes its way from Christopher Robin's front + door towards the eastern woods. He must be going that way regularly." + fixed + +define-item "Flattened undergrowth" + description "Looking closely, you see that somebody has been pushing + through the undergrowth here, flattening it and breaking + some twigs. Whoever it was seems to have been on his way + to the central woods." + fixed + +define-item "Boot print" + description "On a particularly soft piece of ground, somebody has left his + mark. A solitary boot print, pointing towards the hill..." + fixed + define-item "Foot prints" description "These foot prints look as if they were made by a pair of gum boots going up the hill towards Galleons Lap. Now, why would a diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 67195e3..61cd8da 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -65,7 +65,7 @@ (unless current-jars (setf current-jars 0)) (if (member "Hunny" (player-item player) :test #'equalp) (unless (= current-jars 12) - (format t "~&You deposit one jar of honey in your larder.") + (format t "~&You deposit one jar of honey in your cupboard.") (remove-object-attribute player 'item "Hunny") (incf current-jars) (save-state 'HONEY-JARS current-jars) @@ -373,7 +373,7 @@ "The Woozle scratches when you try to pick him up." (change-player-health player -1) (format t "~&The woozle scratches you! -1 HP") - (when (> 75 (random 100)) + (when (> 80 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -382,7 +382,8 @@ (defun woozle-disappear (player &optional arg) "If you drop him, the Woozle escapes." (let ((place (get-game-object 'place (player-place player)))) - (remove-object-attribute place 'item "Woozle") + (unless (equalp (place-name place) "Woozle hideout") + (remove-object-attribute place 'item "Woozle")) (format t "~&The Woozle runs away!"))) (defun craft (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index 51ff520..838ce76 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -16,6 +16,7 @@ item "Hunny" item "Jar" item "Clock" + item "Birthday card" command "think" command "store" @@ -61,6 +62,7 @@ can't remember when they were planted. It's very peaceful here." item "Stone" item "Stick" + hidden "Boot print" neighbour "Northern woods" neighbour "Eastern woods" neighbour "Southern woods" @@ -106,6 +108,7 @@ expect in a wood, it is full of trees. In this case you mainly see young birches around you." item "Stick" + hidden "Flattened undergrowth" neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" @@ -217,6 +220,7 @@ npc "Kanga" item "Jacket" item "Extract of Malt" + hidden "Jar" define-place "Sandy pit" description "The sandy pit is just that - a large pit full of sand somewhere @@ -306,7 +310,8 @@ neighbour "Workshop" item "Notice" item "Balloon" - item "Balloon" + item "Foot path" + hidden "Balloon" define-place "Workshop" description "This is Christopher Robin's little workshop. It's a rickety diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index a720ff6..ac8cdc6 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -34,6 +34,13 @@ useful, especially as it's stuck to five-to-eleven. So surely it's time for a little something now, isn't it?" fixed + +define-item "Birthday card" + description "A friend gave this to you on your last birthday and you pinned + it to your wall. It shows the statue of a man deep in thought, with + the caption (added by your friend): + DON'T FORGET TO THINK!" + fixed define-item "Pooh's sign" description " @@ -192,6 +199,23 @@ a good idea to carry this around with you..." command "read" +define-item "Foot path" + description "A worn-out path snakes its way from Christopher Robin's front + door towards the eastern woods. He must be going that way regularly." + fixed + +define-item "Flattened undergrowth" + description "Looking closely, you see that somebody has been pushing + through the undergrowth here, flattening it and breaking + some twigs. Whoever it was seems to have been on his way + to the central woods." + fixed + +define-item "Boot print" + description "On a particularly soft piece of ground, somebody has left his + mark. A solitary boot print, pointing towards the hill..." + fixed + define-item "Foot prints" description "These foot prints look as if they were made by a pair of gum boots going up the hill towards Galleons Lap. Now, why would a diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 67195e3..61cd8da 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -65,7 +65,7 @@ (unless current-jars (setf current-jars 0)) (if (member "Hunny" (player-item player) :test #'equalp) (unless (= current-jars 12) - (format t "~&You deposit one jar of honey in your larder.") + (format t "~&You deposit one jar of honey in your cupboard.") (remove-object-attribute player 'item "Hunny") (incf current-jars) (save-state 'HONEY-JARS current-jars) @@ -373,7 +373,7 @@ "The Woozle scratches when you try to pick him up." (change-player-health player -1) (format t "~&The woozle scratches you! -1 HP") - (when (> 75 (random 100)) + (when (> 80 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -382,7 +382,8 @@ (defun woozle-disappear (player &optional arg) "If you drop him, the Woozle escapes." (let ((place (get-game-object 'place (player-place player)))) - (remove-object-attribute place 'item "Woozle") + (unless (equalp (place-name place) "Woozle hideout") + (remove-object-attribute place 'item "Woozle")) (format t "~&The Woozle runs away!"))) (defun craft (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index 51ff520..838ce76 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -16,6 +16,7 @@ item "Hunny" item "Jar" item "Clock" + item "Birthday card" command "think" command "store" @@ -61,6 +62,7 @@ can't remember when they were planted. It's very peaceful here." item "Stone" item "Stick" + hidden "Boot print" neighbour "Northern woods" neighbour "Eastern woods" neighbour "Southern woods" @@ -106,6 +108,7 @@ expect in a wood, it is full of trees. In this case you mainly see young birches around you." item "Stick" + hidden "Flattened undergrowth" neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" @@ -217,6 +220,7 @@ npc "Kanga" item "Jacket" item "Extract of Malt" + hidden "Jar" define-place "Sandy pit" description "The sandy pit is just that - a large pit full of sand somewhere @@ -306,7 +310,8 @@ neighbour "Workshop" item "Notice" item "Balloon" - item "Balloon" + item "Foot path" + hidden "Balloon" define-place "Workshop" description "This is Christopher Robin's little workshop. It's a rickety diff --git a/doc/TODO b/doc/TODO index de9b7ec..0193428 100644 --- a/doc/TODO +++ b/doc/TODO @@ -5,9 +5,8 @@ LISP * fix (string-from-list) bug * update manual to reflect new main menu +* remove find probability? ATL * make instructions more explicit -* add track/foot prints leading to CR -* add another empty jar in Kanga's house - +* do something with the Six Pine Trees? diff --git a/ATL/Pooh/dialogue/letter.txt b/ATL/Pooh/dialogue/letter.txt index 262a80e..c57d133 100644 --- a/ATL/Pooh/dialogue/letter.txt +++ b/ATL/Pooh/dialogue/letter.txt @@ -7,6 +7,6 @@ Wait, this letter isn't to me at all? Oh well, no matter. Ahem. 'I need to meet you urgently. -Come to see me at Galleon's Lap. +Come to see me at Galleons Lap. Sincerely, Christopher Robin' There you go, what do you think about that? diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index a720ff6..ac8cdc6 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -34,6 +34,13 @@ useful, especially as it's stuck to five-to-eleven. So surely it's time for a little something now, isn't it?" fixed + +define-item "Birthday card" + description "A friend gave this to you on your last birthday and you pinned + it to your wall. It shows the statue of a man deep in thought, with + the caption (added by your friend): + DON'T FORGET TO THINK!" + fixed define-item "Pooh's sign" description " @@ -192,6 +199,23 @@ a good idea to carry this around with you..." command "read" +define-item "Foot path" + description "A worn-out path snakes its way from Christopher Robin's front + door towards the eastern woods. He must be going that way regularly." + fixed + +define-item "Flattened undergrowth" + description "Looking closely, you see that somebody has been pushing + through the undergrowth here, flattening it and breaking + some twigs. Whoever it was seems to have been on his way + to the central woods." + fixed + +define-item "Boot print" + description "On a particularly soft piece of ground, somebody has left his + mark. A solitary boot print, pointing towards the hill..." + fixed + define-item "Foot prints" description "These foot prints look as if they were made by a pair of gum boots going up the hill towards Galleons Lap. Now, why would a diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 67195e3..61cd8da 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -65,7 +65,7 @@ (unless current-jars (setf current-jars 0)) (if (member "Hunny" (player-item player) :test #'equalp) (unless (= current-jars 12) - (format t "~&You deposit one jar of honey in your larder.") + (format t "~&You deposit one jar of honey in your cupboard.") (remove-object-attribute player 'item "Hunny") (incf current-jars) (save-state 'HONEY-JARS current-jars) @@ -373,7 +373,7 @@ "The Woozle scratches when you try to pick him up." (change-player-health player -1) (format t "~&The woozle scratches you! -1 HP") - (when (> 75 (random 100)) + (when (> 80 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -382,7 +382,8 @@ (defun woozle-disappear (player &optional arg) "If you drop him, the Woozle escapes." (let ((place (get-game-object 'place (player-place player)))) - (remove-object-attribute place 'item "Woozle") + (unless (equalp (place-name place) "Woozle hideout") + (remove-object-attribute place 'item "Woozle")) (format t "~&The Woozle runs away!"))) (defun craft (player &optional arg) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index 51ff520..838ce76 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -16,6 +16,7 @@ item "Hunny" item "Jar" item "Clock" + item "Birthday card" command "think" command "store" @@ -61,6 +62,7 @@ can't remember when they were planted. It's very peaceful here." item "Stone" item "Stick" + hidden "Boot print" neighbour "Northern woods" neighbour "Eastern woods" neighbour "Southern woods" @@ -106,6 +108,7 @@ expect in a wood, it is full of trees. In this case you mainly see young birches around you." item "Stick" + hidden "Flattened undergrowth" neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" @@ -217,6 +220,7 @@ npc "Kanga" item "Jacket" item "Extract of Malt" + hidden "Jar" define-place "Sandy pit" description "The sandy pit is just that - a large pit full of sand somewhere @@ -306,7 +310,8 @@ neighbour "Workshop" item "Notice" item "Balloon" - item "Balloon" + item "Foot path" + hidden "Balloon" define-place "Workshop" description "This is Christopher Robin's little workshop. It's a rickety diff --git a/doc/TODO b/doc/TODO index de9b7ec..0193428 100644 --- a/doc/TODO +++ b/doc/TODO @@ -5,9 +5,8 @@ LISP * fix (string-from-list) bug * update manual to reflect new main menu +* remove find probability? ATL * make instructions more explicit -* add track/foot prints leading to CR -* add another empty jar in Kanga's house - +* do something with the Six Pine Trees? diff --git a/lisp/atlantis.lisp b/lisp/atlantis.lisp index 04d0543..8a303a0 100644 --- a/lisp/atlantis.lisp +++ b/lisp/atlantis.lisp @@ -40,7 +40,7 @@ (print-text-file "banner.txt") (print-text-file "../motd.txt") ;; The actual menu - (format t "~&~%Greetings! Please choose an option:") + (format t "~&~%Greetings! Please choose an option number:") (case (choose-number-option '("Start playing" "Show player list" "Read the help file" "About Atlantis" "Exit"))