    :deep-water    {:name "Deep Water"
                    :image "tilesets/elite-command/terrains/deep-water.png"}})
 
+;; TODO: remove redundancy between state map and unit/can-capture flag (?)
 (def unit-state-maps
-  {:basic
+  {:move-attack
    {:start-state :start
     :built-state :done
     :states
-    {:start      {:move-unit    :moved-once
-                  :attack-unit  :done
-                  :repair-unit  :done
-                  :capture-base :done}
-     :moved-once {:attack-unit  :done
-                  :capture-base :done}
-     :done       {}}}})
+    {:start {:move-unit    :moved
+             :attack-unit  :done
+             :repair-unit  :done
+             :capture-base :done}
+     :moved {:attack-unit  :done
+             :capture-base :done}
+     :done  {}}}
+   ;; :free-attack-twice
+   ;; {:start-state :start
+   ;;  :built-state :done
+   ;;  :states
+   ;;  {:start              {:move-unit    :moved-1-attacked-0
+   ;;                        :attack-unit  :moved-0-attacked-1
+   ;;                        :repair-unit  :done}
+   ;;   :moved-0-attacked-1 {:attack-unit  :moved-0-attacked-2
+   ;;                        :move-unit    :moved-1-attacked-1}
+   ;;   :moved-0-attacked-2 {:move-unit    :done}
+   ;;   :moved-1-attacked-0 {:attack-unit  :moved-1-attacked-1}
+   ;;   :moved-1-attacked-1 {:attack-unit  :done}
+   ;;   :done               {}}}
+   })
 
+;; TODO: check how capturing armor works in Elite Command
+;; TODO: check how repair amount works in Elite Command
 (def units
   {:infantry {:name "Infantry"
               :cost 75

               :armor 8
               :capturing-armor 2
               :repair 1
               :state-map :basic
               :image "tilesets/elite-command/units/grenadier-COLOR.png"
               :terrain-effects
               {:plains    {:movement-cost 4 :attack-bonus 0  :armor-bonus 0}

              :armor 6
              :capturing-armor 2
              :repair 1
              :state-map :move-attack
              :image "tilesets/elite-command/units/infantry-COLOR.png"
              :terrain-effects
              {:plains    {:movement-cost 3 :attack-bonus 0 :armor-bonus 0}
