diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 2a334aaf..05196a8e 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -122,19 +122,23 @@ (actions/add-entity entities :blergh (get-in @entities [:room :blergh])) (actions/do-dialogue entities :ego "Who are you?!" - :blergh "I am Bloodclot, the goblin king!" - :blergh "The last 100 years I have waited for someone to pull my old sword,\n and let me return me to my rightful throne!" + :bloodclot-head "I am Bloodclot, the Scottish goblin king!" + :bloodclot-head "I have waited patiently for the last 100 years for someone to\npull the sword and return me to my throne!" + :bloodclot-head "But I had never expected my liberator to be so..." + :bloodclot-head "Appetizing." :ego "Wait a second. I'm just a kid.") - (actions/walk-straight-to entities :ego [150 45] :override-dir :right) + (actions/walk-straight-to entities :ego [115 45] :override-dir :right) (actions/do-dialogue entities :ego "I'm just trying to impress Georgia McGorgeous.") (actions/walk-straight-to entities :ego [100 45] :override-dir :right) (actions/do-dialogue entities :ego "I just... accidentally pulled the sword!") + (actions/walk-straight-to entities :ego [35 45] :override-dir :right) + (actions/do-dialogue entities :ego "I wouldn't taste very good anyhow!") (actions/do-dialogue entities - :blergh "'Fight he must for one more test,\nHe will die if not the best.'" - :blergh "Ring any bells?" - :blergh "It's time to die kiddo." - :blergh "I'll even let you take a free shot at me." - :blergh "Come on! Give it a go!")) + :bloodclot-head "'Fight he must for one more test,\nHe will die if not the best.'" + :bloodclot-head "Ring any bells?" + :bloodclot-head "Your Georgia McGorgeous would be sorely disappointed to see such a cowardly hero now." + :bloodclot-head "Come, now. You're no hero. You're just a morsel." + :bloodclot-head "All this talking has worked up a fierce hunger. Come here, and I promise to make it quick.")) (defn try-to-pull-sword [entities missing-items obtained-items] (let [item->proof {:trophy "wisdom" :medal "strength" :kiss "courage"}] diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index f144be91..28294432 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -167,7 +167,6 @@ :script (actions/get-script entities (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!")) :scripts {:sword (actions/get-script entities - #_(actions/walk-straight-to entities :ego [205 45] :anim :jump :stop? false :speed 3.0) (swing-at-blergh entities) (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"