renumber difficulty: 1=Easy, 2=Hard

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 14a60b444af5dfb42469708eb8e8819593a21487..e7ded555952f3c5fd8acf2c2c1f267665d022f8d 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -10,13 +10,12 @@
         <item>Hard</item>
     </string-array>
     <string-array name="difficulty_values">
         <item>Hard</item>
     </string-array>
     <string-array name="difficulty_values">

-        
-        <item >2</item><item>1</item>
+        <item>1</item>
+        <item>2</item>

     </string-array>
     <string-array name="size_values">
     </string-array>
     <string-array name="size_values">

-        <item >1</item>
-        <item >2</item>
-        <item >3</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>

     </string-array>
     </string-array>

-    

 </resources>
 </resources>

diff --git a/src/de/cwde/shisensho/Board.java b/src/de/cwde/shisensho/Board.java
index f1627b046d41396799f4dd0895ec03881b5839c4..146b1d8ae6669d6523dd738489fbe6fd148774b7 100644 (file)
--- a/src/de/cwde/shisensho/Board.java
+++ b/src/de/cwde/shisensho/Board.java
@@ -71,9 +71,9 @@ public class Board {
                this.difficulty=difficulty;
                this.gravity=gravity;
 
                this.difficulty=difficulty;
                this.gravity=gravity;
 

-               int numDifferentPieces=((boardSize[0]-2)*(boardSize[1]-2)/((difficulty+1)*2))+1;
-               for (int n=0;n<((difficulty+1)*2);n++) {
-                       for (int k=0;k<numDifferentPieces;k++) {
+               int numDifferentPieces=((boardSize[0]-2)*(boardSize[1]-2)/((4-difficulty)*2))+1;
+               for (int n=0; n<((4-difficulty)*2); n++) {
+                       for (int k=0; k<numDifferentPieces; k++) {

                                int i,j;
                                do {
                                        j=(myrand() % (boardSize[1]-2))+1;
                                int i,j;
                                do {
                                        j=(myrand() % (boardSize[1]-2))+1;