diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/woodland-map.lisp b/ATL/Pooh/woodland-map.lisp deleted file mode 100644 index 68a8b9b..0000000 --- a/ATL/Pooh/woodland-map.lisp +++ /dev/null @@ -1,45 +0,0 @@ -; The 100 Acre Wood was invented by A.A. Milne for his Winnie-the-Pooh stories. -; This Atlantis world is based on the novels. -; -; This file shows the game map. -; -; author: Daniel Vedder -; date: 31/07/2017 - -(defun study (player &optional arg) - "Print out the map" - (unless (member 'map (extract-elements arg)) - (format t "~&What do you want to study?") - (return-from study)) - (setf map-string " -..............................[ 100 ACRE WOODS ].............................. -: : -: Misty forest Rapids : -: : -: Bee tree : -: Sandy pit : -: : -: Rabbit : -: Kanga Northern : -: woods Rabbit's : -: Stream | friends-and-relations : -: | : -: Deep | Hill : -: forest | : -: | : -: POOH'S Western ___________ Central _____________ Eastern : -: HOME woods woods woods : -: | : -: | Owl Christopher : -: Six pine | Robin : -: trees | : -: | : -: Southern : -: Piglet woods : -: : -: : -: Floody Bridge : -: place Eeyore : -:..............................................................................: -") - (format t "~A" map-string)) diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/woodland-map.lisp b/ATL/Pooh/woodland-map.lisp deleted file mode 100644 index 68a8b9b..0000000 --- a/ATL/Pooh/woodland-map.lisp +++ /dev/null @@ -1,45 +0,0 @@ -; The 100 Acre Wood was invented by A.A. Milne for his Winnie-the-Pooh stories. -; This Atlantis world is based on the novels. -; -; This file shows the game map. -; -; author: Daniel Vedder -; date: 31/07/2017 - -(defun study (player &optional arg) - "Print out the map" - (unless (member 'map (extract-elements arg)) - (format t "~&What do you want to study?") - (return-from study)) - (setf map-string " -..............................[ 100 ACRE WOODS ].............................. -: : -: Misty forest Rapids : -: : -: Bee tree : -: Sandy pit : -: : -: Rabbit : -: Kanga Northern : -: woods Rabbit's : -: Stream | friends-and-relations : -: | : -: Deep | Hill : -: forest | : -: | : -: POOH'S Western ___________ Central _____________ Eastern : -: HOME woods woods woods : -: | : -: | Owl Christopher : -: Six pine | Robin : -: trees | : -: | : -: Southern : -: Piglet woods : -: : -: : -: Floody Bridge : -: place Eeyore : -:..............................................................................: -") - (format t "~A" map-string)) diff --git a/ATL/Pooh/woodland-map.txt b/ATL/Pooh/woodland-map.txt new file mode 100644 index 0000000..111727c --- /dev/null +++ b/ATL/Pooh/woodland-map.txt @@ -0,0 +1,29 @@ +..............................[ 100 ACRE WOODS ].............................. +: : +: Misty forest Rapids : +: : +: Bee tree : +: Sandy pit : +: : +: Rabbit : +: Kanga Northern : +: woods Rabbit's : +: Stream | friends-and-relations : +: | : +: Deep | Hill : +: forest | : +: | : +: POOH'S Western ___________ Central _____________ Eastern : +: HOME woods woods woods : +: | : +: | Owl Christopher : +: Six pine | Robin : +: trees | : +: | : +: Southern : +: Piglet woods : +: : +: : +: Floody Bridge : +: place Eeyore : +:..............................................................................: diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/woodland-map.lisp b/ATL/Pooh/woodland-map.lisp deleted file mode 100644 index 68a8b9b..0000000 --- a/ATL/Pooh/woodland-map.lisp +++ /dev/null @@ -1,45 +0,0 @@ -; The 100 Acre Wood was invented by A.A. Milne for his Winnie-the-Pooh stories. -; This Atlantis world is based on the novels. -; -; This file shows the game map. -; -; author: Daniel Vedder -; date: 31/07/2017 - -(defun study (player &optional arg) - "Print out the map" - (unless (member 'map (extract-elements arg)) - (format t "~&What do you want to study?") - (return-from study)) - (setf map-string " -..............................[ 100 ACRE WOODS ].............................. -: : -: Misty forest Rapids : -: : -: Bee tree : -: Sandy pit : -: : -: Rabbit : -: Kanga Northern : -: woods Rabbit's : -: Stream | friends-and-relations : -: | : -: Deep | Hill : -: forest | : -: | : -: POOH'S Western ___________ Central _____________ Eastern : -: HOME woods woods woods : -: | : -: | Owl Christopher : -: Six pine | Robin : -: trees | : -: | : -: Southern : -: Piglet woods : -: : -: : -: Floody Bridge : -: place Eeyore : -:..............................................................................: -") - (format t "~A" map-string)) diff --git a/ATL/Pooh/woodland-map.txt b/ATL/Pooh/woodland-map.txt new file mode 100644 index 0000000..111727c --- /dev/null +++ b/ATL/Pooh/woodland-map.txt @@ -0,0 +1,29 @@ +..............................[ 100 ACRE WOODS ].............................. +: : +: Misty forest Rapids : +: : +: Bee tree : +: Sandy pit : +: : +: Rabbit : +: Kanga Northern : +: woods Rabbit's : +: Stream | friends-and-relations : +: | : +: Deep | Hill : +: forest | : +: | : +: POOH'S Western ___________ Central _____________ Eastern : +: HOME woods woods woods : +: | : +: | Owl Christopher : +: Six pine | Robin : +: trees | : +: | : +: Southern : +: Piglet woods : +: : +: : +: Floody Bridge : +: place Eeyore : +:..............................................................................: diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index d965b4f..c11507c 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -310,8 +310,13 @@ neighbour "Southern woods" define-place "Misty forest" - description "TODO" - item "Berries" + description "You are surrounded by pines, their dead needles thickly carpeting + the forest floor. This forest isn't actually part of the 100 Acre + Wood anymore, and it seems somewhat mysterious, because you don't + come here often. You remember that you have gotten lost here before + on a foggy day, so take care that doesn't happen again!" + npc "Blackbird" + item "Pine cone" neighbour "Sandy pit" neighbour "Rapids" exit-hook "misty-forest" diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/woodland-map.lisp b/ATL/Pooh/woodland-map.lisp deleted file mode 100644 index 68a8b9b..0000000 --- a/ATL/Pooh/woodland-map.lisp +++ /dev/null @@ -1,45 +0,0 @@ -; The 100 Acre Wood was invented by A.A. Milne for his Winnie-the-Pooh stories. -; This Atlantis world is based on the novels. -; -; This file shows the game map. -; -; author: Daniel Vedder -; date: 31/07/2017 - -(defun study (player &optional arg) - "Print out the map" - (unless (member 'map (extract-elements arg)) - (format t "~&What do you want to study?") - (return-from study)) - (setf map-string " -..............................[ 100 ACRE WOODS ].............................. -: : -: Misty forest Rapids : -: : -: Bee tree : -: Sandy pit : -: : -: Rabbit : -: Kanga Northern : -: woods Rabbit's : -: Stream | friends-and-relations : -: | : -: Deep | Hill : -: forest | : -: | : -: POOH'S Western ___________ Central _____________ Eastern : -: HOME woods woods woods : -: | : -: | Owl Christopher : -: Six pine | Robin : -: trees | : -: | : -: Southern : -: Piglet woods : -: : -: : -: Floody Bridge : -: place Eeyore : -:..............................................................................: -") - (format t "~A" map-string)) diff --git a/ATL/Pooh/woodland-map.txt b/ATL/Pooh/woodland-map.txt new file mode 100644 index 0000000..111727c --- /dev/null +++ b/ATL/Pooh/woodland-map.txt @@ -0,0 +1,29 @@ +..............................[ 100 ACRE WOODS ].............................. +: : +: Misty forest Rapids : +: : +: Bee tree : +: Sandy pit : +: : +: Rabbit : +: Kanga Northern : +: woods Rabbit's : +: Stream | friends-and-relations : +: | : +: Deep | Hill : +: forest | : +: | : +: POOH'S Western ___________ Central _____________ Eastern : +: HOME woods woods woods : +: | : +: | Owl Christopher : +: Six pine | Robin : +: trees | : +: | : +: Southern : +: Piglet woods : +: : +: : +: Floody Bridge : +: place Eeyore : +:..............................................................................: diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index d965b4f..c11507c 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -310,8 +310,13 @@ neighbour "Southern woods" define-place "Misty forest" - description "TODO" - item "Berries" + description "You are surrounded by pines, their dead needles thickly carpeting + the forest floor. This forest isn't actually part of the 100 Acre + Wood anymore, and it seems somewhat mysterious, because you don't + come here often. You remember that you have gotten lost here before + on a foggy day, so take care that doesn't happen again!" + npc "Blackbird" + item "Pine cone" neighbour "Sandy pit" neighbour "Rapids" exit-hook "misty-forest" diff --git a/doc/TODO b/doc/TODO index 4b9efb4..49e4524 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,7 +1,6 @@ ATLANTIS TODO LISP -* prevent illegal input characters from causing a crash -> PRIORITY * split ui.lisp into two modules (one for interaction functions) ATL diff --git a/ATL/Pooh/characters.atl b/ATL/Pooh/characters.atl index 40080c6..6e778be 100644 --- a/ATL/Pooh/characters.atl +++ b/ATL/Pooh/characters.atl @@ -88,6 +88,14 @@ that all the fun is always over by the time he gets there..." says "Where are you going? Is there something to see there?" +define-npc "Blackbird" + description "A blackbird is perched on a branch here, busy singing its song." + says "Oh, hot sand on toes, cold sand in sleeping bags..." + says "As the old pine fell we sang - just to bless the morning..." + says "We slept like dogs, down by the fireside..." + says "... up to the fall, while all around us, the bloom of summertime..." + says "As the old pine fell we sang - just to bless the morning..." + define-npc "Mr Milne" description "Alan Alexander Milne is sitting at the table, staring very hard at a piece of paper before him and chewing on his pen. diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 3311e11..4d48394 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -69,7 +69,13 @@ description "Just an ordinary sort of stick. Nothing special, but fun to play around with." infinite - + +define-item "Pine cone" + description "Pine cones are great fun for playing with. There's nothing quite + like a good pine cone battle in the woods with your friends!" + infinite + ;command "throw" ;TODO + define-item "Berries" description "Scrumptious, fresh wild berries: blueberries, blackberries, strawberries... Just don't eat too many!" diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 2d7d259..373cc8a 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -40,6 +40,13 @@ (change-player-health player 1))) (T (format t "~&You can't eat that!")))) +(defun study (player &optional arg) + "Print out the map" + (unless (member 'map (extract-elements arg)) + (format t "~&What do you want to study?") + (return-from study)) + (print-text-file "../ATL/Pooh/woodland-map.txt")) + (defun jump (player &optional arg) "Jump off Pooh's branch onto his porch." (format t "~&You look down nervously, then jump off the branch.") diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl index fce7dbb..6ec8224 100644 --- a/ATL/Pooh/pooh.atl +++ b/ATL/Pooh/pooh.atl @@ -6,10 +6,7 @@ ; author: Daniel Vedder ; date: 07/06/2017 -name-world "100 Acre Wood" ;TODO Remove this - load-file "pooh-extensions.lisp" -load-file "woodland-map.lisp" load-file "items.atl" load-file "characters.atl" load-file "woods.atl" diff --git a/ATL/Pooh/woodland-map.lisp b/ATL/Pooh/woodland-map.lisp deleted file mode 100644 index 68a8b9b..0000000 --- a/ATL/Pooh/woodland-map.lisp +++ /dev/null @@ -1,45 +0,0 @@ -; The 100 Acre Wood was invented by A.A. Milne for his Winnie-the-Pooh stories. -; This Atlantis world is based on the novels. -; -; This file shows the game map. -; -; author: Daniel Vedder -; date: 31/07/2017 - -(defun study (player &optional arg) - "Print out the map" - (unless (member 'map (extract-elements arg)) - (format t "~&What do you want to study?") - (return-from study)) - (setf map-string " -..............................[ 100 ACRE WOODS ].............................. -: : -: Misty forest Rapids : -: : -: Bee tree : -: Sandy pit : -: : -: Rabbit : -: Kanga Northern : -: woods Rabbit's : -: Stream | friends-and-relations : -: | : -: Deep | Hill : -: forest | : -: | : -: POOH'S Western ___________ Central _____________ Eastern : -: HOME woods woods woods : -: | : -: | Owl Christopher : -: Six pine | Robin : -: trees | : -: | : -: Southern : -: Piglet woods : -: : -: : -: Floody Bridge : -: place Eeyore : -:..............................................................................: -") - (format t "~A" map-string)) diff --git a/ATL/Pooh/woodland-map.txt b/ATL/Pooh/woodland-map.txt new file mode 100644 index 0000000..111727c --- /dev/null +++ b/ATL/Pooh/woodland-map.txt @@ -0,0 +1,29 @@ +..............................[ 100 ACRE WOODS ].............................. +: : +: Misty forest Rapids : +: : +: Bee tree : +: Sandy pit : +: : +: Rabbit : +: Kanga Northern : +: woods Rabbit's : +: Stream | friends-and-relations : +: | : +: Deep | Hill : +: forest | : +: | : +: POOH'S Western ___________ Central _____________ Eastern : +: HOME woods woods woods : +: | : +: | Owl Christopher : +: Six pine | Robin : +: trees | : +: | : +: Southern : +: Piglet woods : +: : +: : +: Floody Bridge : +: place Eeyore : +:..............................................................................: diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl index d965b4f..c11507c 100644 --- a/ATL/Pooh/woods.atl +++ b/ATL/Pooh/woods.atl @@ -310,8 +310,13 @@ neighbour "Southern woods" define-place "Misty forest" - description "TODO" - item "Berries" + description "You are surrounded by pines, their dead needles thickly carpeting + the forest floor. This forest isn't actually part of the 100 Acre + Wood anymore, and it seems somewhat mysterious, because you don't + come here often. You remember that you have gotten lost here before + on a foggy day, so take care that doesn't happen again!" + npc "Blackbird" + item "Pine cone" neighbour "Sandy pit" neighbour "Rapids" exit-hook "misty-forest" diff --git a/doc/TODO b/doc/TODO index 4b9efb4..49e4524 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,7 +1,6 @@ ATLANTIS TODO LISP -* prevent illegal input characters from causing a crash -> PRIORITY * split ui.lisp into two modules (one for interaction functions) ATL diff --git a/lisp/ui.lisp b/lisp/ui.lisp index 5964e01..32a3e3a 100644 --- a/lisp/ui.lisp +++ b/lisp/ui.lisp @@ -32,7 +32,9 @@ (let ((place (get-game-object 'place (player-place player)))) (describe-place place) (input-string command) - (while (zerop (length command)) (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?")))