From 9a6638964d198394391dd6c9426d4411af60f81a Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 5 Sep 2015 17:08:21 -0700 Subject: [PATCH] descriptions for each item. --- desktop/gametodos.txt | 6 +- .../advent/screens/rooms/common.clj | 4 + desktop/src-common/advent/screens/scene.clj | 145 ++++++++++++++++-- 3 files changed, 142 insertions(+), 13 deletions(-) diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 10333c9c..ac831dea 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -4,12 +4,14 @@ ART PROGRAMMING + fight with blergh at end isn't great + blergh taunts for first fight -+ ending + proper save/settings file location + Save slots? -+ descriptions for all items when used on self. + try to have dialogue for every wrong interaction + Dialogue frozen ++ ending credits ++ no self-use when held by bloodclot. ++ no premptive potion making + AUDIO + Walking diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index f0b0c891..353df08a 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -431,3 +431,7 @@ (doto (assoc (particle-effect "outside-particles") :x 160 :y 120 :baseline 238) (particle-effect! :set-position 160 120))) + + +(defn one-liner [msg] + (actions/get-script entities (actions/do-dialogue entities :ego msg))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f9aa44ba..c64e51d1 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -287,6 +287,7 @@ void main() (defn get-ego-script [cursor [x y]] + (condp = (:value cursor) :flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "Blegh! Gross!")) @@ -341,16 +342,13 @@ void main() (actions/get-script entities (common/read-note-2 entities)) :camera - (actions/get-script entities - (actions/talk entities :ego "It's some sort of magical device that captures images.")) + (common/one-liner "It's some sort of magical device that captures images.") :alarm-clock - (actions/get-script entities - (actions/talk entities :ego "It's a magic device that tells the time.")) + (common/one-liner "It's a magic device that tells the time.") :walkie-talkies - (actions/get-script entities - (actions/do-dialogue entities :ego "If I talk in one of these devices, I can hear it in the other one!")) + (common/one-liner "If I talk in one of these devices, I can hear it in the other one!") :mushrooms (actions/get-script entities @@ -361,14 +359,139 @@ void main() (actions/do-dialogue entities :ego "Yuck!")) :stick - (actions/get-script entities - (actions/do-dialogue entities :ego "It's a huge stick.")) + (common/one-liner "It's a huge stick.") :wool - (actions/get-script entities - (actions/do-dialogue entities :ego "Better not wash it in hot water.")) - + (common/one-liner "Better not wash it in hot water.") + + :spell-component + (common/one-liner "It needs to go into the cauldron.") + + :feather + (common/one-liner "An owl feather. Smells like puke.") + + :ball-n-chain + (common/one-liner "Why am I lugging this around? It's so heavy.") + + :flask-water + (common/one-liner "Gandarf knows what to do next with this.") + + :broom + (common/one-liner "A janitor's broom.") + + :glass-eye + (common/one-liner "It's a glass eye.") + + :flask-1-slobber + (common/one-liner "It's got some bull slobber in it.") + + :crowbar + (common/one-liner "It can probably bend steel!") + + :monocle + (common/one-liner "It's a monocle.") + + :used-earplugs + (common/one-liner "They've got earwax all over them. No thanks.") + + :broken-clock + (common/one-liner "Split right down the middle.") + + :trophy + (common/one-liner "I've prove myself in wisdom!") + + :carrot + (common/one-liner "I'm not that hungry.") + + :ladder + (common/one-liner "It's the Duke's ladder.") + + :motivational-tapes + (common/one-liner "If only I had a VCR. I'd get my life back together.") + + :sack-lunch + (common/one-liner "Ugh, gross! The blue cheese smells really strong.") + + :grass + (common/one-liner "This is top quality, high protein stuff!") + + :cat-toy + (common/one-liner "It's a little cat toy!") + + :ash + (common/one-liner "A spell's ashes.") + + :shovel + (common/one-liner "A grave-digger's shovel.") + + :mandrake + (common/one-liner "It's some kind of root.") + + :flask-water-flies + (common/one-liner "Looks like I need to add the ashes of magic.") + + :flask-1 + (common/one-liner "An empty flask.") + + :flask-flies-ash + (common/one-liner "Looks like I need to stir it with the gift of flight.") + + :magic-slingshot + (common/one-liner "The Slinger's Shot, fully restored.") + + :frog-legs + (common/one-liner "I wonder where the head is...") + + :sword + (common/one-liner "Yowza! The Sword of Blergh's sharp as a razor.") + + :medal + (common/one-liner "I've proven myself worthy in strength!") + + :spear + (common/one-liner "A knight's spear.") + + :slobber + (common/one-liner "I wonder why I am carrying this drool around.") + + :kiss + (common/one-liner "Yuck! A kiss for my bravery.") + + :flask-1-with-milk + (common/one-liner "I've got some sheey's milk in my flask.") + + :flask-1-with-mushrooms + (common/one-liner "I've got some mushrooms in my flask.") + + :balloon + (common/one-liner "My choicest baloon would be blue. But he didn't give me a choice.") + + :money + (common/one-liner "It's got the Duke of Remington's face on it.") + + :flask-2 + (common/one-liner "I need to fill it with fountain water.") + + :key + (common/one-liner "It's the key to the jail.") + + :flask-water-ash + (common/one-liner "Looks like I need the sound of buzzing.") + + :slingshot + (common/one-liner "The Slinger's Shot.") + + :teddy + (common/one-liner "It's the choicest teddy.") + + :flies + (common/one-liner "I don't want any of them to buzz off.") + + :rope + (common/one-liner "A nice, sturdy, rope.") + nil)) + (defn get-ego [screen start-pos start-scale] (let [player-sheet (texture! (texture "player.png") :split 18 36) talk-sheet (texture! (texture "ego/talk.png") :split 18 36)