diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 456f1ae..f7c6a36 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -45,7 +45,7 @@ define-item "Piglet's sign" description " - ________________ + _________________ | \\_ | TRESPASSERS W > |_________________< diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 456f1ae..f7c6a36 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -45,7 +45,7 @@ define-item "Piglet's sign" description " - ________________ + _________________ | \\_ | TRESPASSERS W > |_________________< diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 207dd78..67195e3 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -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 (> 55 (random 100)) + (when (> 75 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -396,6 +396,7 @@ "../ATL/Pooh/dialogue/pictureframe.txt")) (2 NIL))) +;;XXX Transfer this function to the main framework? (defun craft-item (player item-name requirements dialogue-file) "A generic crafting function - helper function for (craft)" (dolist (r1 requirements) @@ -460,7 +461,7 @@ (defun daniel-says (player) "Leave a message for the real me" ;;Make sure we're on my server - (unless (and (equalp (first (load-text-file "/etc/hostname")) "Turing") + (unless (and (equalp (first (load-text-file "/etc/hostname")) "Helios") (y-or-n-p "~&~%Daniel has more to say to you. Do you want to hear it?")) (return-from daniel-says)) (setf msg "~%DANIEL: diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 456f1ae..f7c6a36 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -45,7 +45,7 @@ define-item "Piglet's sign" description " - ________________ + _________________ | \\_ | TRESPASSERS W > |_________________< diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 207dd78..67195e3 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -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 (> 55 (random 100)) + (when (> 75 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -396,6 +396,7 @@ "../ATL/Pooh/dialogue/pictureframe.txt")) (2 NIL))) +;;XXX Transfer this function to the main framework? (defun craft-item (player item-name requirements dialogue-file) "A generic crafting function - helper function for (craft)" (dolist (r1 requirements) @@ -460,7 +461,7 @@ (defun daniel-says (player) "Leave a message for the real me" ;;Make sure we're on my server - (unless (and (equalp (first (load-text-file "/etc/hostname")) "Turing") + (unless (and (equalp (first (load-text-file "/etc/hostname")) "Helios") (y-or-n-p "~&~%Daniel has more to say to you. Do you want to hear it?")) (return-from daniel-says)) (setf msg "~%DANIEL: diff --git a/doc/PLAYING b/doc/PLAYING index c427613..a8ead8a 100644 --- a/doc/PLAYING +++ b/doc/PLAYING @@ -99,7 +99,7 @@ wish to go to after the actual command (e.g. goto Kitchen). search - Some rooms contain hidden items. To find them, you first need to search - the room. When you do so, you have a 66% chance of finding a hidden + the room. When you do so, you have an 80% chance of finding a hidden object. Don't forget to do this once in a while! take - This command is used to pick up an item. Most items in the game can be @@ -149,4 +149,4 @@ Daniel Vedder -Last modified 06/11/2017 +Last modified 20/12/2017 diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 456f1ae..f7c6a36 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -45,7 +45,7 @@ define-item "Piglet's sign" description " - ________________ + _________________ | \\_ | TRESPASSERS W > |_________________< diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 207dd78..67195e3 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -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 (> 55 (random 100)) + (when (> 75 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -396,6 +396,7 @@ "../ATL/Pooh/dialogue/pictureframe.txt")) (2 NIL))) +;;XXX Transfer this function to the main framework? (defun craft-item (player item-name requirements dialogue-file) "A generic crafting function - helper function for (craft)" (dolist (r1 requirements) @@ -460,7 +461,7 @@ (defun daniel-says (player) "Leave a message for the real me" ;;Make sure we're on my server - (unless (and (equalp (first (load-text-file "/etc/hostname")) "Turing") + (unless (and (equalp (first (load-text-file "/etc/hostname")) "Helios") (y-or-n-p "~&~%Daniel has more to say to you. Do you want to hear it?")) (return-from daniel-says)) (setf msg "~%DANIEL: diff --git a/doc/PLAYING b/doc/PLAYING index c427613..a8ead8a 100644 --- a/doc/PLAYING +++ b/doc/PLAYING @@ -99,7 +99,7 @@ wish to go to after the actual command (e.g. goto Kitchen). search - Some rooms contain hidden items. To find them, you first need to search - the room. When you do so, you have a 66% chance of finding a hidden + the room. When you do so, you have an 80% chance of finding a hidden object. Don't forget to do this once in a while! take - This command is used to pick up an item. Most items in the game can be @@ -149,4 +149,4 @@ Daniel Vedder -Last modified 06/11/2017 +Last modified 20/12/2017 diff --git a/doc/TODO b/doc/TODO index 6fa8785..25696cb 100644 --- a/doc/TODO +++ b/doc/TODO @@ -2,7 +2,7 @@ LISP * fix (string-from-list) bug -* infinite items are destroyed when dropped? ATL -* remove Christopher Robin character +* simplify game + diff --git a/ATL/Pooh/dialogue/balloon.txt b/ATL/Pooh/dialogue/balloon.txt index 62f0b9c..7bb5ed2 100644 --- a/ATL/Pooh/dialogue/balloon.txt +++ b/ATL/Pooh/dialogue/balloon.txt @@ -8,10 +8,10 @@ The balloon is huge. You struggle to keep hold of it. You blow just a little bit more. The balloon lifts you up! Your feet leave the ground. -This is fun! +This is fun! (+5 XP) You rise up into the sky, free as a bird. There's a branch above you! The balloon flies into the branch. KER-BOOM! You fall back down to the ground. -Ouch, that hurt! -3 HP +Ouch, that hurt! (-3 HP) diff --git a/ATL/Pooh/dialogue/clues.txt b/ATL/Pooh/dialogue/clues.txt index 20374bd..d316264 100644 --- a/ATL/Pooh/dialogue/clues.txt +++ b/ATL/Pooh/dialogue/clues.txt @@ -1,12 +1,15 @@ +If you don't know what you're doing, go home and think! 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? +Honey is made by bees, but collecting it is a bit of work (you need a jar...). +You like to picknick at the Thoughtful Spot and the Rapids. Have a look around. A lot of your friends need help, and they all know you like honey as a reward. +Rabbit is stingy, but he has some honey stashed away at home. It's a good idea to go armed - what if you meet a Heffalump? -Woozles are hard to catch, but it's worth the effort... +Woozles are hard to catch, but it's worth the effort... Bring one to Piglet! +For some inexplicable reason, there's a pot of honey in the cave. Don't forget to search - seek and you shall find! You can make some very useful things in Christopher Robin's workshop. -Not all things are as they appear. -Seek and ye shall find! +Not all things are as they appear - check out Owl's bellrope. If you're hurt, go and find Kanga. If you chase Tigger long enough, he may have something for you. +If you don't know what you're doing, go home and think! diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl index 456f1ae..f7c6a36 100644 --- a/ATL/Pooh/items.atl +++ b/ATL/Pooh/items.atl @@ -45,7 +45,7 @@ define-item "Piglet's sign" description " - ________________ + _________________ | \\_ | TRESPASSERS W > |_________________< diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp index 207dd78..67195e3 100644 --- a/ATL/Pooh/pooh-extensions.lisp +++ b/ATL/Pooh/pooh-extensions.lisp @@ -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 (> 55 (random 100)) + (when (> 75 (random 100)) (sleep 1) (format t "~&The woozle winds its way out of your arms.") (sleep 1) @@ -396,6 +396,7 @@ "../ATL/Pooh/dialogue/pictureframe.txt")) (2 NIL))) +;;XXX Transfer this function to the main framework? (defun craft-item (player item-name requirements dialogue-file) "A generic crafting function - helper function for (craft)" (dolist (r1 requirements) @@ -460,7 +461,7 @@ (defun daniel-says (player) "Leave a message for the real me" ;;Make sure we're on my server - (unless (and (equalp (first (load-text-file "/etc/hostname")) "Turing") + (unless (and (equalp (first (load-text-file "/etc/hostname")) "Helios") (y-or-n-p "~&~%Daniel has more to say to you. Do you want to hear it?")) (return-from daniel-says)) (setf msg "~%DANIEL: diff --git a/doc/PLAYING b/doc/PLAYING index c427613..a8ead8a 100644 --- a/doc/PLAYING +++ b/doc/PLAYING @@ -99,7 +99,7 @@ wish to go to after the actual command (e.g. goto Kitchen). search - Some rooms contain hidden items. To find them, you first need to search - the room. When you do so, you have a 66% chance of finding a hidden + the room. When you do so, you have an 80% chance of finding a hidden object. Don't forget to do this once in a while! take - This command is used to pick up an item. Most items in the game can be @@ -149,4 +149,4 @@ Daniel Vedder -Last modified 06/11/2017 +Last modified 20/12/2017 diff --git a/doc/TODO b/doc/TODO index 6fa8785..25696cb 100644 --- a/doc/TODO +++ b/doc/TODO @@ -2,7 +2,7 @@ LISP * fix (string-from-list) bug -* infinite items are destroyed when dropped? ATL -* remove Christopher Robin character +* simplify game + diff --git a/lisp/ui.lisp b/lisp/ui.lisp index 739cedf..5988431 100644 --- a/lisp/ui.lisp +++ b/lisp/ui.lisp @@ -236,7 +236,7 @@ (let* ((place (get-game-object 'place (player-place player))) (hidden (place-hidden place))) (dolist (h hidden) - (when (> 67 (random 100)) + (when (> 80 (random 100)) (format t "~&You find: ~A" h) (set-object-attribute place 'item h) (remove-object-attribute place 'hidden h)))) @@ -398,8 +398,11 @@ (remove-object-attribute player 'item item) (when (equalp (player-tool player) item) (set-object-attribute player 'tool "")) - (set-object-attribute - (get-game-object 'place (player-place player)) 'item item) + (unless (item-infinite (get-game-object 'item item)) + ;; Infinite items are destroyed when dropped + ;; (otherwise they create new "spawn points") + (set-object-attribute (get-game-object 'place + (player-place player)) 'item item)) (format t "~&You have dropped: ~A" item) (unless (zerop (length (item-drop-hook (get-game-object 'item item)))) (funcall (read-from-string