Support recent numpy versions

requirements.txt

@@ -0,0 +1,3 @@
+pygame
+numpy
+twisted

src/ai.py

@@ -1,4 +1,4 @@
-from numpy.oldnumeric import *
+from numpy import *
 from game import game
 
 class BaseAI:

src/battleplayer.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 
 import common
 import random

src/buildplayer.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 import common
 import random
 from copy import copy

src/common.py

@@ -1,8 +1,7 @@
-## Automatically adapted for numpy.oldnumeric Sep 27, 2009 by 
-
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+import numpy as np
+from numpy import *
 import os
 
 debug = False
@@ -82,7 +81,7 @@ def colorize(surface, color):
 	#pixel_array = pixel_array * color
 	#pixel_array /= 255
 	#pygame.surfarray.blit_array(surface, pixel_array)
-	col = array(color, UInt8)
+	col = array(color, np.uint8)
 	for line in pixel_array:
 		for pixel in line:
 			for i in (0,1,2):
@@ -99,7 +98,7 @@ def multiply_alpha(surface, factor):
 		surface = surface.convert()
 
 	alpha = pygame.surfarray.pixels_alpha(surface)
-	divide(alpha, array(factor).astype(UInt8), alpha)
+	divide(alpha, array(factor).astype(np.uint8), alpha)
 	#multiply(alpha, array(factor), alpha)
 	return surface
 

src/field.py

@@ -1,8 +1,7 @@
-## Automatically adapted for numpy.oldnumeric Sep 27, 2009 by 
-
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+import numpy as np
+from numpy import *
 from random import randint
 from twisted.spread import pb
 from copy import deepcopy
@@ -147,6 +146,9 @@ def create_basic_background():
 			return is_river_large
 
 		def scatter(source):
+                        return source
+                        # implementation unmaintained
+                        """
 			import numpy.oldnumeric.random_array as RandomArray
 			shift3d = RandomArray.randint(-2, 2, (2,) + source.shape)
 			shift = shift3d[1] * source.shape[1] + shift3d[0]
@@ -159,6 +161,7 @@ def scatter(source):
 			dest = take(source.ravel(), source_indices)
 			
 			return dest
+                        """
 
 		def colorize(source):
 			dest = zeros(source.shape + (3,))
@@ -273,11 +276,8 @@ def update_screen(old_secured, foreign_walls):
 			field_size = common.field_size[1]
 
 			# check which parts have changed
-			different = (old_secured != player.secured)
-			changed_fields = nonzero(different.ravel()).tolist()
-			changed_fields.reverse()
-			for index in changed_fields:
-				x, y = divmod(index, field_size)
+			changed_fields = np.argwhere(old_secured != player.secured)
+			for x, y in changed_fields:
 				# the screen has changed at x, y => update the screen
 				if not old_secured[x,y]:
 					screen_pos = (x*block_size, y*block_size)
@@ -322,7 +322,7 @@ def update_screen(old_secured, foreign_walls):
 
 		# eleminate other player's walls
 		foreign_walls = player.secured * (self.array >= 0) * (self.array != player.player_id)
-		putmask(self.array, foreign_walls, zeros(self.array.shape) + Field.EMPTY)
+		putmask(self.array, foreign_walls, zeros(self.array.shape, dtype=np.int64) + Field.EMPTY)
 
 		# now we know which areas are secured, so let's update the screen
 		update_screen(old_secured, foreign_walls)

src/game.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 from twisted.spread import pb
 
 import common

src/gamephases.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 
 import common
 from game import game

src/map.py

@@ -1,5 +1,5 @@
 from random import randint
-from numpy.oldnumeric import *
+from numpy import *
 from twisted.spread import pb
 from twisted.internet import reactor
 

src/placeplayer.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 
 import common
 from game import game

src/player.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 from twisted.spread import pb
 
 import common

src/selectplayer.py

@@ -1,6 +1,6 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+from numpy import *
 
 import common
 from game import game

src/widget.py

@@ -1,6 +1,7 @@
 import pygame
 from pygame.locals import *
-from numpy.oldnumeric import *
+import numpy as np
+from numpy import *
 import common
 from state import State, IgnoreEvent
 
@@ -63,7 +64,7 @@ def draw(self):
 				# Create 50% transparent surface
 				self.inactive_surface = self.normal_surface.convert_alpha()
 				alpha = pygame.surfarray.pixels_alpha(self.inactive_surface)
-				divide(alpha, array(2).astype(UInt8), alpha)
+				divide(alpha, array(2).astype(np.uint8), alpha)
 				del alpha
 			common.blit(self.inactive_surface, self.pos)
 			self.highlighted = False