Apple-2-SW/robotwar
1
0
Fork 0
mirror of https://github.com/richardharrington/robotwar.git synced 2024-05-28 23:41:31 +00:00
Code Issues Projects Releases Wiki Activity

more slight progress

Browse Source
This commit is contained in:
Richard Harrington 2013-08-30 02:11:58 -04:00
parent 0633ebab2a
commit dd0d06446e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/robotwar/robot.clj
View File

@ -1,5 +1,6 @@
(ns robotwar.robot
(:use [robotwar.constants])
(:use [robotwar.constants]
[clojure.pprint :only [pprint]])
(:require [robotwar.brain :as brain]
[robotwar.register :as register]
[robotwar.physics :as physics]))
@ -65,16 +66,17 @@
for Christ's sake."
[robot-idx {robots :robots :as world}]
(let [robot (get-in world [:robots robot-idx])
other-robots (concat (take robot-idx robots)
(drop (inc robot-idx) robots))
enemy-colliding-x? (fn [other-robot]
(< (Math/abs (- (:pos-x robot) (:pos-x other-robot)))
(* ROBOT-RADIUS 2)))
enemy-colliding-y? (fn [other-robot]
(< (Math/abs (- (:pos-y robot) (:pos-y other-robot)))
(* ROBOT-RADIUS 2)))
colliding-enemy-idxs-x (set (map :idx (filter enemy-colliding-x? other-robots)))
colliding-enemy-idxs-y (set (map :idx (filter enemy-colliding-y? other-robots)))
other-robot-idxs (filter #{robot-idx} (range (count robots)))
enemy-colliding-x? (fn [other-robot-idx]
(let [other-robot (get-in world [:robots other-robot-idx])]
(< (Math/abs (- (:pos-x robot) (:pos-x other-robot)))
(* ROBOT-RADIUS 2))))
enemy-colliding-y? (fn [other-robot-idx]
(let [other-robot (get-in world [:robots other-robot-idx])]
(< (Math/abs (- (:pos-y robot) (:pos-y other-robot)))
(* ROBOT-RADIUS 2))))
colliding-enemy-idxs-x (set (map :idx (filter enemy-colliding-x? other-robot-idxs)))
colliding-enemy-idxs-y (set (map :idx (filter enemy-colliding-y? other-robot-idxs)))
total-colliding-idxs-x (if (not-empty colliding-enemy-idxs-x)
(conj colliding-enemy-idxs-x robot-idx)
#{})
@ -91,6 +93,8 @@
(assoc rob :v-y 0)
rob))
new-robots-v-x)]
(pprint new-robots-v-y)
(println (count new-robots-v-y))
(assoc world :robots new-robots-v-y)))
(defn tick-robot