diff --git a/desktop/resources/outsidehouse/collision.png b/desktop/resources/outsidehouse/collision.png index 0a8b943b..5777f650 100644 Binary files a/desktop/resources/outsidehouse/collision.png and b/desktop/resources/outsidehouse/collision.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 883ca536..00b5b21e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -677,13 +677,13 @@ (actions/play-animation entities :ego :reach) (actions/give entities :wool) (actions/talk entities :ego "I guess her wool is shedding.") - (leave-sheep entities)) + ) (do (walk-to-sheep entities) (actions/talk entities :ego "Come here, mama sheep!") (actions/play-animation entities :ego :sigh) (actions/talk entities :ego "She's too far away for me to pet her.") - (leave-sheep entities))))) + )))) :scripts #(condp = % :wool (actions/get-script entities (actions/talk entities :ego "She doesn't need it back.")) @@ -692,7 +692,7 @@ (actions/talk entities :ego "Come on, girl, get the grass!") (actions/play-animation entities :ego :reach) (actions/talk entities :ego "I think she's not interested.") - (leave-sheep entities)) + ) :carrot (actions/get-script entities (walk-to-sheep entities) (actions/talk entities :ego "Come on, girl, get the carrot!") @@ -700,7 +700,7 @@ (actions/play-animation entities :ego :reach) (actions/remove-item entities :carrot) (actions/update-state entities (fn [s] (assoc s :coaxed-sheep? true))) - (leave-sheep entities)) + ) :flask-1 (actions/get-script entities (if (actions/has-item? entities :recipe) (if (is-sheep-close? @entities) @@ -709,7 +709,7 @@ (actions/remove-item entities :flask-1) (actions/give entities :flask-1-with-milk) (actions/talk entities :ego "Sheeps milk.") - (leave-sheep entities)) + ) (actions/talk entities :ego "She's too far away.")) (actions/talk entities :ego "I don't need any milk."))) :flask-1-with-mushrooms @@ -718,7 +718,7 @@ (do (walk-to-sheep entities) (actions/play-animation entities :ego :milk) (items/make-cream-of-mushroom entities) - (leave-sheep entities)) + ) (actions/talk entities :ego "She's too far away."))) :sword