changeset 289:df9cad9909d2

Fixed missing delimiter in gb.moves; preparing to play with type effectiveness.
author Dylan Holmes <ocsenave@gmail.com>
date Thu, 29 Mar 2012 13:49:40 -0500
parents eec3e69500d9
children dc9a0060e7cb
files clojure/com/aurellem/gb/moves.clj clojure/com/aurellem/world/new_types.clj clojure/com/aurellem/world/practice.clj
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/gb/moves.clj	Thu Mar 29 13:31:31 2012 -0500
     1.2 +++ b/clojure/com/aurellem/gb/moves.clj	Thu Mar 29 13:49:40 2012 -0500
     1.3 @@ -7,11 +7,11 @@
     1.4  (def move-code->move-name ;; alternate name: moves
     1.5    ((comp vec cons)
     1.6     :end-of-moves
     1.7 -   (map format-name (hxc-move-names)))))
     1.8 +   (map format-name (hxc-move-names))))
     1.9  
    1.10  (def move-name->move-code ;; alternate name: move-id
    1.11    (zipmap
    1.12 -   move-names
    1.13 +   move-code->move-name
    1.14     (range)))
    1.15  
    1.16  (def move-name->move-pp
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/clojure/com/aurellem/world/new_types.clj	Thu Mar 29 13:49:40 2012 -0500
     2.3 @@ -0,0 +1,5 @@
     2.4 +(ns com.aurellem.world.new-types
     2.5 +  (:import (com.aurelem.gb.gb_driver))
     2.6 +  (:use (com.aurellem.gb hxc))
     2.7 +  )
     2.8 +  
     3.1 --- a/clojure/com/aurellem/world/practice.clj	Thu Mar 29 13:31:31 2012 -0500
     3.2 +++ b/clojure/com/aurellem/world/practice.clj	Thu Mar 29 13:49:40 2012 -0500
     3.3 @@ -1,6 +1,5 @@
     3.4  (ns com.aurellem.world.practice
     3.5   (:use (com.aurellem.gb saves util constants gb-driver vbm items assembly characters))
     3.6 - (:use (com.aurellem.run title))
     3.7   (:use (com.aurellem.exp pokemon))
     3.8   (:use (com.aurellem.exp item-bridge))
     3.9   (:import [com.aurellem.gb.gb_driver SaveState]))
    3.10 @@ -39,6 +38,7 @@
    3.11     ;(step [:r])
    3.12     ;(step [:r])
    3.13     ))
    3.14 +
    3.15  (defn state-inject
    3.16    "I have replaced the letter e with e-acute @ 0xC4E8."
    3.17    []
    3.18 @@ -80,8 +80,7 @@
    3.19         (range)
    3.20         (vec (memory state-1))
    3.21         (vec (memory state-2)))
    3.22 -   )
    3.23 -  )
    3.24 +   ))
    3.25  
    3.26  
    3.27