diff --git a/desktop/resources/outside-castle/steer.png b/desktop/resources/outside-castle/steer.png index 2888b8fb..d5f1b880 100644 Binary files a/desktop/resources/outside-castle/steer.png and b/desktop/resources/outside-castle/steer.png differ diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 9e3a28cc..6e26d8d7 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -5,6 +5,7 @@ (declare stick) (declare wool) (declare cat-toy) +(declare flask-1-with-milk) (def make-cat-toy (actions/get-script entities (actions/remove-item entities stick) @@ -20,19 +21,22 @@ (def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents}) -(defn make-cream-of-mushroom-from [from] +(defn make-cream-of-mushroom [] (actions/get-script entities - (actions/remove-item entities from) + (actions/remove-item entities flask-1-with-mushrooms) + (actions/remove-item entities flask-1-with-milk) + (actions/remove-item entities mushrooms) (actions/give entities flask-1-with-cream-of-mushroom) (actions/talk entities :ego "It's just like cream of mushroom soup."))) (def flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents - :scripts {:mushrooms (make-cream-of-mushroom-from flask-1-with-milk)}}) + :scripts {:mushrooms (make-cream-of-mushroom)}}) (def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-contents}) (def flask-1 {:name "Flask" :value :flask-1 :cursor :flask :scripts {:mushrooms (actions/get-script entities (actions/remove-item entities flask-1) + (actions/remove-item entities mushrooms) (actions/give entities flask-1-with-mushrooms) (actions/talk entities :ego "I'll just put a few of these in here."))}}) diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 102e2bfc..46df2de5 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -187,7 +187,7 @@ (actions/give entities items/flask-1-with-milk) (actions/talk entities :ego "Sheeps milk.")) (actions/talk entities :ego "She's too far away."))) - items/flask-1-with-mushrooms (items/make-cream-of-mushroom-from items/flask-1-with-mushrooms)} + items/flask-1-with-mushrooms (items/make-cream-of-mushroom)} :left {:walk (utils/flip sheep-walk) :stand (utils/flip sheep-stand)} :right {:walk sheep-walk