1.1 --- a/clojure/com/aurellem/run/adv_choreo.clj	Sun Sep 02 10:34:14 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/adv_choreo.clj	Sun Sep 02 14:28:53 2012 -0500
     1.3 @@ -354,25 +354,25 @@
     1.4          {:l [23 23]
     1.5           :u [33 11]
     1.6           :r [46 23]
     1.7 -         :d [33 26]
     1.8 +         :d [33 36]
     1.9           
    1.10           :start  [65 24]
    1.11           :select [80 24]
    1.12  
    1.13           :b  [100 25]
    1.14           :a  [121 25]}]
    1.15 -    (apply
    1.16 -     clojure.java.shell/sh
    1.17 -     (flatten 
    1.18 -      ["convert"
    1.19 -       (.getCanonicalPath gb-button-bar)
    1.20 -       (map
    1.21 -        (fn [key]
    1.22 -          (let [[x y] (key-positions key)]
    1.23 -            (.getCanonicalPath gb-button-mark)
    1.24 -            "-geometry" (str "+" x "+" y) "-composite"))
    1.25 -        buttons)        
    1.26 -       (.getCanonicalPath target-file)]))))
    1.27 +    (let [command
    1.28 +          (flatten 
    1.29 +           ["convert"
    1.30 +            (.getCanonicalPath gb-button-bar)
    1.31 +            (map
    1.32 +             (fn [key]
    1.33 +               (let [[x y] (key-positions key)]
    1.34 +                 [(.getCanonicalPath gb-button-mark)
    1.35 +                  "-geometry" (str "+" x "+" y) "-composite"]))
    1.36 +             move)
    1.37 +            (.getCanonicalPath target-file)])]
    1.38 +      (apply  clojure.java.shell/sh command))))
    1.39  
    1.40  (defn adv-composite-frames-command
    1.41    [move-image screenshot target]

     2.1 --- a/clojure/com/aurellem/run/bootstrap_1.clj	Sun Sep 02 10:34:14 2012 -0500
     2.2 +++ b/clojure/com/aurellem/run/bootstrap_1.clj	Sun Sep 02 14:28:53 2012 -0500
     2.3 @@ -734,7 +734,7 @@
     2.4  (defn-memo go-to-mansion-for-the-lulz
     2.5    ([] (go-to-mansion-for-the-lulz (hacking-13)))
     2.6    ([script]
     2.7 -     (let [lulz-delay 50]
     2.8 +     (let [lulz-delay 70]
     2.9         (->> script
    2.10              close-menu
    2.11              close-menu
    2.12 @@ -750,6 +750,7 @@
    2.13              (play-moves [[:a]])
    2.14              (do-nothing lulz-delay)
    2.15              (play-moves [[:a]])
    2.16 +            (do-nothing lulz-delay)
    2.17              close-menu))))
    2.18  
    2.19  (defn-memo launch-bootstrap-program

     3.1 --- a/clojure/com/aurellem/run/final_cut.clj	Sun Sep 02 10:34:14 2012 -0500
     3.2 +++ b/clojure/com/aurellem/run/final_cut.clj	Sun Sep 02 14:28:53 2012 -0500
     3.3 @@ -135,8 +135,8 @@
     3.4  ;;      (.getCanonicalPath movie)) nil))
     3.5  
     3.6  (defn final-cut! [^File render-dir]
     3.7 -  (let [movie (File. render-dir "final.ogg")
     3.8 -        final-audio (File. render-dir "final.wav")
     3.9 +  (let [movie (File. render-dir "final.avi")
    3.10 +        final-audio (File. render-dir "final.mp3")
    3.11          final (File. render-dir "final")]
    3.12      (.delete movie)
    3.13      (.delete final-audio)
    3.14 @@ -150,8 +150,8 @@
    3.15       "-i" (.getCanonicalPath final-audio)
    3.16       "-b:a" "128k"
    3.17       "-b:v" "9000k"
    3.18 -     "-c:a" "libvorbis"
    3.19 -     "-c:v" "libtheora"
    3.20 +     "-c:a" "libmp3lame"
    3.21 +     "-c:v" "mpeg4"
    3.22       "-r" "60"
    3.23       (.getCanonicalPath movie)) nil))
    3.24  

     4.1 Binary file moves/advanced.vbm has changed

     5.1 Binary file save-states/advanced.sav has changed