Merge pull request #9 from veu/next

Version 2.0.0

LICENSE

@@ -1,5 +1,7 @@
 Images in src/img/
 Puzzles in src/import/
+Music in src/music/
+Sound effects in src/sound/
 
 This work is licensed under the Creative Commons Attribution 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 

build.sh

@@ -0,0 +1,8 @@
+#!/bin/zsh
+version=$(sed -n -e 's/version=//p' src/pdxinfo)
+rm -rf Sketch,\ Share,\ Solve.pdx/
+rm Sketch,\ Share,\ Solve.$version.pdx.zip Sketch,\ Share,\ Solve.$version-no-music.pdx.zip
+pdc -s ./src Sketch,\ Share,\ Solve.pdx
+zip -r9 Sketch,\ Share,\ Solve.$version.pdx.zip Sketch,\ Share,\ Solve.pdx
+rm Sketch,\ Share,\ Solve.pdx/music/*.pda
+zip -r9 Sketch,\ Share,\ Solve.$version-no-music.pdx.zip Sketch,\ Share,\ Solve.pdx

src/constants.lua

@@ -1,8 +1,10 @@
-VERSION = "1.4.0"
+VERSION = "2.0.0"
 
 CELL = 16
 TOP_NUMBER_HEIGHT = 14
 
+MAX_UNDO = 51
+
 GRID_OFFSET_X = 152
 GRID_OFFSET_Y = 72
 GRID_OFFSET_AVATAR_X = 132
@@ -11,9 +13,10 @@ GRID_OFFSET_AVATAR_Y = 39
 MODE_PLAY = 1
 MODE_CREATE = 2
 MODE_SHARE = 3
-MODE_OPTIONS = 4
-MODE_AVATAR = 5
-MODE_TUTORIAL = 6
+MODE_UNDO = 4
+MODE_OPTIONS = 5
+MODE_AVATAR = 6
+MODE_TUTORIAL = 7
 
 Z_INDEX_FRAME = 4
 
@@ -80,18 +83,25 @@ HINTS_TEXT = {
 
 ACTION_ID_ABOUT = "ABOUT"
 ACTION_ID_CRANK_SPEED = "CRANK_SPEED"
+ACTION_ID_DELETE_PUZZLES = "DELETE_PUZZLES"
+ACTION_ID_EFFECTS = "EFFECTS"
 ACTION_ID_FLIP = "FLIP"
+ACTION_ID_FLIP_Y = "FLIP_Y"
 ACTION_ID_FONT_TYPE = "FONT_TYPE"
 ACTION_ID_HINT_STYLE = "HINT_STYLE"
 ACTION_ID_INVERT_COLORS = "INVERT_COLORS"
+ACTION_ID_MUSIC = "MUSIC"
 ACTION_ID_NEW_PLAYER = "NEW_PLAYER"
 ACTION_ID_RESET_GRID = "RESET_GRID"
+ACTION_ID_ROTATE = "ROTATE"
 ACTION_ID_QUICK_PLAY = "QUICK_PLAY"
 ACTION_ID_SETTINGS = "SETTINGS"
 ACTION_ID_SKETCH_TUTORIAL = "SKETCH_TUTORIAL"
 ACTION_ID_SOLVE_TUTORIAL = "SOLVE_TUTORIAL"
+ACTION_ID_TOGGLE_AUTOCROSS = "TOGGLE_AUTOCROSS"
 ACTION_ID_TOGGLE_TIMER = "TOGGLE_TIMER"
 ACTION_ID_TUTORIALS = "TUTORIALS"
+ACTION_ID_UNDO = "UNDO"
 
 GAME_NAME = "Sketch, Share, Solve"
 
@@ -123,3 +133,21 @@ FONT_TYPE_NAMES = {
 	"thin",
 	"bold",
 }
+
+AUDIO_LEVEL_NAMES = {
+	"off",
+	"1",
+	"2",
+	"3",
+	"4",
+	"5"
+}
+
+AUDIO_LEVEL_NAMES_REVERSED = {
+	off = 1,
+	["1"] = 2,
+	["2"] = 3,
+	["3"] = 4,
+	["4"] = 5,
+	["5"] = 6
+}