From 5e57ef9e4cc7cdc14a709992fa033ee622454320 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 26 Jul 2015 21:17:48 -0700 Subject: [PATCH] fixed wizard positioning and likelihood. --- desktop/src-common/advent/screens/rooms/inside_house.clj | 2 +- desktop/src-common/advent/screens/rooms/outside_house.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 8e01918d..0e30fb2c 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -198,7 +198,7 @@ (actions/remove-entity entities :frog-legs) (actions/do-dialogue entities :ego "Eww. Frog legs.")))))} :experiment (rooms/make-entity :experiment (assoc (animation->texture screen experiment-left) - :x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 7.43 :origin-y 0 + :x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 13 :origin-y 0 :experiment experiment-left :baseline 225)) :collision "inside-house/collision.png" diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 031aac4c..acac327e 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -347,7 +347,7 @@ (actions/talk entities :ego "It's locked.") (do (actions/play-animation entities :door :open) (actions/transition-background entities :inside-house [237 0] :between (fn [s e] - (if (= 1 (rand-int 10)) + (if (= 1 (rand-int 4)) (assoc-in e [:room :entities :experiment] (get-in e [:room :experiment])) e))) (when (get-in @entities [:room :entities :experiment])