diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/dialogue/nap.txt b/ATL/Pooh/dialogue/nap.txt new file mode 100644 index 0000000..866ab60 --- /dev/null +++ b/ATL/Pooh/dialogue/nap.txt @@ -0,0 +1,8 @@ +You lie down on the bench and close your eyes. +Slowly, you start drifting off to dream land... + +Zzzzzz +Zzzzzz +Zzzzzz + +You wake up again. diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/dialogue/nap.txt b/ATL/Pooh/dialogue/nap.txt new file mode 100644 index 0000000..866ab60 --- /dev/null +++ b/ATL/Pooh/dialogue/nap.txt @@ -0,0 +1,8 @@ +You lie down on the bench and close your eyes. +Slowly, you start drifting off to dream land... + +Zzzzzz +Zzzzzz +Zzzzzz + +You wake up again. diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 152fd90..5dd9adc 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -284,14 +284,15 @@ (defun nap (player &optional arg) "Take a nap in front of Pooh's house" - (format t "~&You lie down on the bench and close your eyes.") (sleep 1) - (format t "~&Slowly, you start drifting off to dream land...") (sleep 1) - (format t "~&~%Zzzzz Zzzzz Zzzzz") (sleep 3) - (format t "~&~%You wake up again.") + (narrate "../ATL/Pooh/dialogue/nap.txt" '(2 2 1 1 1 1 1 2)) (when (< (player-health player) (player-max-health player)) (format t "~&You feel better. +1 HP") (change-player-health player 1))) +(defun hum (player &optional arg) + "The Thoughtful-Spot-Hum" + (narrate "../ATL/Pooh/dialogue/hum.txt")) + (defun ring (player &optional arg) "Ring the bell at Owl's porch" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/dialogue/nap.txt b/ATL/Pooh/dialogue/nap.txt new file mode 100644 index 0000000..866ab60 --- /dev/null +++ b/ATL/Pooh/dialogue/nap.txt @@ -0,0 +1,8 @@ +You lie down on the bench and close your eyes. +Slowly, you start drifting off to dream land... + +Zzzzzz +Zzzzzz +Zzzzzz + +You wake up again. diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 152fd90..5dd9adc 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -284,14 +284,15 @@ (defun nap (player &optional arg) "Take a nap in front of Pooh's house" - (format t "~&You lie down on the bench and close your eyes.") (sleep 1) - (format t "~&Slowly, you start drifting off to dream land...") (sleep 1) - (format t "~&~%Zzzzz Zzzzz Zzzzz") (sleep 3) - (format t "~&~%You wake up again.") + (narrate "../ATL/Pooh/dialogue/nap.txt" '(2 2 1 1 1 1 1 2)) (when (< (player-health player) (player-max-health player)) (format t "~&You feel better. +1 HP") (change-player-health player 1))) +(defun hum (player &optional arg) + "The Thoughtful-Spot-Hum" + (narrate "../ATL/Pooh/dialogue/hum.txt")) + (defun ring (player &optional arg) "Ring the bell at Owl's porch" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c526fb7..f50e727 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -29,6 +29,7 @@ item "Bench" neighbour "Pooh's home" neighbour "Western woods" + neighbour "Thoughtful spot" command "nap" define-place "Pooh's branch" @@ -49,6 +50,7 @@ neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's porch" neighbour "Six pine trees" neighbour "Kanga's house" @@ -170,6 +172,16 @@ neighbour "Floody place" command "play" +define-place "Thoughtful spot" + description "This is a cozy little spot between some bushes, warm and out of + the wind. It is exactly half way between your house and Piglet's + house, so you sometimes meet here when you decide to visit each + other. It's not a bad spot for a picknick, either." + neighbour "Pooh's porch" + neighbour "Piglet's porch" + hidden "Hunny" + command "hum" + define-place "Piglet's porch" description "Piglet lives in a very grand house in the middle of a beech tree. Well, at least it's very grand for a little piglet. But he's happy @@ -177,6 +189,7 @@ and especially proud of the sign he had inherited from his grandfather." neighbour "Western woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's home" item "Piglet's sign" diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/dialogue/nap.txt b/ATL/Pooh/dialogue/nap.txt new file mode 100644 index 0000000..866ab60 --- /dev/null +++ b/ATL/Pooh/dialogue/nap.txt @@ -0,0 +1,8 @@ +You lie down on the bench and close your eyes. +Slowly, you start drifting off to dream land... + +Zzzzzz +Zzzzzz +Zzzzzz + +You wake up again. diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 152fd90..5dd9adc 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -284,14 +284,15 @@ (defun nap (player &optional arg) "Take a nap in front of Pooh's house" - (format t "~&You lie down on the bench and close your eyes.") (sleep 1) - (format t "~&Slowly, you start drifting off to dream land...") (sleep 1) - (format t "~&~%Zzzzz Zzzzz Zzzzz") (sleep 3) - (format t "~&~%You wake up again.") + (narrate "../ATL/Pooh/dialogue/nap.txt" '(2 2 1 1 1 1 1 2)) (when (< (player-health player) (player-max-health player)) (format t "~&You feel better. +1 HP") (change-player-health player 1))) +(defun hum (player &optional arg) + "The Thoughtful-Spot-Hum" + (narrate "../ATL/Pooh/dialogue/hum.txt")) + (defun ring (player &optional arg) "Ring the bell at Owl's porch" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c526fb7..f50e727 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -29,6 +29,7 @@ item "Bench" neighbour "Pooh's home" neighbour "Western woods" + neighbour "Thoughtful spot" command "nap" define-place "Pooh's branch" @@ -49,6 +50,7 @@ neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's porch" neighbour "Six pine trees" neighbour "Kanga's house" @@ -170,6 +172,16 @@ neighbour "Floody place" command "play" +define-place "Thoughtful spot" + description "This is a cozy little spot between some bushes, warm and out of + the wind. It is exactly half way between your house and Piglet's + house, so you sometimes meet here when you decide to visit each + other. It's not a bad spot for a picknick, either." + neighbour "Pooh's porch" + neighbour "Piglet's porch" + hidden "Hunny" + command "hum" + define-place "Piglet's porch" description "Piglet lives in a very grand house in the middle of a beech tree. Well, at least it's very grand for a little piglet. But he's happy @@ -177,6 +189,7 @@ and especially proud of the sign he had inherited from his grandfather." neighbour "Western woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's home" item "Piglet's sign" diff --git a/doc/TODO b/doc/TODO index add16c3..8121d6c 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,13 +1,11 @@ ATLANTIS TODO LISP +* add (save-state) and (get-state) functions * update Helios guide (include bug reporting with 'archive') * fix (string-from-list) bug ATL -* hide 2 more pots of honey -* add Owl's quest -* add "Thoughtful Spot" * fill in missing place descriptions @@ -22,7 +20,7 @@ 6. Kanga's quest 7. Eeyore's quest 8. Piglet's quest - 9. Owl's quest (?) + 9. Owl's quest 10. Thoughtful spot 11. Bee tree 12. Cave @@ -31,6 +29,5 @@ 1. Find the tail 2. Bring jacket 3. Bring mushrooms - 4. Reading material -> replace with "Grandfather's picture" + 4. Uncle's picture 5. Find Woozle - 6. Bring honey diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index c5ba457..6f15d90 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -49,8 +49,9 @@ perchance, happen to be aware of his current location?" says "I do love to get letters! If I get one some time soon, I shall read it to you. Improve your education." - says "TODO - something about his grandfather" - quest "Grandfather's picture" + says "Have I ever told you the story of my Uncle Robert? He became famous + when, on a very blustery day... Wait, don't go yet!" + quest "Uncle's picture" interaction-hook "read-letter" ;TODO Christopher Robin needs to say something else @@ -118,7 +119,10 @@ Right now he is holding a pencil and scribbling around on what would appear to be a map of some sort. Every now and again he laughs quietly to himself, as if enjoying a good joke." - says "TODO" + says "Did you know that Owl spells his name all wrong? It's O-W-L, not W-O-L." + says "Have you explored the whole Forest yet? Maps don't show everything, + you know. You never know what might be hiding someplace else." + says "When was the last time you played Poohsticks, Pooh?" define-npc "Daniel" description "You really can't tell how old this boy is. Sometimes he looks @@ -126,7 +130,7 @@ boyish. What you can say is that he has red hair, freckles, and rather big ears. His fingers are drumming around on some strange black box that is lying open in front of him." - says "Hi Pooh, pleased to meet you at last!" + says "Hi Pooh, pleased to meet you at last! I'm a big fan of you, you know." interaction-hook "daniel-says" ; QUESTS @@ -169,9 +173,13 @@ reward-item "Mushrooms" experience 5 -define-quest "Grandfather's picture" - say-before "TODO" - say-after "TODO" +define-quest "Uncle's picture" + say-before "Pooh, I have been severely inconvenienced. The portrait of my + late Uncle Robert fell down during the recent storm, and now + its frame is no longer suitable for its purpose. Could you + 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." proof-item "Picture frame" reward-item "Hunny" experience 5 diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index a60da7c..3101aca 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,2 +1,5 @@ Don't forget to search your own home. Honey is made by bees, but collecting it can be a bit of work. +Have you ever had a picknick at the Thoughtful Spot? Or at the Rapids? +A lot of your friends need help, and they all know you like honey as a reward. +Seek and ye shall find! diff --git a/ATL/Pooh/dialogue/hum.txt b/ATL/Pooh/dialogue/hum.txt new file mode 100644 index 0000000..b6c8dea --- /dev/null +++ b/ATL/Pooh/dialogue/hum.txt @@ -0,0 +1,9 @@ +You remember that you once made up a hum for this place. +Slowly it comes back to your mind: + +'This warm and sunny spot +Belongs to Pooh +And here he wonders what +He's going to do. +Oh, bother, I forgot - +It's Piglet's too.' diff --git a/ATL/Pooh/dialogue/nap.txt b/ATL/Pooh/dialogue/nap.txt new file mode 100644 index 0000000..866ab60 --- /dev/null +++ b/ATL/Pooh/dialogue/nap.txt @@ -0,0 +1,8 @@ +You lie down on the bench and close your eyes. +Slowly, you start drifting off to dream land... + +Zzzzzz +Zzzzzz +Zzzzzz + +You wake up again. diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 152fd90..5dd9adc 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -284,14 +284,15 @@ (defun nap (player &optional arg) "Take a nap in front of Pooh's house" - (format t "~&You lie down on the bench and close your eyes.") (sleep 1) - (format t "~&Slowly, you start drifting off to dream land...") (sleep 1) - (format t "~&~%Zzzzz Zzzzz Zzzzz") (sleep 3) - (format t "~&~%You wake up again.") + (narrate "../ATL/Pooh/dialogue/nap.txt" '(2 2 1 1 1 1 1 2)) (when (< (player-health player) (player-max-health player)) (format t "~&You feel better. +1 HP") (change-player-health player 1))) +(defun hum (player &optional arg) + "The Thoughtful-Spot-Hum" + (narrate "../ATL/Pooh/dialogue/hum.txt")) + (defun ring (player &optional arg) "Ring the bell at Owl's porch" (let ((place (get-game-object 'place (player-place player)))) diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index c526fb7..f50e727 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -29,6 +29,7 @@ item "Bench" neighbour "Pooh's home" neighbour "Western woods" + neighbour "Thoughtful spot" command "nap" define-place "Pooh's branch" @@ -49,6 +50,7 @@ neighbour "Central woods" neighbour "Northern woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's porch" neighbour "Six pine trees" neighbour "Kanga's house" @@ -170,6 +172,16 @@ neighbour "Floody place" command "play" +define-place "Thoughtful spot" + description "This is a cozy little spot between some bushes, warm and out of + the wind. It is exactly half way between your house and Piglet's + house, so you sometimes meet here when you decide to visit each + other. It's not a bad spot for a picknick, either." + neighbour "Pooh's porch" + neighbour "Piglet's porch" + hidden "Hunny" + command "hum" + define-place "Piglet's porch" description "Piglet lives in a very grand house in the middle of a beech tree. Well, at least it's very grand for a little piglet. But he's happy @@ -177,6 +189,7 @@ and especially proud of the sign he had inherited from his grandfather." neighbour "Western woods" neighbour "Southern woods" + neighbour "Thoughtful spot" neighbour "Piglet's home" item "Piglet's sign" diff --git a/doc/TODO b/doc/TODO index add16c3..8121d6c 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,13 +1,11 @@ ATLANTIS TODO LISP +* add (save-state) and (get-state) functions * update Helios guide (include bug reporting with 'archive') * fix (string-from-list) bug ATL -* hide 2 more pots of honey -* add Owl's quest -* add "Thoughtful Spot" * fill in missing place descriptions @@ -22,7 +20,7 @@ 6. Kanga's quest 7. Eeyore's quest 8. Piglet's quest - 9. Owl's quest (?) + 9. Owl's quest 10. Thoughtful spot 11. Bee tree 12. Cave @@ -31,6 +29,5 @@ 1. Find the tail 2. Bring jacket 3. Bring mushrooms - 4. Reading material -> replace with "Grandfather's picture" + 4. Uncle's picture 5. Find Woozle - 6. Bring honey diff --git a/lisp/util.lisp b/lisp/util.lisp index b8849c5..2641d71 100644 --- a/lisp/util.lisp +++ b/lisp/util.lisp @@ -217,10 +217,9 @@ (defun load-text-file (file-name) "Load a text file into a list of strings (representing the lines)" (with-open-file (f file-name) - (do* ((line (read-line f nil nil) - (read-line f nil nil)) - (file-lines (list line) (append file-lines (list line)))) - ((null line) file-lines)))) + (do* ((line (read-line f nil nil) (read-line f nil nil)) (file-lines NIL)) + ((null line) file-lines) + (setf file-lines (append file-lines (list line)))))) (defun narrate (file-name &optional (pauses 2)) "Print out the given file, pausing between each line." @@ -231,7 +230,7 @@ ((null lines)) (when (= p (length pauses)) (setf p 0)) (unless (null (first lines)) - (format t "~&~A" (first lines)) + (format t "~%~A" (first lines)) (sleep (nth p pauses))))) (defun print-text-file (file-name)