# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1332826387 18000
# Node ID 3266bd0a6300057cbe2d8034e8a12cfbf6cc56f0
# Parent  49096b8b99d544630ea3b638298d676e16d60293
script: went back to viridian store.

diff -r 49096b8b99d5 -r 3266bd0a6300 clojure/com/aurellem/run/bootstrap_0.clj
--- a/clojure/com/aurellem/run/bootstrap_0.clj	Mon Mar 26 23:54:52 2012 -0500
+++ b/clojure/com/aurellem/run/bootstrap_0.clj	Tue Mar 27 00:33:07 2012 -0500
@@ -230,7 +230,7 @@
      (->> script 
           (walk [← ← ↓ ↓ ↓ ↓ ↓ ↓]))))
 
-(defn-memo  oaks-lab->pallet-town-edge
+(defn-memo oaks-lab->pallet-town-edge
   ([] (oaks-lab->pallet-town-edge
        (leave-oaks-lab)))
   ([script]
@@ -239,7 +239,6 @@
                  ↑ ↑ ↑ ↑
                  ↑ ↑ ↑ ↑ ↑ ↑
                  → ↑]))))
-                 
 
 (defn move-thru-grass
   [direction script]
@@ -266,10 +265,17 @@
           script directions))
 
 (defn-memo pallet-edge->viridian-mart
-  ([] (pallet-edge->viridian-mart
+  ([] (pallet-edge->viridian-mart true
        (oaks-lab->pallet-town-edge)))
-  ([script]
-     (->> script
+  ([dodge-stupid-guy? script]
+     (let [dodge-1 (if dodge-stupid-guy?
+                    [→ →]
+                    [→])
+           dodge-2 (if dodge-stupid-guy?
+                     [↑ ↑ ←]
+                     [↑ ↑ ←])]
+       
+       (->> script
           ;; leave straight grass
           (walk-thru-grass
            [↑ ↑ ↑ ↑ ↑])
@@ -288,20 +294,21 @@
             ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
             → → → → ])
 
-          ;; this part it dependent on that
+          ;; this part is dependent on that
           ;; stupid NPC in the grass patch
           (walk-thru-grass
-           [→ →
-            ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ])
-           
+           (concat dodge-1
+                [↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ]))
+          
           (walk
-           [↑ ↑
-            ← ← ← ←
-            ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
-            ← ←
-            ↑ ↑ ↑ ↑
-            → → → → → → → → → →
-            ↑ ↑ ↑ ↑ ↑ ↑ ↑])))) 
+           (concat
+            dodge-2
+            [← ← ←
+             ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑ ↑
+             ← ←
+             ↑ ↑ ↑ ↑
+             → → → → → → → → → →
+             ↑ ↑ ↑ ↑ ↑ ↑ ↑])))))) 
             
 (defn-memo get-oaks-parcel
   ([] (get-oaks-parcel
@@ -391,6 +398,12 @@
           (scroll-text 7)
           (end-text)
 
-          (walk [← ← ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓])
-          
-          )))
\ No newline at end of file
+          (walk [← ← ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓]))))
+
+(defn-memo return-to-viridian-mart
+  ([] (return-to-viridian-mart
+       (deliver-oaks-parcel)))
+  ([script]
+     (->> script
+          oaks-lab->pallet-town-edge
+          (pallet-edge->viridian-mart false))))
\ No newline at end of file