Merge pull request #3 from alexcoder04/master

Add navigation with number keys and create a Makefile for building with Luna
jonasgeiler · Oct 1, 2021 · 82e619a · 82e619a
2 parents 82dda12 + aaf741c
commit 82e619a
Show file tree

Hide file tree

Showing 42 changed files with 70 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+minesweeper.tns
+out.lua
diff --git a/Makefile b/Makefile
@@ -0,0 +1,11 @@
+
+build:
+	nspire-merge --out out.lua
+	luna out.lua minesweeper.tns
+
+clean:
+	$(RM) out.lua
+	$(RM) minesweeper.tns
+
+.PHONY: clean build
+
diff --git a/Minesweeper.lua b/Minesweeper.lua
@@ -91,7 +91,7 @@ function on.timer()
     platform.window:invalidate()
 end
 
-function on.arrowUp()
+function goUp()
     if gameover then return end
 
     if cursorY - 1 > 0 then
@@ -103,7 +103,7 @@ function on.arrowUp()
     end
 end
 
-function on.arrowDown()
+function goDown()
     if gameover then return end
 
     if cursorY < numRows then
@@ -115,7 +115,7 @@ function on.arrowDown()
     end
 end
 
-function on.arrowLeft()
+function goLeft()
     if gameover then return end
 
     if cursorX - 1 > 0 then
@@ -127,7 +127,7 @@ function on.arrowLeft()
     end
 end
 
-function on.arrowRight()
+function goRight()
     if gameover then return end
 
     if cursorX < numCols then
@@ -139,12 +139,24 @@ function on.arrowRight()
     end
 end
 
+function on.arrowUp() goUp() end
+function on.arrowDown() goDown() end
+function on.arrowLeft() goLeft() end
+function on.arrowRight() goRight() end
+
 function on.charIn(char)
     if gameover then return end
 
-    if char == '−' or char == 'f' then
-        flag()
-    end
+    if char == '−' or char == 'f' then flag() return end
+    if char == '8' then goUp() return end
+    if char == '2' then goDown() return end
+    if char == '4' then goLeft() return end
+    if char == '6' then goRight() return end
+
+    if char == '7' then goUp() goLeft() return end
+    if char == '9' then goUp() goRight() return end
+    if char == '1' then goDown() goLeft() return end
+    if char == '3' then goDown() goRight() return end
 end
 
 function on.enterKey()
@@ -674,5 +686,6 @@ function reloadMenu()
         toolpalette.enable("Marks", "Disable", false)
     end
 end
+
+----------------------
 ----------------------
-----------------------
diff --git a/Minesweeper.tns b/Minesweeper.tns
diff --git a/README.md b/README.md
@@ -1,8 +1,12 @@
+
 # TI-Nspire Minesweeper
+
 A simple Minesweeper-Clone made for the TI-Nspire with Lua.
 
-The images used are from the original Minesweeper Game. I don't own them.<br>
-**Warning:** This game is only tested on TI-Nspire CX and TI-Nspire CX CAS (OS Version 4.5), so there might be bugs on other platforms.
+The images used are from the original Minesweeper Game. I don't own them.
+
+**Warning:** This game is only tested on TI-Nspire CX and TI-Nspire CX CAS
+(OS Version 4.5), so there might be bugs on other platforms.
 
 
 # Screenshots
@@ -14,18 +18,43 @@ The images used are from the original Minesweeper Game. I don't own them.<br>
 
 
 ## Controls
-Move Cursor = Arrow Keys<br>
-Open Cell = Enter<br>
-Flag Cell = (-)    or    F<br>
-Press menu to change difficulty or to enable/disable marks.<br>
+
+Move Cursor = Arrow Keys / Number Keys
+
+Open Cell = Enter
+
+Flag Cell = (-) or F
+
+Press menu to change difficulty or to enable/disable marks.
 
 
 ## How to play
+
 The goal of this game is to open all cells.
 If you open a cell with a mine, you loose!
 The numbers on the cells tell you how many mines there are in the 8 adjacent cells.
 Flag a cell if you are sure that there is a mine under it.
 
 
 ## How to Build
