separate images for targets and trampolines

js/Makefile

@@ -6,13 +6,24 @@ MAPS+=$(wildcard ../maps/contest?.map ../maps/contest10.map)
 MAPS+=$(wildcard ../maps/ems*.map)
 MAPS+=../maps/pacman.map ../maps/pacman2.map
 
-all: maps.js
+all: maps.js sprites.png
 
 maps.js: mapsToJson.js $(MAPS)
 	./mapsToJson.js $(MAPS) > maps.js
 
+SPRITES=earth.png empty.png lambda.png liftclosed.png liftopen.png robot.png rock.png wall.png
+SPRITES+=$(wildcard trampoline?.png)
+SPRITES+=$(wildcard target?.png)
+
+sprites.png: $(SPRITES)
+	convert -background "#000000" -append $(SPRITES) tmp_sprites.png
+	pngcrush -rem alla tmp_sprites.png tmp_sprites1.png
+	rm tmp_sprites.png
+	optipng -o9 tmp_sprites1.png
+	mv tmp_sprites1.png sprites.png
+
 clean:
-	rm -f maps.js
+	rm -f maps.js sprites.png
 
 .PHONY: all clean
 

js/gui.js

@@ -15,8 +15,8 @@ var mineGui_spriteOffset = {
 	'O': 4,
 	'.': 0,
 	' ': 1,
-	'A': 8,'B': 8,'C': 8,'D': 8,'E': 8,'F': 8,'G': 8,'H': 8,'I': 8,
-	'1': 9,'2': 9,'3': 9,'4': 9,'5': 9,'6': 9,'7': 9,'8': 9,'9': 9
+	'A': 8,'B': 9,'C':10,'D':11,'E':12,'F':13,'G':14,'H':15,'I':16,
+	'1':17,'2':18,'3':19,'4':20,'5':21,'6':22,'7':23,'8':24,'9':25
 };
 
 var mineGui_images = {};
@@ -214,7 +214,7 @@ function mineGui_show() {
 		
 		for (var y = 0; y < mineGui_mine.height; ++y) {
 			for (var x = 0; x < mineGui_mine.width; ++x) {
-				ctx.drawImage(sprites, mineGui_spriteOffset[map[y][x]] * 16, 0, 16, 16, 16*x, 16*y, 16, 16);
+				ctx.drawImage(sprites, 0, mineGui_spriteOffset[map[y][x]] * 16, 16, 16, 16*x, 16*y, 16, 16);
 			}
 		}
 		ctx.fillStyle = "#0000FF";