new file mode 100644

new file mode 100644

@@ -0,0 +1,36 @@

+from __future__ import print_function, division

+

+# from: http://roguebasin.roguelikedevelopment.org/index.php?title=Bresenham's_Line_Algorithm#Python

+

+def line(x0, y0, x1, y1, wd):

+	dx = abs(x1-x0); sx = 1 if x0 < x1 else -1

+	dy = abs(y1-y0); sy = 1 if y0 < y1 else -1

+	err = dx-dy

+	ed = 1 if dx + dy == 0 else (dx*dx + dy*dy)**0.5

+

+	e2 = x2 = y2 = 0

+

+	wd = (wd + 1) / 2.0

+	while True:

+		yield (x0,y0)

+		e2 = err; x2 = x0

+		if 2*e2 >= -dx:

+			e2 += dx

+			y2 = y0

+			while e2 < ed*wd and (y1 != y2 or dx > dy):

+				yield (x0, y2)

+				y2 += sy

+				e2 += dx

+			if x0 == x1: break

+			e2 = err

+			err -= dy

+			x0 += sx

+		if 2*e2 <= dy:

+			e2 = dx-e2

+			while e2 < ed*wd and (x1 != x2 or dx < dy):

+				yield (x2, y0)

+				x2 += sx

+				e2 += dy

+			if y0 == y1: break

+			err += dx

+			y0 += sy

@@ -10,10 +10,10 @@ from src import map

 class Application(object):

 	def __init__(self):

-		self.screen = console.Screen(200,125)

+		self.screen = console.Screen(100,63)

 		self.terrain_registry = map.TerrainRegistry()

 		self.terrain_registry.load_from_file('data/terrain.yml')

-		self.map = map.Map(200,125, self.terrain_registry)

+		self.map = map.Map(100,63, self.terrain_registry)

 		self.player = player.Player(4,5, self.map)

 		self.events = events.EventHandler()

 		player.ArrowHandler(self.player, self.events)

@@ -14,14 +14,15 @@ class EventHandler(object):

 			self.key, self.mouse

 		)

+		alt, shift, ctrl = self.key.lalt|self.key.ralt, self.key.shift, self.key.lctrl|self.key.rctrl

 		char = chr(self.key.c)

 		if char != '\x00' and char in self.cbs:

 			for cb in self.cbs[char]:

-				cb()

+				cb(alt,shift,ctrl)

 		elif self.key.vk in self.cbs:

 			for cb in self.cbs[self.key.vk]:

-				cb()

+				cb(alt,shift,ctrl)

@@ -1,6 +1,7 @@

 import numpy as np

 import libtcodpy as tc

 import yaml

+import libs.bresenham

 def squeeze(val, low, high):

 	return min(max(val, low), high)

@@ -45,12 +46,25 @@ class Map(object):

 	def move(self, object, dx,dy):

 		print self.overlays,

-		self.overlays[object.pos].remove(object)

-		ox,oy = object.pos

-		x = squeeze(ox+dx, 0, self.width-1)

-		y = squeeze(oy+dy, 0, self.height-1)

-		self.overlays.setdefault((x,y), []).append(object)

-		self.update_overlay(ox,oy)

+		if abs(dx) < 2 and abs(dy) < 2:

+			self.overlays[object.pos].remove(object)

+			ox,oy = object.pos

+			x = squeeze(ox+dx, 0, self.width-1)

+			y = squeeze(oy+dy, 0, self.height-1)

+			if not self.fov.is_passable((x,y)):

+				x,y = ox,oy

+

+			self.overlays.setdefault((x,y), []).append(object)

+			self.update_overlay(ox,oy)

+		else:

+			ox,oy = object.pos

+			tx,ty = ox+dx, oy+dy

+			gx,gy = ox,oy

+			for x,y in libs.bresenham.line(ox,oy, tx,ty):

+				if not self.fov.is_passable((x,y)): break

+				else: gx,gy = x,y

+			x,y = gx,gy

+

 		return x-ox, y-oy

 	def update_overlay(self, x=None, y=None):

@@ -29,16 +29,28 @@ class ArrowHandler(object):

 		eh.register(tc.KEY_RIGHT,self.right)

 		eh.register(tc.KEY_UP,self.up)

 		eh.register(tc.KEY_DOWN,self.down)

-	def left(self):

+	def left(self, alt, shift, ctrl):

 		print 'left'

-		self.player.move(-1, 0)

-	def right(self):

+		if alt:

+			self.player.move(-1, -1)

+		else:

+			self.player.move(-1, 0)

+	def right(self, alt, shift, ctrl):

 		print 'right'

-		self.player.move(1, 0)

-	def up(self):

+		if alt:

+			self.player.move(1, 1)

+		else:

+			self.player.move(1, 0)

+	def up(self, alt, shift, ctrl):

 		print 'up'

-		self.player.move(0, -1)

-	def down(self):

+		if alt:

+			self.player.move(1, -1)

+		else:

+			self.player.move(0, -1)

+	def down(self, alt, shift, ctrl):

 		print 'down'

-		self.player.move(0, 1)

+		if alt:

+			self.player.move(-1, 1)

+		else:

+			self.player.move(0, 1)