From e7e0afef070e3132ab0ec1833e2350463005598a Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Sat, 25 Feb 2012 14:12:15 +0100
Subject: [PATCH] Rename trajectory to longRange

---
 src/main/scala/model/Actor.scala | 10 +++++-----
 src/main/scala/model/Role.scala  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/model/Actor.scala b/src/main/scala/model/Actor.scala
index b94b4371bb..d09f90d358 100644
--- a/src/main/scala/model/Actor.scala
+++ b/src/main/scala/model/Actor.scala
@@ -11,7 +11,7 @@ case class Actor(piece: Piece, pos: Pos, board: Board) {
 
     case King                      ⇒ shortRange(King.dirs) ++ castle
 
-    case role if (role.trajectory) ⇒ trajectory(role.dirs)
+    case role if (role.longRange) ⇒ longRange(role.dirs)
 
     case role                      ⇒ shortRange(role.dirs)
   })
@@ -25,10 +25,10 @@ case class Actor(piece: Piece, pos: Pos, board: Board) {
   def dir: Direction = if (color == White) _.up else _.down
 
   def threatens(to: Pos): Boolean = enemies(to) && ((piece.role match {
-    case Pawn                      ⇒ dir(pos) map { next ⇒
+    case Pawn ⇒ dir(pos) map { next ⇒
       List(next.left, next.right) flatten
     } getOrElse Nil
-    case role if (role.trajectory) ⇒ trajectoryPoss(role.dirs)
+    case role if (role.longRange) ⇒ longRangePoss(role.dirs)
     case role                      ⇒ (role.dirs map { d ⇒ d(pos) }).flatten
   }) contains to)
 
@@ -49,7 +49,7 @@ case class Actor(piece: Piece, pos: Pos, board: Board) {
     } flatten
   } toMap
 
-  private def trajectory(dirs: Directions): Implications = {
+  private def longRange(dirs: Directions): Implications = {
 
     val moving = (to: Pos) ⇒ board.move(pos, to)
 
@@ -67,7 +67,7 @@ case class Actor(piece: Piece, pos: Pos, board: Board) {
     (dirs flatMap { dir ⇒ forward(pos, dir) }) toMap
   }
 
-  private def trajectoryPoss(dirs: Directions): List[Pos] = {
+  private def longRangePoss(dirs: Directions): List[Pos] = {
 
     def forward(p: Pos, dir: Direction): List[Pos] = dir(p) match {
       case None                        ⇒ Nil
diff --git a/src/main/scala/model/Role.scala b/src/main/scala/model/Role.scala
index b8ca9f562d..bd146ba5a1 100644
--- a/src/main/scala/model/Role.scala
+++ b/src/main/scala/model/Role.scala
@@ -6,7 +6,7 @@ import Pos._
 sealed trait Role {
   val forsyth: Char
   def dirs: List[Direction]
-  val trajectory = false
+  val longRange = false
 }
 case object King extends Role {
   val forsyth = 'k'
@@ -15,17 +15,17 @@ case object King extends Role {
 case object Queen extends Role {
   val forsyth = 'q'
   val dirs: List[Direction] = Rook.dirs ::: Bishop.dirs
-  override val trajectory = true
+  override val longRange = true
 }
 case object Rook extends Role {
   val forsyth = 'r'
   val dirs: List[Direction] = List(_.up, _.down, _.left, _.right)
-  override val trajectory = true
+  override val longRange = true
 }
 case object Bishop extends Role {
   val forsyth = 'b'
   val dirs: List[Direction] = List(_.upLeft, _.upRight, _.downLeft, _.downRight)
-  override val trajectory = true
+  override val longRange = true
 }
 case object Knight extends Role {
   val forsyth = 'n'