Mercurial > vba-clojure
changeset 250:b7f682bb3090
updated title and save_corruption to work with all the recent updates
| author | Robert McIntyre <rlm@mit.edu> |
|---|---|
| date | Mon, 26 Mar 2012 03:49:33 -0500 |
| parents | e94d20ad853e |
| children | 40b5bff9576c |
| files | clojure/com/aurellem/exp/item_bridge.clj clojure/com/aurellem/gb/items.clj clojure/com/aurellem/gb/vbm.clj clojure/com/aurellem/run/bootstrap_0.clj clojure/com/aurellem/run/save_corruption.clj clojure/com/aurellem/run/title.clj moves/title-checkpoint.vbm save-states/title-checkpoint.sav |
| diffstat | 8 files changed, 327 insertions(+), 288 deletions(-) [+] |
line wrap: on
line diff
1.1 --- a/clojure/com/aurellem/exp/item_bridge.clj Mon Mar 26 03:09:26 2012 -0500 1.2 +++ b/clojure/com/aurellem/exp/item_bridge.clj Mon Mar 26 03:49:33 2012 -0500 1.3 @@ -95,8 +95,7 @@ 1.4 ;; playable. 1.5 [[] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 1.6 [] [] [] [] [] [] [] [] [] [] [:select] [:restart]]) 1.7 - (play-moves 1.8 - (first (title))) 1.9 + (title) 1.10 (advance [] [:start]) 1.11 (advance [] [:a]) 1.12 (advance [:a] [:a :start]))) 1.13 @@ -115,7 +114,7 @@ 1.14 (read-state "corrupt-mid-game")) 1.15 1.16 (defn gen-start-game-corrupt [] 1.17 - (->> (finish-title) 1.18 + (->> (second (intro)) 1.19 (advance [:b] [:a :b :start]) 1.20 (play-moves (corrupt-moves)))) 1.21
2.1 --- a/clojure/com/aurellem/gb/items.clj Mon Mar 26 03:09:26 2012 -0500 2.2 +++ b/clojure/com/aurellem/gb/items.clj Mon Mar 26 03:49:33 2012 -0500 2.3 @@ -228,3 +228,5 @@ 2.4 ([^SaveState state] 2.5 (set-inventory state [])) 2.6 ([] (clear-inventory @current-state))) 2.7 + 2.8 +
3.1 --- a/clojure/com/aurellem/gb/vbm.clj Mon Mar 26 03:09:26 2012 -0500 3.2 +++ b/clojure/com/aurellem/gb/vbm.clj Mon Mar 26 03:49:33 2012 -0500 3.3 @@ -6,7 +6,7 @@ 3.4 ;;;;;;;;;;;;; read vbm file 3.5 3.6 (def ^:dynamic *moves-cache* 3.7 - (File. user-home "proj/pokemon-escape/moves/")) 3.8 + (File. user-home "proj/vba-clojure/moves/")) 3.9 3.10 (defn buttons [mask] 3.11 (loop [buttons [] 3.12 @@ -60,11 +60,11 @@ 3.13 (recur (conj fixed mask) (drop 3 pending)) 3.14 (recur (conj fixed mask) (next pending))))))) 3.15 3.16 -(defn moves->filename [frame] 3.17 - (File. *moves-cache* (format "%07d.vbm" frame))) 3.18 +(defn moves-filename [name] 3.19 + (File. *moves-cache* (format "%s.vbm" name))) 3.20 3.21 -(defn read-moves [frame] 3.22 - (let [target (moves->filename frame)] 3.23 +(defn read-moves [name] 3.24 + (let [target (moves-filename name)] 3.25 (if (.exists target) 3.26 (vbm-buttons target)))) 3.27 ;;;;;;;;;;;;;; write moves to vbm file 3.28 @@ -106,8 +106,8 @@ 3.29 vbm-trailer))] 3.30 contents)) 3.31 3.32 -(defn write-moves! [moves] 3.33 - (let [target (moves->filename (count moves))] 3.34 +(defn write-moves! [moves name] 3.35 + (let [target (moves-filename name)] 3.36 (clojure.java.io/copy (buttons->vbm-bytes moves) target) 3.37 target)) 3.38
4.1 --- a/clojure/com/aurellem/run/bootstrap_0.clj Mon Mar 26 03:09:26 2012 -0500 4.2 +++ b/clojure/com/aurellem/run/bootstrap_0.clj Mon Mar 26 03:49:33 2012 -0500 4.3 @@ -1,9 +1,10 @@ 4.4 (ns com.aurellem.run.bootstrap-0 4.5 (:use (com.aurellem.gb gb-driver vbm)) 4.6 - (:use (com.aurellem.run title save-corruption))) 4.7 + (:use (com.aurellem.run title save-corruption)) 4.8 + (:use (com.aurellem.exp item-bridge))) 4.9 4.10 4.11 -(defn-memo boot-0 [] 4.12 +(defn-memo boot-root [] 4.13 [(root) []]) 4.14 4.15
5.1 --- a/clojure/com/aurellem/run/save_corruption.clj Mon Mar 26 03:09:26 2012 -0500 5.2 +++ b/clojure/com/aurellem/run/save_corruption.clj Mon Mar 26 03:49:33 2012 -0500 5.3 @@ -4,219 +4,243 @@ 5.4 5.5 (use 'clojure.repl) 5.6 5.7 -(defn-memo start-walking [] 5.8 - (->> (finish-title) 5.9 - (advance [:b] [:b :r]))) 5.10 +(defn-memo start-walking 5.11 + ([script] 5.12 + (->> script 5.13 + (advance [:b] [:b :r]))) 5.14 + ([] (start-walking (finish-title)))) 5.15 5.16 (def walk (partial advance [])) 5.17 5.18 -(defn-memo walk-to-stairs [] 5.19 - (->> (start-walking) 5.20 - (walk [:u]) 5.21 - (walk [:u]) 5.22 - (walk [:u]) 5.23 - (walk [:u]) 5.24 - (walk [:u]) 5.25 - (walk [:r]) 5.26 - (walk [:r]) 5.27 - (walk [:r]))) 5.28 +(defn-memo walk-to-stairs 5.29 + ([] (walk-to-stairs (start-walking))) 5.30 + ([script] 5.31 + (->> script 5.32 + (walk [:u]) 5.33 + (walk [:u]) 5.34 + (walk [:u]) 5.35 + (walk [:u]) 5.36 + (walk [:u]) 5.37 + (walk [:r]) 5.38 + (walk [:r]) 5.39 + (walk [:r])))) 5.40 5.41 -(defn-memo walk-to-door [] 5.42 - (->> (walk-to-stairs) 5.43 - (walk [:d]) 5.44 - (walk [:d]) 5.45 - (walk [:d]) 5.46 - (walk [:d]) 5.47 - (walk [:d]) 5.48 - (walk [:d]) 5.49 - (walk [:l]) 5.50 - (walk [:l]) 5.51 - (walk [:l]) 5.52 - (walk [:l]))) 5.53 - 5.54 +(defn-memo walk-to-door 5.55 + ([] (walk-to-door (walk-to-stairs))) 5.56 + ([script] 5.57 + (->> script 5.58 + (walk [:d]) 5.59 + (walk [:d]) 5.60 + (walk [:d]) 5.61 + (walk [:d]) 5.62 + (walk [:d]) 5.63 + (walk [:d]) 5.64 + (walk [:l]) 5.65 + (walk [:l]) 5.66 + (walk [:l]) 5.67 + (walk [:l])))) 5.68 5.69 -(defn-memo activate-menu [] 5.70 - (->> (walk-to-door) 5.71 - (advance [:b] [:a :b :start]))) 5.72 +(defn-memo activate-menu 5.73 + ([] (activate-menu (walk-to-door))) 5.74 + ([script] 5.75 + (->> script 5.76 + (advance [:b] [:a :b :start])))) 5.77 5.78 -(defn-memo save-game [] 5.79 - (->> (activate-menu) 5.80 - (advance [] [:d]) 5.81 - (play-moves [[] [] [] [:d] [] [] [] [:d] [] [] [:a]]) 5.82 - scroll-text)) 5.83 +(defn-memo save-game 5.84 + ([] (save-game (activate-menu))) 5.85 + ([script] 5.86 + (->> script 5.87 + (advance [] [:d]) 5.88 + (play-moves [[] [] [] [:d] [] [] [] [:d] [] [] [:a]]) 5.89 + scroll-text))) 5.90 5.91 -(defn-memo corrupt-save [] 5.92 - (->> (save-game) 5.93 - (play-moves 5.94 - ;; this section is copied from speedrun-2942 5.95 - ;; and corrupts the save so that the end-of-list marker 5.96 - ;; for the pokemon roster is destroyed, but the save is still 5.97 - ;; playable. 5.98 - [[] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.99 - [] [] [] [] [] [] [] [] [] [] [:select] [:restart]]))) 5.100 +(defn-memo corrupt-save 5.101 + ([] (corrupt-save (save-game))) 5.102 + ([script] 5.103 + (->> 5.104 + script 5.105 + (play-moves 5.106 + ;; this section is copied from speedrun-2942 and corrupts 5.107 + ;; the save so that the end-of-list marker for the pokemon 5.108 + ;; roster is destroyed, but the save is still playable. 5.109 + [[] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.110 + [] [] [] [] [] [] [] [] [] [] [] [:select] [:restart]])))) 5.111 5.112 -(defn-memo skip-title-again [] 5.113 - (->> (corrupt-save) 5.114 - (play-moves 5.115 - (first (title))))) 5.116 +(defn-memo start-game 5.117 + ([] (start-game (corrupt-save))) 5.118 + ([script] 5.119 + (->> script 5.120 + (title) 5.121 + (advance [] [:start]) 5.122 + (advance [] [:a]) 5.123 + (advance [:a] [:a :start])))) 5.124 5.125 -(defn-memo start-game [] 5.126 - (->> (skip-title-again) 5.127 - (advance [] [:start]) 5.128 - (advance [] [:a]) 5.129 - (advance [:a] [:a :start]))) 5.130 - 5.131 -(defn-memo destroy-item-end-of-list-marker [] 5.132 - (->> (start-game) 5.133 - (play-moves 5.134 - [ 5.135 - [:start] [] [] [] [] [] [] [] [] [] [] [] 5.136 - [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.137 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] 5.138 - [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] [] [] [] [] [] [] [] 5.139 - [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.140 - [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] 5.141 - [] [] [:d] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.142 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.143 - [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [:a] [] [] [:d] 5.144 - [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [:u] [] [] 5.145 - [] [] [:u] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.146 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.147 - [] [] [] [] [] [] [] [] [] [] [] 5.148 - 5.149 - ;; [:b] [] [] [] [] [] [] [] [] 5.150 - ;; [] [] [] [] [] [] [] [] [] [] [] [] [] [] [][][][][] [] [] 5.151 - ;; [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [:a] [] [] 5.152 - ;; [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [:d] [] 5.153 - ]))) 5.154 - 5.155 - 5.156 +(defn-memo destroy-item-end-of-list-marker 5.157 + ([] (destroy-item-end-of-list-marker (start-game))) 5.158 + ([script] 5.159 + (->> 5.160 + script 5.161 + (play-moves 5.162 + [[:start] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.163 + [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.164 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.165 + [] [] [:d] [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] 5.166 + [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [] 5.167 + [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.168 + [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.169 + [:d] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.170 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.171 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] 5.172 + [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] [] [] [] 5.173 + [] [] [] [] [] [] [] [] [:u] [] [] [] [] [:u] [] [] 5.174 + [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.175 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.176 + [] [] [] [] [] [] [] [] [] [] [] []])))) 5.177 5.178 (defn warp-to-elite-four 5.179 - "This is copied from speedrun-2942 to ensure that everything is good 5.180 - up to this point." 5.181 + "This is copied from speedrun-2942 to ensure that 5.182 + everything is good up to this point." 5.183 [] 5.184 (->> (corrupt-save) 5.185 (play-moves 5.186 - [ [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.187 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.188 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.189 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.190 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.191 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.192 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.193 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.194 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.195 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.196 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.197 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.198 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.199 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.200 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.201 - [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.202 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.203 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.204 - [] [] [] [] [] [] [:start] [] [] [] [] [] [] [] [] [] [] [] [] 5.205 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.206 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.207 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.208 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.209 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.210 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.211 - [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.212 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.213 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.214 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.215 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.216 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.217 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.218 - [] [] [] [] [] [] [] [] [] [:start] [] [] [] [] [] [] [] [] [] 5.219 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.220 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] 5.221 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.222 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.223 - [] [] [] [] [] [] [] [:start] [] [] [] [] [] [] [] [] [] [] [] 5.224 - [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.225 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] 5.226 - [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] [] [] [] [] [] [] [] 5.227 - [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.228 - [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] 5.229 - [] [] [:d] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.230 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.231 - [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [:a] [] [] [:d] 5.232 - [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [:u] [] [] 5.233 - [] [] [:u] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.234 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.235 - [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] [] [] [] 5.236 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.237 - [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [:a] [] [] 5.238 - [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [:d] [] 5.239 - [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.240 - [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] 5.241 - [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] 5.242 - [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] 5.243 - [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] 5.244 - [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] 5.245 - [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] 5.246 - [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.247 - [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] 5.248 - [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] [] 5.249 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:select] [] [] 5.250 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.251 - [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] [] [] [] [] 5.252 - [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [] 5.253 - [] [:b] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.254 - [] [] [] [:select] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.255 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.256 - [:b] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] 5.257 - [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] [] [] [] [] [] 5.258 - [] [] [] [] [] [:d] [] [] [] [] [:b] [] [] [] [] [] [] [] [] 5.259 - [] [] [] [] [] [] [] [] [:select] [] [] [] [] [] [] [] [] [] 5.260 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] 5.261 - [] [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [] 5.262 - [:d] [] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] 5.263 - [] [] [] [:d] [] [] [] [] [] [] [] [] [] [] [] [:select] [] [] 5.264 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.265 - [] [] [] [] [] [] [] [] [] [:a] [] [] [:d] [] [] [:a] [:u] [] 5.266 - [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.267 - [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.268 - [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.269 - [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.270 - [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.271 - [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.272 - [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.273 - [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.274 - [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [:a] [] [] [] [] 5.275 - [] [:a] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.276 - [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.277 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] 5.278 - [] [] [] [:b] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.279 - [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.280 - [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.281 - [:d] [:d] [:d] [:d] [:d] [:d] [:d] [] [] [] [] [] [] [] [] [] 5.282 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.283 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.284 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.285 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.286 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.287 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.288 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.289 - [:a] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] 5.290 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.291 - [:a] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] 5.292 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.293 - [:a] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] 5.294 - [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.295 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] 5.296 - [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.297 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] 5.298 - [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.299 - [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.300 - [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] 5.301 - [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.302 - [] [] [] [:b]]))) 5.303 - 5.304 - 5.305 - 5.306 - 5.307 - 5.308 + [ [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.309 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.310 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.311 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.312 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.313 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.314 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.315 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.316 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.317 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.318 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.319 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.320 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.321 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.322 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.323 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.324 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.325 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.326 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] 5.327 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.328 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.329 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.330 + [] [] [] [] [] [] [] [] [:start] [] [] [] [] [] [] 5.331 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.332 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.333 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.334 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.335 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.336 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.337 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.338 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.339 + [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.340 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.341 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.342 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.343 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.344 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.345 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.346 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.347 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.348 + [:start] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.349 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.350 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.351 + [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.352 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.353 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.354 + [:start] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.355 + [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.356 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.357 + [] [] [:d] [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] 5.358 + [] [] [] [] [] [] [] [] [] [] [] [:d] [] [] [] [] 5.359 + [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.360 + [:d] [] [] [] [] [:d] [] [] [] [] [:d] [] [] [] [] 5.361 + [:d] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.362 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.363 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] 5.364 + [] [] [] [:a] [] [] [:d] [] [] [:a] [] [] [] [] [] 5.365 + [] [] [] [] [] [] [] [] [:u] [] [] [] [] [:u] [] [] 5.366 + [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.367 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.368 + [] [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] 5.369 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.370 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.371 + [] [] [] [] [:d] [] [] [:a] [] [] [] [] [] [] [] [] 5.372 + [] [] [] [] [] [] [] [:d] [] [] [] [:d] [] [] [] 5.373 + [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] 5.374 + [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.375 + [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] 5.376 + [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] 5.377 + [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] 5.378 + [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.379 + [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] 5.380 + [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] 5.381 + [:d] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] 5.382 + [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.383 + [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] [] [] 5.384 + [] [] [] [] [] [] [] [] [] [:b] [] [] [] [] [] [] [] 5.385 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:select] 5.386 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.387 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] 5.388 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.389 + [] [] [] [] [:d] [] [] [] [] [] [] [] [] [:b] [] [] 5.390 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.391 + [] [] [:select] [] [] [] [] [] [] [] [] [] [] [] [] 5.392 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.393 + [] [] [] [] [] [:b] [] [] [] [] [] [] [] [] [] [] [] 5.394 + [] [] [] [] [:d] [] [] [] [] [] [] [] [] [] [] [] 5.395 + [:b] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.396 + [:d] [] [] [] [] [:b] [] [] [] [] [] [] [] [] [] [] 5.397 + [] [] [] [] [] [] [:select] [] [] [] [] [] [] [] [] 5.398 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] 5.399 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:d] 5.400 + [] [] [] [] [] [] [] [:d] [] [] [] [] [] [] [] [:d] 5.401 + [] [] [] [] [] [] [:d] [] [] [] [] [] [] [:d] [] [] 5.402 + [] [] [] [] [] [] [] [] [] [:select] [] [] [] [] [] 5.403 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.404 + [] [] [] [] [] [] [] [] [] [] [:a] [] [] [:d] [] [] 5.405 + [:a] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.406 + [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.407 + [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.408 + [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.409 + [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.410 + [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.411 + [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.412 + [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.413 + [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] 5.414 + [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] [] [:u] 5.415 + [] [:u] [] [:u] [:a] [] [] [] [] [] [:a] [] [] [] 5.416 + [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.417 + [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.418 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:b] [] [] 5.419 + [] [] [] [] [] [] [:b] [:d] [:d] [:d] [:d] [:d] [:d] 5.420 + [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.421 + [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.422 + [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] [:d] 5.423 + [:d] [:d] [:d] [:d] [] [] [] [] [] [] [] [] [] [] [] 5.424 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.425 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.426 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.427 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.428 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.429 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.430 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.431 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.432 + [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] 5.433 + [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.434 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] 5.435 + [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] 5.436 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.437 + [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] 5.438 + [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.439 + [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.440 + [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] [] [] 5.441 + [] [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] 5.442 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [:a] 5.443 + [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] 5.444 + [] [] [] [] [] [] [] [] [] [] [] [] [:a] [] [] [] [] 5.445 + [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.446 + [] [] [] [] [] [:a] [] [] [] [] [] [] [] [] [] [] [] 5.447 + [] [:a] [] [] [] [] [] [] [] [] [] [] [] [] [] [] 5.448 + [:b]])))
6.1 --- a/clojure/com/aurellem/run/title.clj Mon Mar 26 03:09:26 2012 -0500 6.2 +++ b/clojure/com/aurellem/run/title.clj Mon Mar 26 03:49:33 2012 -0500 6.3 @@ -25,91 +25,104 @@ 6.4 6.5 (defn start [] [[] (root)]) 6.6 6.7 -(defn-memo title [] 6.8 - (->> (start) 6.9 - (advance [] [:a]) 6.10 - (advance [] [:start]) 6.11 - (advance [] [:a]) 6.12 - (advance [] [:start]))) 6.13 +(defn-memo title 6.14 + ([] (title (start))) 6.15 + ([script] 6.16 + (->> script 6.17 + (advance [] [:a]) 6.18 + (advance [] [:start]) 6.19 + (advance [] [:a]) 6.20 + (advance [] [:start])))) 6.21 6.22 -(defn-memo oak [] 6.23 - (->> (title) 6.24 - scroll-text 6.25 - scroll-text 6.26 - scroll-text 6.27 - scroll-text 6.28 - scroll-text 6.29 - scroll-text 6.30 - scroll-text 6.31 - scroll-text 6.32 - scroll-text 6.33 - scroll-text 6.34 - scroll-text 6.35 - scroll-text 6.36 - scroll-text 6.37 - )) 6.38 +(defn-memo oak 6.39 + ([] (oak (title))) 6.40 + ([script] 6.41 + (->> script 6.42 + scroll-text 6.43 + scroll-text 6.44 + scroll-text 6.45 + scroll-text 6.46 + scroll-text 6.47 + scroll-text 6.48 + scroll-text 6.49 + scroll-text 6.50 + scroll-text 6.51 + scroll-text 6.52 + scroll-text 6.53 + scroll-text 6.54 + scroll-text))) 6.55 6.56 -(defn-memo name-entry-rlm [] 6.57 - (->> (oak) 6.58 - (advance [] [:a]) 6.59 - (advance [] [:r] DE) 6.60 - (play-moves 6.61 - [[] 6.62 - [:r] [] [:r] [] [:r] [] [:r] [] 6.63 - [:r] [] [:r] [] [:r] [] [:d] [:a] 6.64 - [:l] [] [:l] [] [:l] [] [:l] [] 6.65 - [:l] [] [:l] [:a] [] [:r] [:a] 6.66 - [:r] [] [:r] [] [:r] [] [:r] [] 6.67 - [:r] [] [:d] [] [:d] [] [:d] [:a] 6.68 - ]))) 6.69 +(defn-memo name-entry-rlm 6.70 + ([] (name-entry-rlm (oak))) 6.71 + ([script] 6.72 + (->> script 6.73 + (advance [] [:a]) 6.74 + (advance [] [:r] DE) 6.75 + (play-moves 6.76 + [[] 6.77 + [:r] [] [:r] [] [:r] [] [:r] [] 6.78 + [:r] [] [:r] [] [:r] [] [:d] [:a] 6.79 + [:l] [] [:l] [] [:l] [] [:l] [] 6.80 + [:l] [] [:l] [:a] [] [:r] [:a] 6.81 + [:r] [] [:r] [] [:r] [] [:r] [] 6.82 + [:r] [] [:d] [] [:d] [] [:d] [:a]])))) 6.83 6.84 -(defn-memo name-entry-ash [] 6.85 - (->> (oak) 6.86 - (advance [] [:d]) 6.87 - (advance [] [:d]) 6.88 - (advance [] [:a]))) 6.89 +(defn-memo name-entry-ash 6.90 + ([] (name-entry-ash (oak))) 6.91 + ([script] 6.92 + (->> script 6.93 + (advance [] [:d]) 6.94 + (advance [] [:d]) 6.95 + (advance [] [:a])))) 6.96 6.97 -(defn-memo rival-name-entry-gary [] 6.98 - (->> (name-entry-ash) 6.99 - scroll-text 6.100 - scroll-text 6.101 - scroll-text 6.102 - scroll-text 6.103 - scroll-text 6.104 - (advance [] [:d]) 6.105 - (advance [] [:d]) 6.106 - (advance [] [:a]))) 6.107 +(defn-memo rival-name-entry-gary 6.108 + ([] (rival-name-entry-gary (name-entry-ash))) 6.109 + ([script] 6.110 + (->> script 6.111 + scroll-text 6.112 + scroll-text 6.113 + scroll-text 6.114 + scroll-text 6.115 + scroll-text 6.116 + (advance [] [:d]) 6.117 + (advance [] [:d]) 6.118 + (advance [] [:a])))) 6.119 + 6.120 +(defn-memo rival-name-entry-blue 6.121 + ([] (rival-name-entry-blue (name-entry-ash))) 6.122 + ([script] 6.123 + (->> script 6.124 + scroll-text 6.125 + scroll-text 6.126 + scroll-text 6.127 + scroll-text 6.128 + scroll-text 6.129 + (advance [] [:d]) 6.130 + (advance [] [:a])))) 6.131 6.132 -(defn-memo rival-name-entry-blue [] 6.133 - (->> (name-entry-ash) 6.134 - scroll-text 6.135 - scroll-text 6.136 - scroll-text 6.137 - scroll-text 6.138 - scroll-text 6.139 - (advance [] [:d]) 6.140 - (advance [] [:a]))) 6.141 +(defn-memo finish-title 6.142 + ([] (finish-title (rival-name-entry-blue))) 6.143 + ([script] 6.144 + (->> script 6.145 + scroll-text 6.146 + scroll-text 6.147 + scroll-text 6.148 + scroll-text 6.149 + scroll-text 6.150 + scroll-text 6.151 + scroll-text))) 6.152 6.153 -(defn-memo finish-title [] 6.154 - (->> (rival-name-entry-blue) 6.155 - scroll-text 6.156 - scroll-text 6.157 - scroll-text 6.158 - scroll-text 6.159 - scroll-text 6.160 - scroll-text 6.161 - scroll-text)) 6.162 - 6.163 -(def title-frames 2323) 6.164 +(def title-frames 2194) 6.165 6.166 (defn title-checkpoint! [] 6.167 (let [[moves state] (finish-title)] 6.168 - (assert (= title-frames (:frame state))) 6.169 - [(write-moves! moves) (write-state! state)])) 6.170 + (assert (= title-frames (count moves))) 6.171 + [(write-moves! moves "title-checkpoint") 6.172 + (write-state! state "title-checkpoint")])) 6.173 6.174 (defn intro [] 6.175 - [(read-moves title-frames) 6.176 - (read-state title-frames)]) 6.177 + [(read-moves "title-checkpoint") 6.178 + (read-state "title-checkpoint")]) 6.179 6.180 (defn test-intro [] 6.181 (play-vbm (moves->filename title-frames)))
7.1 Binary file moves/title-checkpoint.vbm has changed
8.1 Binary file save-states/title-checkpoint.sav has changed