diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 6f15d90..164f112 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -180,6 +180,7 @@ organize a replacement?" say-after "What a talented and resourceful bear! Thank you very much, Pooh! Here, take a little something as a token of my gratitude." + ;quest-completed-hook "add-portrait" proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 6f15d90..164f112 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -180,6 +180,7 @@ organize a replacement?" say-after "What a talented and resourceful bear! Thank you very much, Pooh! Here, take a little something as a token of my gratitude." + ;quest-completed-hook "add-portrait" proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index becf0a2..b53b634 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -15,7 +15,7 @@ might, you can't get any more out of it now. What a shame. Perhaps you should refill it." -define-item "Shelf" +define-item "Shelf" ;TODO rename cupboard description "This is your larder, a wooden shelf with 12 compartments for your honey jars. All the slots are empty!" fixed @@ -137,11 +137,30 @@ even tried to give it a natural flair by shaping it like a tail. Hm, that does look very much like a tail!" +define-item "Notices" + description "Owl had Christopher Robin put up two notices for him at his + porch. The first, underneath the knocker, said: + PLES RING IF AN RNSR IS REQIRD. + The second, underneath the bellrope, said: + PLEZ CNOKE IF AN RNSR IS NOT REQID." + fixed + define-item "Letterbox" description "Nobody in the Forest can read as well as Owl. He loves it, and he loves getting letters. Unfortunately, he has to write most of them himself." - fixed + fixed + +define-item "Armchair" + description "This is Owl's favourite armchair. He says he inherited it from + his grandfather. But despite its age, it still looks very comfy." + fixed + +define-item "Portrait" + description "This is a portrait of an owl even older than Owl, wearing + spectacles and looking very wise and clever indeed. From the + many stories Owl has told, you know that this is his Uncle Robert." + fixed define-item "Lamp" description "This lamp has a bowl at the bottom for the oil, a glass casing diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 6f15d90..164f112 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -180,6 +180,7 @@ organize a replacement?" say-after "What a talented and resourceful bear! Thank you very much, Pooh! Here, take a little something as a token of my gratitude." + ;quest-completed-hook "add-portrait" proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index becf0a2..b53b634 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -15,7 +15,7 @@ might, you can't get any more out of it now. What a shame. Perhaps you should refill it." -define-item "Shelf" +define-item "Shelf" ;TODO rename cupboard description "This is your larder, a wooden shelf with 12 compartments for your honey jars. All the slots are empty!" fixed @@ -137,11 +137,30 @@ even tried to give it a natural flair by shaping it like a tail. Hm, that does look very much like a tail!" +define-item "Notices" + description "Owl had Christopher Robin put up two notices for him at his + porch. The first, underneath the knocker, said: + PLES RING IF AN RNSR IS REQIRD. + The second, underneath the bellrope, said: + PLEZ CNOKE IF AN RNSR IS NOT REQID." + fixed + define-item "Letterbox" description "Nobody in the Forest can read as well as Owl. He loves it, and he loves getting letters. Unfortunately, he has to write most of them himself." - fixed + fixed + +define-item "Armchair" + description "This is Owl's favourite armchair. He says he inherited it from + his grandfather. But despite its age, it still looks very comfy." + fixed + +define-item "Portrait" + description "This is a portrait of an owl even older than Owl, wearing + spectacles and looking very wise and clever indeed. From the + many stories Owl has told, you know that this is his Uncle Robert." + fixed define-item "Lamp" description "This lamp has a bowl at the bottom for the oil, a glass casing diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 3260bfb..3e51243 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -225,7 +225,7 @@ (set-object-attribute place 'item "Hunny") (save-state 'ROCK-HONEY-FOUND)))))) -(defun stream-current (player &optional arg) +(defun stream-current (player &optional arg) ;;TODO TESTME "The stream sweeps the player on into the Floody place." (when (> 75 (random 100)) (narrate "../ATL/Pooh/dialogue/stream-current.txt" '(5 2 3 2)) @@ -317,11 +317,17 @@ (format t "~&You don't have a letter to deposit here!"))) (defun read-letter (player &optional arg) + "Owl reads a deposited letter to the player" (let ((place (get-game-object 'place "Owl's home"))) (when (get-state 'LETTER-DEPOSITED) (narrate "../ATL/Pooh/dialogue/letter.txt" '(0 1 2 2 3 2 3 2 2 2 3 1))))) - + +(defun add-portrait (player &optional arg) + "Once Owl has the picture frame, he can hang up the portrait again." + (set-object-attribute (get-game-object 'place (player-place player)) + 'item "Portrait")) + (defun smell-honey (player &optional arg) "The player smells honey when leaving the tunnel" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 6f15d90..164f112 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -180,6 +180,7 @@ organize a replacement?" say-after "What a talented and resourceful bear! Thank you very much, Pooh! Here, take a little something as a token of my gratitude." + ;quest-completed-hook "add-portrait" proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index becf0a2..b53b634 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -15,7 +15,7 @@ might, you can't get any more out of it now. What a shame. Perhaps you should refill it." -define-item "Shelf" +define-item "Shelf" ;TODO rename cupboard description "This is your larder, a wooden shelf with 12 compartments for your honey jars. All the slots are empty!" fixed @@ -137,11 +137,30 @@ even tried to give it a natural flair by shaping it like a tail. Hm, that does look very much like a tail!" +define-item "Notices" + description "Owl had Christopher Robin put up two notices for him at his + porch. The first, underneath the knocker, said: + PLES RING IF AN RNSR IS REQIRD. + The second, underneath the bellrope, said: + PLEZ CNOKE IF AN RNSR IS NOT REQID." + fixed + define-item "Letterbox" description "Nobody in the Forest can read as well as Owl. He loves it, and he loves getting letters. Unfortunately, he has to write most of them himself." - fixed + fixed + +define-item "Armchair" + description "This is Owl's favourite armchair. He says he inherited it from + his grandfather. But despite its age, it still looks very comfy." + fixed + +define-item "Portrait" + description "This is a portrait of an owl even older than Owl, wearing + spectacles and looking very wise and clever indeed. From the + many stories Owl has told, you know that this is his Uncle Robert." + fixed define-item "Lamp" description "This lamp has a bowl at the bottom for the oil, a glass casing diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 3260bfb..3e51243 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -225,7 +225,7 @@ (set-object-attribute place 'item "Hunny") (save-state 'ROCK-HONEY-FOUND)))))) -(defun stream-current (player &optional arg) +(defun stream-current (player &optional arg) ;;TODO TESTME "The stream sweeps the player on into the Floody place." (when (> 75 (random 100)) (narrate "../ATL/Pooh/dialogue/stream-current.txt" '(5 2 3 2)) @@ -317,11 +317,17 @@ (format t "~&You don't have a letter to deposit here!"))) (defun read-letter (player &optional arg) + "Owl reads a deposited letter to the player" (let ((place (get-game-object 'place "Owl's home"))) (when (get-state 'LETTER-DEPOSITED) (narrate "../ATL/Pooh/dialogue/letter.txt" '(0 1 2 2 3 2 3 2 2 2 3 1))))) - + +(defun add-portrait (player &optional arg) + "Once Owl has the picture frame, he can hang up the portrait again." + (set-object-attribute (get-game-object 'place (player-place player)) + 'item "Portrait")) + (defun smell-honey (player &optional arg) "The player smells honey when leaving the tunnel" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index 7b81805..31f129e 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -165,9 +165,10 @@ requires "Key" define-place "Bridge" - ;;TODO Expand description to include Poohsticks description "A simple wooden bridge spans the stream that marks the edge of - the 100 Acre Wood. For all practical purposes, the world ends here." + the 100 Acre Wood. For all practical purposes, the world ends here. + You love to lie here and watch the water flow by beneath you. + This, incidentally, led to the invention of the game Poohsticks." neighbour "Southern woods" neighbour "Eastern woods" neighbour "Floody place" @@ -243,7 +244,7 @@ monster "Heffalump" define-place "Bee tree" - description "In an open place in the middle of the forest, a large oak stands + description "In an open place in the middle of the forest, a large fir stands all by itself. A loud buzzing fills the air. Looking up, you see a lot of bees flying in and out of a hole far up the tree trunk. If you could get up there, there's sure to be some honey there!" @@ -298,7 +299,7 @@ define-place "Christopher Robin's house" description "Christopher Robin is your best friend. What a shame he lives so far away from your home! This is his house, built into an old - chestnut tree. It has a lovely green door, which unfortunately + oak tree. It has a lovely green door, which unfortunately appears to be shut just now. You wonder where he is?" neighbour "Eastern woods" neighbour "Workshop" @@ -316,9 +317,12 @@ command "craft" define-place "Owl's porch" - description "TODO" + description "Owl's house is perched on the boughs of an ancient chestnut tree + and is called, appropriately, The Chestnuts. It is grander than + anybody else' residence in the Forest." item "Bellrope" - item "Letter box" + item "Letterbox" + item "Notices" neighbour "Owl's home" neighbour "Eastern woods" neighbour "Central woods" @@ -326,8 +330,11 @@ command "deposit" define-place "Owl's home" - description "TODO" + description "The Chestnuts is spacious inside, with thick carpet on the floor + and paintings on the wall. Owl's favourite armchair sits in a + corner, with him in it." npc "Owl" + item "Armchair" neighbour "Owl's porch" define-place "Floody place" diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 6f15d90..164f112 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -180,6 +180,7 @@ organize a replacement?" say-after "What a talented and resourceful bear! Thank you very much, Pooh! Here, take a little something as a token of my gratitude." + ;quest-completed-hook "add-portrait" proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index becf0a2..b53b634 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -15,7 +15,7 @@ might, you can't get any more out of it now. What a shame. Perhaps you should refill it." -define-item "Shelf" +define-item "Shelf" ;TODO rename cupboard description "This is your larder, a wooden shelf with 12 compartments for your honey jars. All the slots are empty!" fixed @@ -137,11 +137,30 @@ even tried to give it a natural flair by shaping it like a tail. Hm, that does look very much like a tail!" +define-item "Notices" + description "Owl had Christopher Robin put up two notices for him at his + porch. The first, underneath the knocker, said: + PLES RING IF AN RNSR IS REQIRD. + The second, underneath the bellrope, said: + PLEZ CNOKE IF AN RNSR IS NOT REQID." + fixed + define-item "Letterbox" description "Nobody in the Forest can read as well as Owl. He loves it, and he loves getting letters. Unfortunately, he has to write most of them himself." - fixed + fixed + +define-item "Armchair" + description "This is Owl's favourite armchair. He says he inherited it from + his grandfather. But despite its age, it still looks very comfy." + fixed + +define-item "Portrait" + description "This is a portrait of an owl even older than Owl, wearing + spectacles and looking very wise and clever indeed. From the + many stories Owl has told, you know that this is his Uncle Robert." + fixed define-item "Lamp" description "This lamp has a bowl at the bottom for the oil, a glass casing diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 3260bfb..3e51243 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -225,7 +225,7 @@ (set-object-attribute place 'item "Hunny") (save-state 'ROCK-HONEY-FOUND)))))) -(defun stream-current (player &optional arg) +(defun stream-current (player &optional arg) ;;TODO TESTME "The stream sweeps the player on into the Floody place." (when (> 75 (random 100)) (narrate "../ATL/Pooh/dialogue/stream-current.txt" '(5 2 3 2)) @@ -317,11 +317,17 @@ (format t "~&You don't have a letter to deposit here!"))) (defun read-letter (player &optional arg) + "Owl reads a deposited letter to the player" (let ((place (get-game-object 'place "Owl's home"))) (when (get-state 'LETTER-DEPOSITED) (narrate "../ATL/Pooh/dialogue/letter.txt" '(0 1 2 2 3 2 3 2 2 2 3 1))))) - + +(defun add-portrait (player &optional arg) + "Once Owl has the picture frame, he can hang up the portrait again." + (set-object-attribute (get-game-object 'place (player-place player)) + 'item "Portrait")) + (defun smell-honey (player &optional arg) "The player smells honey when leaving the tunnel" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index 7b81805..31f129e 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -165,9 +165,10 @@ requires "Key" define-place "Bridge" - ;;TODO Expand description to include Poohsticks description "A simple wooden bridge spans the stream that marks the edge of - the 100 Acre Wood. For all practical purposes, the world ends here." + the 100 Acre Wood. For all practical purposes, the world ends here. + You love to lie here and watch the water flow by beneath you. + This, incidentally, led to the invention of the game Poohsticks." neighbour "Southern woods" neighbour "Eastern woods" neighbour "Floody place" @@ -243,7 +244,7 @@ monster "Heffalump" define-place "Bee tree" - description "In an open place in the middle of the forest, a large oak stands + description "In an open place in the middle of the forest, a large fir stands all by itself. A loud buzzing fills the air. Looking up, you see a lot of bees flying in and out of a hole far up the tree trunk. If you could get up there, there's sure to be some honey there!" @@ -298,7 +299,7 @@ define-place "Christopher Robin's house" description "Christopher Robin is your best friend. What a shame he lives so far away from your home! This is his house, built into an old - chestnut tree. It has a lovely green door, which unfortunately + oak tree. It has a lovely green door, which unfortunately appears to be shut just now. You wonder where he is?" neighbour "Eastern woods" neighbour "Workshop" @@ -316,9 +317,12 @@ command "craft" define-place "Owl's porch" - description "TODO" + description "Owl's house is perched on the boughs of an ancient chestnut tree + and is called, appropriately, The Chestnuts. It is grander than + anybody else' residence in the Forest." item "Bellrope" - item "Letter box" + item "Letterbox" + item "Notices" neighbour "Owl's home" neighbour "Eastern woods" neighbour "Central woods" @@ -326,8 +330,11 @@ command "deposit" define-place "Owl's home" - description "TODO" + description "The Chestnuts is spacious inside, with thick carpet on the floor + and paintings on the wall. Owl's favourite armchair sits in a + corner, with him in it." npc "Owl" + item "Armchair" neighbour "Owl's porch" define-place "Floody place" diff --git a/doc/TODO b/doc/TODO index 8121d6c..3efeabe 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,9 +1,11 @@ ATLANTIS TODO LISP -* add (save-state) and (get-state) functions * update Helios guide (include bug reporting with 'archive') +* update documentation * fix (string-from-list) bug +* remove point 3 from the start menu +* add quest-completed-hook ATL * fill in missing place descriptions