diff --git a/js/Makefile b/js/Makefile index d55a57e..c44e263 100644 --- a/js/Makefile +++ b/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 diff --git a/js/gui.js b/js/gui.js index 6792f97..219930c 100644 --- a/js/gui.js +++ b/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"; diff --git a/js/sprites.png b/js/sprites.png index 6fd4079..6376bcf 100644 Binary files a/js/sprites.png and b/js/sprites.png differ diff --git a/js/target1.png b/js/target1.png new file mode 100644 index 0000000..7ec94d8 Binary files /dev/null and b/js/target1.png differ diff --git a/js/target2.png b/js/target2.png new file mode 100644 index 0000000..1963d68 Binary files /dev/null and b/js/target2.png differ diff --git a/js/target3.png b/js/target3.png new file mode 100644 index 0000000..a1a3994 Binary files /dev/null and b/js/target3.png differ diff --git a/js/target4.png b/js/target4.png new file mode 100644 index 0000000..c230516 Binary files /dev/null and b/js/target4.png differ diff --git a/js/target5.png b/js/target5.png new file mode 100644 index 0000000..3d1aaee Binary files /dev/null and b/js/target5.png differ diff --git a/js/target6.png b/js/target6.png new file mode 100644 index 0000000..9ccd7b5 Binary files /dev/null and b/js/target6.png differ diff --git a/js/target7.png b/js/target7.png new file mode 100644 index 0000000..e9c1d1d Binary files /dev/null and b/js/target7.png differ diff --git a/js/target8.png b/js/target8.png new file mode 100644 index 0000000..8b1672e Binary files /dev/null and b/js/target8.png differ diff --git a/js/target9.png b/js/target9.png new file mode 100644 index 0000000..1c46242 Binary files /dev/null and b/js/target9.png differ diff --git a/js/trampolineA.png b/js/trampolineA.png new file mode 100644 index 0000000..96a0c05 Binary files /dev/null and b/js/trampolineA.png differ diff --git a/js/trampolineB.png b/js/trampolineB.png new file mode 100644 index 0000000..5565ecc Binary files /dev/null and b/js/trampolineB.png differ diff --git a/js/trampolineC.png b/js/trampolineC.png new file mode 100644 index 0000000..4d15be8 Binary files /dev/null and b/js/trampolineC.png differ diff --git a/js/trampolineD.png b/js/trampolineD.png new file mode 100644 index 0000000..bf9513a Binary files /dev/null and b/js/trampolineD.png differ diff --git a/js/trampolineE.png b/js/trampolineE.png new file mode 100644 index 0000000..5cf8b09 Binary files /dev/null and b/js/trampolineE.png differ diff --git a/js/trampolineF.png b/js/trampolineF.png new file mode 100644 index 0000000..2981613 Binary files /dev/null and b/js/trampolineF.png differ diff --git a/js/trampolineG.png b/js/trampolineG.png new file mode 100644 index 0000000..6f06be1 Binary files /dev/null and b/js/trampolineG.png differ diff --git a/js/trampolineH.png b/js/trampolineH.png new file mode 100644 index 0000000..a20e0f0 Binary files /dev/null and b/js/trampolineH.png differ diff --git a/js/trampolineI.png b/js/trampolineI.png new file mode 100644 index 0000000..7433f49 Binary files /dev/null and b/js/trampolineI.png differ