Mercurial > vba-clojure
diff clojure/com/aurellem/gb/items.clj @ 339:93e74ed34305
rewriting basic-writer assemly so that it is valid items
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Sun, 08 Apr 2012 03:00:51 -0500 |
parents | b7f682bb3090 |
children | 3b3cd62b6106 |
line wrap: on
line diff
1.1 --- a/clojure/com/aurellem/gb/items.clj Sat Apr 07 12:31:12 2012 -0500 1.2 +++ b/clojure/com/aurellem/gb/items.clj Sun Apr 08 03:00:51 2012 -0500 1.3 @@ -142,7 +142,7 @@ 1.4 0xEA :TM34 ;; bide 1.5 0xEB :TM35 ;; metronome 1.6 0xEC :TM36 ;; self destruct 1.7 - 0xED :TM37 ;; eggbomb 1.8 + 0xED :TM37 ;; egg bomb 1.9 0xEE :TM38 ;; fire blast 1.10 0xEF :TM39 ;; swift 1.11 0xF0 :TM40 ;; skull bash 1.12 @@ -167,9 +167,9 @@ 1.13 (zipmap (vals item-code->item-name) 1.14 (keys item-code->item-name))) 1.15 1.16 -(defn inventory [^SaveState state] 1.17 - (let [items (item-list state)] 1.18 - (map 1.19 +(defn raw-inventory->inventory 1.20 + [raw-inventory] 1.21 + (map 1.22 (fn [[item-code quantity]] 1.23 [(item-code->item-name 1.24 item-code 1.25 @@ -177,7 +177,12 @@ 1.26 quantity]) 1.27 (partition 1.28 2 1.29 - (next (take-while (partial not= 255) items)))))) 1.30 + raw-inventory))) 1.31 + 1.32 +(defn inventory [^SaveState state] 1.33 + (let [items (item-list state)] 1.34 + (raw-inventory->inventory 1.35 + (next (take-while (partial not= 255) items))))) 1.36 1.37 (defn print-inventory 1.38 ([] (print-inventory @current-state))