From 2b7b663e72a84a3932e17f96c046745b5cb851f3 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Mon, 6 Oct 2014 20:43:33 -0700
Subject: [PATCH] distance.

---
 desktop/resources/cursor.png                  | Bin 2604 -> 2642 bytes
 desktop/src-common/advent/actions.clj         |  14 ++++-----
 .../advent/screens/rooms/outside_house.clj    |  28 ++++++++++++++----
 desktop/src-common/advent/screens/scene.clj   |   2 +-
 desktop/src-common/advent/utils.clj           |   6 ++++
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 8ded96a282fd812b3123df94e8af707856c99400..9e0ef7d3014a787d7e0654f31ed54fe7173dde0f 100644
GIT binary patch
delta 1554
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
Ef{7vuDF6Tf

delta 1515
zcmV<H1r++y6s#1mR0My+Nkl<ZcmeHNU1(fI6rK%ImHH3Cz#<xJ^P)ag0yT)WX!k`#
zt3vTfqHR+OzW7=w0sA8OA{0}jK~RdpU&NPfB}OC)A@#+IkhY{!76U0NmEg}q#`{h3
zjb~?P?%!^<(aeQq&YU^t%-pm4eRJ;IRce!5_mB2ze0aNVpZb5;#tdwx3{-HldSyjd
zdU}l9$(z@IpVyTw_jD}o!`0jL?z?WaOFTMrAy;e({H1S}RqumaO^ol4E~ffdt5w}-
zG*WHsV%AA$XASN6YOOCNw`7uCsZ?$#dVBay(Puq=TZ|ps_A+n{-P<Jr33kXf?wTx#
z;LYPN>jQ^h3j%-Z)bsaRf5t(3?DWrS>f*0bm0JezaS{CNX9Xw&BKU;j79o_hIHCB|
z!?#|qt6HsAn#2J7gb3bZ%%UxTpZJdz^^5l1%YY?-?E?dCR{{k7`1l)Y{|nFByBL4_
z10~1Oz)z=d&;3c!w%Gki0Be<i{;KgykVxRzSG%zVjCp^-5C5_tf}eXOV02Z%z5sC0
zCNw}_jF(-1D0bBUzcOG60JqgP39MW;*#Y<gdR~SMIJW<gN(g{MEiHC`3I3hiuQN7M
z2L*|sC4fgkz+?BPyjcIei8w;L?ZU!BDG<RASAT!MqU>3kS49BR&$qTvB_Vw|cO(IC
znxitwKofrfAS3ON06<UhyA^=dCj^joxj=`l)M4lU@%BCw;{A_jnn3KvJu=j<e`@?;
z)TgV<LGaUWY|LM+mL&nkEz(K=!_T*-k&zK^NY|G}-CRHCjO~9T13kWFk_3EXJ{_Lv
zp|>Dks{lX<K2o5)FBWv%^&v~}qo4P>a^!BaraOOczTUVz*4V1B>$^LD-gpF&Z#T{x
zBg-xX;4D9kXZaRc|Jnhdown#XfII+1ka!MYQ@P=UmI^?wFwemtp6&6>FE5t=tOD4V
zHt>@NgB-)j{;1m4^4u=R_wD`nbsqJy1^DNe{!&lgr_`rsx0s=K&!(UF!w4mF))gwJ
z^Adl9w3B5#0i1Uoa-EFHGls0H0rqlk84KV~4*%|;E|Fh^3=*KsF<<NcW)dG$u7Ct6
z`~0Hr>SUma0M5<Nn@0e&d0*WC#Csmyp$T@}1}lNITaw@(9onYluD|D<A1eFy4p|a#
zOMSO5=OOr^D*}GlPfkvvNxdc}CX^36&;fr~!^6XBaB$EY1Hhb}omIXV@W+Wg{EJ?4
zJtPBP3~A>Zcfl`h0RAizaKZ2Rk3<rX8QB=JB>;jRUm_m?@{+)*FV0kIj~~|0JhjV$
z-z5Rrci#fwKyT`zQt}=DbG!P~$?3&HSt9rcdaqTleyP<fGYhF_1a9yUaA6k$u8e;H
zfF<BI#N~^X6@&h1B!c-sAZZuo;U#72e60k(l%;JN2}tlu+3}AgAQQ3yWJ>@9yLoq;
zkU){O;hFx!Po@<<06IPiA=nW0&yO3KB!G$mq(K9`%EO<0<jMXMFMU+`?DeNLNB}MR
zwD+|H|LU$^9Q=ssJ6z+A?Ax_{>mYxK<rqPjCx+{v1$H@4lw$^pX21{t!B1zmPkpH6
zjt*c0_^1R3didZB0OSBYZDlL~9DRUYmiHt9Y3q}l!LJJM{D=wQxv^PJ=K-$tC5TBL
z7%LLP_4ln!&eu&DRX}LI^K<X%rIoME@Z8i1ealU&|G0#%x91_FPyAc*9EyJz_3NL3
zj(!>ZhaZT*T{^%I5|BGTY(n6d{%IA!+`-j<-SK(9XxT64ab*%fSpdQx&;6(@%ETx$
zKYiSLK|gB^q0*nRlJV4oK$QL$zB_5m3HslzEGrNJ+8vJ^IFaDr{|=Lr#I~y$=qLeX
zt(?T*l0cSU+Bn|zW4x2V=X_%TQx<4w8*1B)(XM}JT_JrI355Kp2ML^+9%t9K59~hJ
z)!&+(I0~s5h+j%-dN$`Ec6#^D(@KBWHt}!yM^)VU-7Lj^%s|XQ%)nL7z&~V?jzF{-
R&D8(^002ovPDHLkV1mt&_}l;h

diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj
index 527d116b..80b35bad 100644
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -9,6 +9,7 @@
             [advent.pathfind]
             [advent.actions :as actions]
             [advent.screens.dialogue :as dialogue]
+            [advent.utils :as utils]
             [clojure.core.async :refer [put! <! <!! >! >!! chan go thread take! alts!!]])
   (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter]
            [com.badlogic.gdx.graphics.g2d TextureRegion]
@@ -53,11 +54,6 @@
   (update-in entities [:room :entities target-id] #(start-animation screen % :stand)))
 
 
-(defn dist [x1 y1 x2 y2]
-  (let [dx (- x1 x2)
-        dy (- y1 y2)]
-    (Math/sqrt (+ (* dx dx) (* dy dy)))))
-
 (defmacro run-action [entities & forms]
   `(let [c# (chan)]
      (do
@@ -79,7 +75,7 @@
                           (let [{from-x :x from-y :y :keys [left right scale-x] :as target-entity} (get-in entities [:room :entities target-id])]
                             (let [delta-x (- final-x from-x)
                                   delta-y (- final-y from-y)
-                                  distance (dist from-x from-y final-x final-y)
+                                  distance (utils/dist from-x from-y final-x final-y)
                                   speed (* (or scale-x 1.0) 1.5)
                                   moved-x (if (= 0.0 distance)
                                             0
@@ -102,7 +98,7 @@
 
                 (done? [this screen entities]
                        (let [{from-x :x from-y :y :keys [left right anim] :as target-entity} (get-in entities [:room :entities target-id])]
-                         (< (dist final-x final-y from-x from-y) 1)))
+                         (< (utils/dist final-x final-y from-x from-y) 1)))
 
                 (terminate [this screen entities]
                            (stop screen entities target-id))
@@ -131,7 +127,7 @@
                                   [[target-x target-y] remainder] @targets-left]
                               (let [delta-x (- target-x from-x)
                                     delta-y (- target-y from-y)
-                                    distance (dist from-x from-y target-x target-y)
+                                    distance (utils/dist from-x from-y target-x target-y)
                                     speed (* (or scale-x 1.0) 1.5)
                                     moved-x (if (= 0.0 distance)
                                               0
@@ -155,7 +151,7 @@
 
                   (done? [this screen entities]
                          (let [{from-x :x from-y :y :keys [left right anim] :as target-entity} (get-in entities [:room :entities target-id])]
-                           (< (dist final-x final-y from-x from-y) 1)))
+                           (< (utils/dist final-x final-y from-x from-y) 1)))
 
                   (terminate [this screen entities]
                              (stop screen entities target-id))
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index 81657eef..79e813a0 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -8,6 +8,16 @@
             [play-clj.utils :refer :all]
             [play-clj.g2d :refer :all]))
 
+(def ego-sheep-loc
+  [132 140])
+
+(defn dist-to-sheep [entities]
+  (apply utils/dist (get-in entities [:room :entities :sheep :x]) (get-in entities [:room :entities :sheep :y])
+         ego-sheep-loc))
+
+(defn is-sheep-close? [entities]
+  (< (dist-to-sheep entities) 45))
+
 (defn wizard-dialogue [entities]
   (actions/do-dialogue entities :ego "Hello there Mr. Fangald!" :wizard "Oh no, not you again!")
   (actions/present-choices entities
@@ -152,19 +162,27 @@
                                                                   :box [38 160 71 181]
                                                                   :script (actions/get-script
                                                                            entities
+                                                                          
+                                                                           
                                                                            (if ((get-in @entities [:state :inventory]) :wool)
                                                                              (actions/talk entities :ego "The sheep has given me enough wool.")
-                                                                             (do (actions/give entities :wool)
-                                                                                 (actions/talk entities :ego "I guess her wool is shedding."))))
+                                                                             (if (is-sheep-close? @entities)
+                                                                               (do (actions/walk-to entities :ego ego-sheep-loc)
+                                                                                   (actions/give entities :wool)
+                                                                                   (actions/talk entities :ego "I guess her wool is shedding."))
+                                                                               (actions/talk entities :ego "She's too far away for me to pet her."))))
                                                                   :scripts {:wool (actions/get-script entities
                                                                                                       (actions/talk entities :ego "She doesn't need it back."))
                                                                             :carrot (actions/get-script entities
-                                                                                                        (actions/walk-to entities :ego [132 140])
+                                                                                                        (actions/walk-to entities :ego ego-sheep-loc)
                                                                                                         (actions/talk entities :ego "Come on girl, get the carrot!")
                                                                                                         (actions/walk-straight-to entities :sheep [95 150]))
                                                                             :flask (actions/get-script entities
-                                                                                                       (actions/give entities :flask-with-contents)
-                                                                                                       (actions/talk entities :ego "Sheeps milk."))}
+                                                                                                       (if (is-sheep-close? @entities)
+                                                                                                         (do (actions/walk-to entities :ego ego-sheep-loc)
+                                                                                                             (actions/give entities :flask-with-contents)
+                                                                                                             (actions/talk entities :ego "Sheeps milk."))
+                                                                                                         (actions/talk entities :ego "She's too far away.")))}
                                                                   :left {:walk (utils/flip sheep-walk)
                                                                          :stand (utils/flip sheep-stand)}
                                                                   :right {:walk sheep-walk
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index e21aa86c..5c9c8a5e 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -133,7 +133,7 @@
     (update! screen :renderer (stage) :camera (orthographic))
     (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0)
           music (sound "town-music.mp3")
-          _ (sound! music :loop 0.80)
+          ;; _ (sound! music :loop 0.80)
           rooms {:inside-house (rooms.inside-house/make screen)
                  :outside-house (rooms.outside-house/make screen)
                  :behind-house (rooms.behind-house/make screen)
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index bac04070..f4d5c165 100644
--- a/desktop/src-common/advent/utils.clj
+++ b/desktop/src-common/advent/utils.clj
@@ -44,6 +44,12 @@
                 range (+ (* percent-complete (- maximum-size minimum-size)) minimum-size)]
             range)))))
 
+(defn dist [x1 y1 x2 y2]
+  (let [dx (- x1 x2)
+        dy (- y1 y2)]
+    (Math/sqrt (+ (* dx dx) (* dy dy)))))
+
+
 (defn flip [anim]
   (animation (animation! anim :get-frame-duration)
              (for [src-frame (animation! anim :get-key-frames)