# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1346614133 18000
# Node ID 54644b08da1afffc950e07aee07ec8d4d6cde6b4
# Parent  c8cda378e1a09f669d31e0a8c4bc80e2f580e760
rendered final video.

diff -r c8cda378e1a0 -r 54644b08da1a clojure/com/aurellem/run/adv_choreo.clj
--- a/clojure/com/aurellem/run/adv_choreo.clj	Sun Sep 02 10:34:14 2012 -0500
+++ b/clojure/com/aurellem/run/adv_choreo.clj	Sun Sep 02 14:28:53 2012 -0500
@@ -354,25 +354,25 @@
         {:l [23 23]
          :u [33 11]
          :r [46 23]
-         :d [33 26]
+         :d [33 36]
          
          :start  [65 24]
          :select [80 24]
 
          :b  [100 25]
          :a  [121 25]}]
-    (apply
-     clojure.java.shell/sh
-     (flatten 
-      ["convert"
-       (.getCanonicalPath gb-button-bar)
-       (map
-        (fn [key]
-          (let [[x y] (key-positions key)]
-            (.getCanonicalPath gb-button-mark)
-            "-geometry" (str "+" x "+" y) "-composite"))
-        buttons)        
-       (.getCanonicalPath target-file)]))))
+    (let [command
+          (flatten 
+           ["convert"
+            (.getCanonicalPath gb-button-bar)
+            (map
+             (fn [key]
+               (let [[x y] (key-positions key)]
+                 [(.getCanonicalPath gb-button-mark)
+                  "-geometry" (str "+" x "+" y) "-composite"]))
+             move)
+            (.getCanonicalPath target-file)])]
+      (apply  clojure.java.shell/sh command))))
 
 (defn adv-composite-frames-command
   [move-image screenshot target]
diff -r c8cda378e1a0 -r 54644b08da1a clojure/com/aurellem/run/bootstrap_1.clj
--- a/clojure/com/aurellem/run/bootstrap_1.clj	Sun Sep 02 10:34:14 2012 -0500
+++ b/clojure/com/aurellem/run/bootstrap_1.clj	Sun Sep 02 14:28:53 2012 -0500
@@ -734,7 +734,7 @@
 (defn-memo go-to-mansion-for-the-lulz
   ([] (go-to-mansion-for-the-lulz (hacking-13)))
   ([script]
-     (let [lulz-delay 50]
+     (let [lulz-delay 70]
        (->> script
             close-menu
             close-menu
@@ -750,6 +750,7 @@
             (play-moves [[:a]])
             (do-nothing lulz-delay)
             (play-moves [[:a]])
+            (do-nothing lulz-delay)
             close-menu))))
 
 (defn-memo launch-bootstrap-program
diff -r c8cda378e1a0 -r 54644b08da1a clojure/com/aurellem/run/final_cut.clj
--- a/clojure/com/aurellem/run/final_cut.clj	Sun Sep 02 10:34:14 2012 -0500
+++ b/clojure/com/aurellem/run/final_cut.clj	Sun Sep 02 14:28:53 2012 -0500
@@ -135,8 +135,8 @@
 ;;      (.getCanonicalPath movie)) nil))
 
 (defn final-cut! [^File render-dir]
-  (let [movie (File. render-dir "final.ogg")
-        final-audio (File. render-dir "final.wav")
+  (let [movie (File. render-dir "final.avi")
+        final-audio (File. render-dir "final.mp3")
         final (File. render-dir "final")]
     (.delete movie)
     (.delete final-audio)
@@ -150,8 +150,8 @@
      "-i" (.getCanonicalPath final-audio)
      "-b:a" "128k"
      "-b:v" "9000k"
-     "-c:a" "libvorbis"
-     "-c:v" "libtheora"
+     "-c:a" "libmp3lame"
+     "-c:v" "mpeg4"
      "-r" "60"
      (.getCanonicalPath movie)) nil))
 
diff -r c8cda378e1a0 -r 54644b08da1a moves/advanced.vbm
Binary file moves/advanced.vbm has changed
diff -r c8cda378e1a0 -r 54644b08da1a save-states/advanced.sav
Binary file save-states/advanced.sav has changed