- added various new transition tiles

- added factory and headquarters sprites

Author: p.witvoet

run server.bat

@@ -2,6 +2,6 @@ TITLE AI Wars - Server
 
 CD source
 
-run_server.py localhost 7777 test_level.py aiwars.py
+run_server.py localhost 7777 mirror_islands.py aiwars.py
 
 PAUSE

source/visualization/gameScreen.py

@@ -1,4 +1,5 @@
 import os
+import pygame
 from core.point import *
 from tilemap import *
 from spriteCollection import *
@@ -12,7 +13,16 @@ def __init__(self, game, imageCache, screenDimension):
 		self.screenDimension = screenDimension
 
 		self.cameraMouseOffset = Point(0, 0)
-		self.rightMouseButtonDown = False
+		self.cameraDragging = False
+		self.arrowKeyState = {pygame.constants.K_UP: False, \
+		                      pygame.constants.K_DOWN: False, \
+		                      pygame.constants.K_LEFT: False, \
+		                      pygame.constants.K_RIGHT: False}
+		self.arrowKeyMovement = {pygame.constants.K_UP: Point(0, 1), \
+		                        pygame.constants.K_DOWN: Point(0, -1), \
+		                        pygame.constants.K_LEFT: Point(1, 0), \
+		                        pygame.constants.K_RIGHT: Point(-1, 0)}
+		self.arrowKeyMovementSpeed = 32
 
 		self.drawGrid = True
 
@@ -27,34 +37,41 @@ def __init__(self, game, imageCache, screenDimension):
 	def onKeyDown(self, key):
 		if key == ord('g'):
 			self.drawGrid = not self.drawGrid
+		elif self.arrowKeyState.has_key(key):
+			self.arrowKeyState[key] = True
 	#
 
 	def onKeyUp(self, key):
-		pass
+		if self.arrowKeyState.has_key(key):
+			self.arrowKeyState[key] = False
 	#
 
 	def onMouseDown(self, button, position):
 		if button == 3: # Right mouse button, TODO: Look for pygame constants for this?
 			self.cameraMouseOffset.x = self.camera.x - position[0]
 			self.cameraMouseOffset.y = self.camera.y - position[1]
-			self.rightMouseButtonDown = True
+			self.cameraDragging = True
 	#
 
 	def onMouseUp(self, button, position):
 		if button == 3:
-			self.rightMouseButtonDown = False
+			self.cameraDragging = False
 	#
 
 	def onMouseMove(self, position):
-		if self.rightMouseButtonDown:
+		if self.cameraDragging:
 			self.camera.x = position[0] + self.cameraMouseOffset.x
 			self.camera.y = position[1] + self.cameraMouseOffset.y
 
 			self.clampCameraToLevel()
 	#
 
 	def update(self):
-		pass
+		if not self.cameraDragging:
+			for key in self.arrowKeyState.keys():
+				if self.arrowKeyState[key]:
+					self.camera += self.arrowKeyMovement[key] * self.arrowKeyMovementSpeed
+			self.clampCameraToLevel()
 	#
 
 	def draw(self, screen):

texture source/process.bat

@@ -2,9 +2,9 @@ REM to_tiles takes the following arguments: [output folder] [spritesheet] [type]
 REM This doesn't generate every single tile, but it surely speeds up things
 
 "../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "sea_river.png" 3 3,4 1 16 16
-"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "river_plains.png" 1 1,4 0,2,5 16 16
 "../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "road_plains.png" 5 4,5 0,1,2,3 16 16
-"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "bridge_river.png" 4 4,5 1 16 16
-"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "bridge_sea.png" 4 4,5 3 16 16
+"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "river_plains.png" 1 1,4 0,2,5 16 16
+"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "bridge_river.png" 4 1,4,5 1 16 16
+"../tools/to_tiles.py" "%~dp0\../textures/terrain/tiles/" "bridge_sea.png" 4 1,4,5 3 16 16
 
 PAUSE

textures/terrain/sprites/factory_1.png

@@ -29,4 +29,12 @@
 rules.setSpriteCount('City', 3, 5)
 rules.addRule('City', 'apartment_1.png', ( 0,  8, 16, 11))
 rules.addRule('City', 'apartment_2.png', ( 0,  5,  9, 15))
-rules.addRule('City', 'apartment_3.png', ( 0,  8, 10,  9))
+rules.addRule('City', 'apartment_3.png', ( 0,  8, 10,  9))
+
+# Base
+rules.setSpriteCount('Base', 1, 1)
+rules.addRule('Base', 'factory_1.png', ( 0,  0, 32, 32))
+
+# Headquarters
+rules.setSpriteCount('Headquarters', 1, 1)
+rules.addRule('Headquarters', 'headquarters_1.png', ( 0, 16, 32, 32))