Apple-2-SW
/
robotwar
mirror of https://github.com/richardharrington/robotwar.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

implemented 'damage' to robots on collision 

although they don't die yet -- their capacity
for damage is infinite.

also, the damage is just one point per collision --
it's in no way proportional to kinetic energy yet.
This commit is contained in:
Richard Harrington 2013-09-02 20:45:57 -04:00
parent c03676d000
commit b7c1e689a6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/robotwar/robot.clj
View File

@ -92,17 +92,25 @@
(let [new-actor (case colliding
:x (assoc
actor
:damage (dec (:damage actor))
:v-x (:v-x target)
:pos-x (- (:pos-x target)
(Math/copySign min-dist dist-x)))
:y (assoc
actor
:damage (dec (:damage actor))
:v-y (:v-y target)
:pos-y (- (:pos-y target)
(Math/copySign min-dist dist-y))))
new-target (case colliding
:x (assoc target :v-x (:v-x actor))
:y (assoc target :v-y (:v-y actor)))]
:x (assoc
target
:damage (dec (:damage target))
:v-x (:v-x actor))
:y (assoc
target
:damage (dec (:damage target))
:v-y (:v-y actor)))]
{colliding (assoc robots actor-idx new-actor, target-idx new-target)})
{nil robots})))
@ -137,7 +145,9 @@
stops when it gets there, and doesn't get damaged or bounce),
then support for collision with other robots."
[{robot-idx :idx :as robot} world]
(if (<= (:damage robot) 0)
(if false
; replace this real damage line when we
; get robot death implemented correctly: (if (<= (:damage robot) 0)
world
(let [ticked-world (brain/tick-brain
robot