fix line lengths

1 files changed, 41 insertions, 17 deletions

diff --git a/common/coords.lua b/common/coords.lua
index fc4aaa5..28579e6 100644
--- a/common/coords.lua
+++ b/common/coords.lua
@@ -37,7 +37,8 @@ function Hex.round(self)
 	-- return a new Hex rounded to integer coordinates
 	local fq,fr,fs = self.q,self.r,self.s
 	-- round all to nearest integer
-	-- find which was changed the most, reset that one to be coherent with the other two.
+	-- find which was changed the most, reset that one to be coherent
+	-- with the other two.
 	local abs = math.abs
 
 	local rq,rr,rs = round(fq),round(fr),round(fs)
@@ -79,16 +80,26 @@ function Hex.iter_neighbours(self,radius)
 	assert(radius > 0,"radius must be at least 1")
 	return coroutine.wrap(function()
 		for q = -radius,radius do
-			for r = math.max(-radius,-q-radius), math.min(radius,-q+radius) do
+			local rmin = math.max(-radius, -q-radius)
+			local rmax = math.min( radius, -q+radius)
+			for r = rmin, rmax do
 				coroutine.yield(self+Hex:make(q,r))
 			end
 		end
 	end)
 end
-function Hex.__add(self,other) return Hex:make(self.q+other.q, self.r+other.r, self.s+other.s) end
-function Hex.__sub(self,other) return Hex:make(self.q-other.q, self.r-other.r, self.s-other.s) end
-function Hex.__tostring(self) return string.format("H(%.2f,%.2f)",self.q,self.r) end
-function Hex.__eq(a,b) return a.q==b.q and a.r==b.r end
+function Hex.__add(self,other)
+	return Hex:make(self.q+other.q, self.r+other.r, self.s+other.s)
+end
+function Hex.__sub(self,other)
+	return Hex:make(self.q-other.q, self.r-other.r, self.s-other.s)
+end
+function Hex.__tostring(self)
+	return string.format("H(%.2f,%.2f)",self.q,self.r)
+end
+function Hex.__eq(a,b)
+	return a.q==b.q and a.r==b.r
+end
 
 Pos = class()
 function Pos.new(cls)
@@ -102,8 +113,12 @@ end
 function Pos.make(cls,...)
 	return cls:new():init(...)
 end
-function Pos.__add(self,other) return Pos:make(self.x+other.x,self.y+other.y) end
-function Pos.__sub(self,other) return Pos:make(self.x-other.x,self.y-other.y) end
+function Pos.__add(self,other)
+	return Pos:make(self.x+other.x,self.y+other.y)
+end
+function Pos.__sub(self,other)
+	return Pos:make(self.x-other.x,self.y-other.y)
+end
 function Pos.__mul(a,b)
 	if type(a) == "number" then
 		return Pos:make(a*b.x,a*b.y)
@@ -114,40 +129,49 @@ function Pos.__mul(a,b)
 	end
 end
 function Pos.__div(a,b)
-	assert(type(b) == "number","can only divide Pos by scalar, and can't divide scalar by Pos")
+	assert(type(b) == "number","can only divide Pos by scalar")
 	return a*(1/b)
 end
 function Pos.__eq(a,b) return a.x==b.x and a.y==b.y end
 function Pos.lensq(self) return self.x^2 + self.y^2 end
 function Pos.len(self) return math.sqrt(self:lensq()) end
 function Pos.norm(self) return self/self:len() end
-function Pos.dot(self,other) return self.x*other.x + self.y*other.y end
+function Pos.dot(self,other) return self.x*other.x+self.y*other.y end
 function Pos.to_hex(self,into)
 	into = into or Hex:new()
 	local q = self.x*(SR3/3) - self.y*(1/3)
 	local r = (2/3)*self.y
 	return into:init(q,r,-q-r)
 end
-function Pos.__tostring(self) return string.format("(%.2f,%.2f)",self.x,self.y) end
+function Pos.__tostring(self)
+	return string.format("(%.2f,%.2f)",self.x,self.y)
+end
 
 -- represents coordinates of a chunk
--- ie pair of integers. the chunk at spawn is C(0,0), the one to the right of that is C(1,0), etc
+-- the chunk at spawn is C(0,0), to the right of that is C(1,0), etc
 ChunkPos = class()
 function ChunkPos.make(cls,u,v)
 	return setmetatable({u=u,v=v},cls)
 end
-function ChunkPos.__add(self,other) return ChunkPos:make(self.u+other.u,self.v+other.v) end
-function ChunkPos.__sub(self,other) return ChunkPos:make(self.u-other.u,self.v-other.v) end
-function ChunkPos.__tostring(self) return string.format("C(%d,%d)",self.u,self.v) end
+function ChunkPos.__add(self,other)
+	return ChunkPos:make(self.u+other.u,self.v+other.v)
+end
+function ChunkPos.__sub(self,other)
+	return ChunkPos:make(self.u-other.u,self.v-other.v)
+end
+function ChunkPos.__tostring(self)
+	return string.format("C(%d,%d)",self.u,self.v)
+end
 function ChunkPos.__eq(a,b) return a.u==b.u and a.v==b.v end
 function ChunkPos.extents(self)
 	-- returns Hex of topleft and bottomright
 	local tlq,tlr = self.u*CHUNK_SIZE, self.v*CHUNK_SIZE
-	local brq,brr = (self.u+1)*CHUNK_SIZE -1, (self.v+1)*CHUNK_SIZE -1
+	local brq,brr = (self.u+1)*CHUNK_SIZE-1, (self.v+1)*CHUNK_SIZE-1
 	return Hex:make(tlq,tlr), Hex:make(brq,brr)
 end
 function ChunkPos.neighborhood(self)
-	-- return all chunkposes within the 3x3 square centered on self, including self
+	-- return all chunkposes within the 3x3 square centered on self,
+	-- including self
 	local out = {}
 	for du=-1,1 do
 		for dv = -1,1 do