Make things a bit cleaner, possibly.

Map.py

@@ -36,11 +36,16 @@ def __init__(self, mapdict):
 
         groundimage = pygame.image.load(terrainfilepath).convert()
         groundarray = pygame.surfarray.pixels2d(groundimage)
-        if not all(color in terrain.colorlist(groundimage) for color in numpy.unique(groundarray)):
+        wronggroundcolours = numpy.setdiff1d(groundarray, terrain.colorlist(groundimage))
+        if wronggroundcolours.size:
+            print wronggroundcolours
             raise Exception("Unexpected value in "+terrainfilepath)
         collectablesimage = pygame.image.load(itemfilepath).convert()
         collectablesarray = pygame.surfarray.pixels2d(collectablesimage)
-        if not all(color in collectables.colorlist(collectablesimage) for color in numpy.unique(collectablesarray)):
+        collectablescolorsflat = pygame.surfarray.map_array(collectablesimage, numpy.array(collectables.mapcolor.keys()))
+        wrongcollectablecolors = numpy.setdiff1d(collectablesarray, collectablescolorsflat)
+        if wrongcollectablecolors.size:
+            print wrongcollectablecolors
             raise Exception("Unexpected value in "+itemfilepath)
         self.size = groundimage.get_rect().size
 

collectables.py

@@ -1,5 +1,3 @@
-import numpy
-import pygame.surfarray
 from colors import *
 
 NONE = 0
@@ -13,8 +11,6 @@
     BROWN:  CHOCOLATE,
     RED:    DYNAMITE
 }
-def colorlist(surface):
-    return [pygame.surfarray.map_array(surface, numpy.array([color])) for color in mapcolor.keys()]
 
 value = {
     NONE: 0,

terrain.py

@@ -24,7 +24,7 @@
 typeslist = types.tolist()
 
 def colorlist(surface):
-    return [pygame.surfarray.map_array(surface, numpy.array([type[0:3]])) for type in typeslist]
+    return pygame.surfarray.map_array(surface, types[['r','g','b']].view(numpy.uint8).reshape(-1, 3))
 def color_typeindex(surface):
     return zip(colorlist(surface), range(len(typeslist)))