-The resources files needed to build the project can be imported in the script editor with their default names using the CX Student Software (every image in the resource folder needs to be imported).
+
+### Using Luna
+
+Make sure you have Luna (https://github.com/ndless-nspire/Luna) and
+TI-Resource-Merge (https://github.com/DaveDuck321/TI-Resource-Merge) installed.
+The merge script should be in your PATH as `nspire-merge`.
+
+**Note:** since API version 2.3 (OS version >=3.6), support for inline-images
+like generated by the merge script was removed, so you would need to require
+an older API version. You can use my dirty fix in the merge script for that
+(https://github.com/alexcoder04/TI-Resource-Merge).
+
+Run `make` and it will generate the `minesweeper.tns` file which can be loaded
+onto the calculator.
+
+### Manually
+
+The resources files needed to build the project can be imported in the script
+editor with their default names using the CX Student Software (every image in
+the resource folder needs to be imported).
+
diff --git a/res/IMG/border_corner_bottom_left.png b/res/IMG/border_corner_bottom_left.png
diff --git a/res/IMG/border_corner_bottom_right.png b/res/IMG/border_corner_bottom_right.png
diff --git a/res/IMG/border_corner_top_left.png b/res/IMG/border_corner_top_left.png
diff --git a/res/IMG/border_corner_top_right.png b/res/IMG/border_corner_top_right.png
diff --git a/res/IMG/border_horizontal.png b/res/IMG/border_horizontal.png
diff --git a/res/IMG/border_split_left.png b/res/IMG/border_split_left.png
diff --git a/res/IMG/border_split_right.png b/res/IMG/border_split_right.png
diff --git a/res/IMG/border_vertical.png b/res/IMG/border_vertical.png
diff --git a/res/IMG/num0.png b/res/IMG/num0.png
diff --git a/res/IMG/num1.png b/res/IMG/num1.png
diff --git a/res/IMG/num2.png b/res/IMG/num2.png
diff --git a/res/IMG/num3.png b/res/IMG/num3.png
diff --git a/res/IMG/num4.png b/res/IMG/num4.png
diff --git a/res/IMG/num5.png b/res/IMG/num5.png
diff --git a/res/IMG/num6.png b/res/IMG/num6.png
diff --git a/res/IMG/num7.png b/res/IMG/num7.png
diff --git a/res/IMG/num8.png b/res/IMG/num8.png
diff --git a/res/IMG/num9.png b/res/IMG/num9.png
diff --git a/res/IMG/numMinus.png b/res/IMG/numMinus.png
diff --git a/res/IMG/smiley_cool.png b/res/IMG/smiley_cool.png
diff --git a/res/IMG/smiley_dead.png b/res/IMG/smiley_dead.png
diff --git a/res/IMG/smiley_smile.png b/res/IMG/smiley_smile.png
diff --git a/res/IMG/smiley_smile_pressed.png b/res/IMG/smiley_smile_pressed.png
diff --git a/res/IMG/tile_bomb.png b/res/IMG/tile_bomb.png
diff --git a/res/IMG/tile_clicked_bomb.png b/res/IMG/tile_clicked_bomb.png
diff --git a/res/IMG/tile_flag.png b/res/IMG/tile_flag.png
diff --git a/res/IMG/tile_marked.png b/res/IMG/tile_marked.png
diff --git a/res/IMG/tile_normal.png b/res/IMG/tile_normal.png
diff --git a/res/IMG/tile_nothing.png b/res/IMG/tile_nothing.png
diff --git a/res/IMG/tile_num1.png b/res/IMG/tile_num1.png
diff --git a/res/IMG/tile_num2.png b/res/IMG/tile_num2.png
diff --git a/res/IMG/tile_num3.png b/res/IMG/tile_num3.png
diff --git a/res/IMG/tile_num4.png b/res/IMG/tile_num4.png
diff --git a/res/IMG/tile_num5.png b/res/IMG/tile_num5.png
diff --git a/res/IMG/tile_num6.png b/res/IMG/tile_num6.png
diff --git a/res/IMG/tile_num7.png b/res/IMG/tile_num7.png
diff --git a/res/IMG/tile_num8.png b/res/IMG/tile_num8.png