From e16f9d5debd40b4b7f7d2bb0d668f0e7be14bb55 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 15 Feb 2016 08:18:24 -0800 Subject: [PATCH] fixed walking through coutner --- .../resources/inside-antique/collision.png | Bin 12134 -> 1580 bytes .../advent/screens/rooms/inside_antique.clj | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/resources/inside-antique/collision.png b/desktop/resources/inside-antique/collision.png index 2d896de383d2f61e351ea9d613a2e4993bb4d6dc..8940e9a889e91c3ab060771ff9d6d776e962149e 100644 GIT binary patch delta 739 zcmaDBw}xj!9Fx4clbfN5xtpuAvyri(p{uErsj-`jv5~8rtE0J#h4JKCCRvyo7hGy~ zGNr4em>4Fe8W|+%8kv|H>6)aZS?VTQq*(w7OG_g|lVpozOVi0N%uV$l7jkegFfe&} zx;TbZ+ zSXuLj`Pc3|jJSUF*H)kFr_6YMe0aV~bLF1PQFHAW=NoD~Q+_ljXJ!-gw}$WaUD->` z?zW$27jr$Z%w;2wom0G#-tKd0)$0x3JqX_x;r`+hWB82O_XQ=t{)(;Ne6`?cL-(1p z=@xo>=6z<{a@;fGz*eSp#-Z;|e%QA>k&*wFz=aP-8m@NtJnp|>)BAzy-w&OgbYE2+Y~opm@V~uR?;ufdlKz zA0Fv0o6z>4A(iJN<7tUU_Z$E2WMjH!05n-4f%otZpymcs9*{s*#NiEwulCl@J8vVf zq359Btxl;o2eu_iNNt!WxM7~-0V6h`lNcALu;`=#3dfEgxv^gG-YFodYftkVX%^AB_^*^*gvFqvT=d#Wzp$P!TGx*>D delta 11376 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 diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 353b9d47..7e5cb6cb 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -156,7 +156,7 @@ ) }]}))) (defn return-portrait [ entities] - (actions/walk-to entities :ego [143 64] :face :left) + (actions/walk-to entities :ego [143 58] :face :left) (actions/play-animation entities :ego :reach) (actions/add-entity entities :portrait (get-in @entities [:room :portrait])) (actions/remove-item entities :portrait)) @@ -356,7 +356,7 @@ :baseline 125 :script (actions/get-script entities (if (= 3 (get-in @entities [:state :mints-eaten])) - (do (actions/walk-to entities :ego [159 62] :face :right) + (do (actions/walk-to entities :ego [159 58] :face :right) #_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) (actions/do-dialogue entities @@ -364,7 +364,7 @@ :shopkeep "That's right, I'm all out." :shopkeep "Go tell Gandarf that I need some more brewed up." :shopkeep "Pronto!")) - (do (actions/walk-to entities :ego [159 62] :face :right) + (do (actions/walk-to entities :ego [159 58] :face :right) (if (= 0 (get-in @entities [:state :mints-eaten])) (actions/talk entities :ego "I'll just try one of these mints.") (actions/talk entities :ego "I'll just try another one of these mints.")) @@ -393,7 +393,7 @@ :y 114 :baseline 120 :script (actions/get-script entities - (actions/walk-to entities :ego [140 61] :face :left) + (actions/walk-to entities :ego [140 58] :face :left) (actions/play-animation entities :ego :reach) (actions/remove-entity entities :portrait) (actions/give entities :portrait)