commit 1ba56d95dfd2500f3b3bf7059a4daca97530c9d4
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Thu Aug 4 15:51:34 2022 +0200

    Simplification for the new way of storing records.

diff --git a/src/main/java/org/distorted/external/RubikScores.java b/src/main/java/org/distorted/external/RubikScores.java
index 2e453e7a..d27b6d61 100644
--- a/src/main/java/org/distorted/external/RubikScores.java
+++ b/src/main/java/org/distorted/external/RubikScores.java
@@ -19,7 +19,6 @@ import android.telephony.TelephonyManager;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.distorted.main.BuildConfig;
-import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objects.RubikObject;
 import org.distorted.objects.RubikObjectList;
 
@@ -401,19 +400,6 @@ public class RubikScores
 
             if( subm>=0 && subm<=1 )
               {
-              int staticNumScrambles = ObjectType.getStaticNumScrambles(ordinal);
-
-              if( level==MAX_RECORD )
-                {
-                android.util.Log.e("D", "object: "+nameStr+" level="+level+" RECORD DETECTED!");
-                }
-
-              if( level>=staticNumScrambles )
-                {
-                android.util.Log.e("D", "object: "+nameStr+" level="+level+" RECORD DETECTED!");
-                level = MAX_RECORD;
-                }
-
               MapValue value = new MapValue(time,subm);
               int key = mapKey(ordinal,level);
               mMap.put(key,value);
diff --git a/src/main/java/org/distorted/objects/RubikObject.java b/src/main/java/org/distorted/objects/RubikObject.java
index 7747b8e5..e0c2a2f7 100644
--- a/src/main/java/org/distorted/objects/RubikObject.java
+++ b/src/main/java/org/distorted/objects/RubikObject.java
@@ -35,6 +35,8 @@ import static org.distorted.main.RubikActivity.SHOW_DOWNLOADED_DEBUG;
 
 public class RubikObject
 {
+  public static final int FAST_SCRAMBLES = 80;
+
   private final String mLowerName, mUpperName;
   private final int mIconID;
   private final String[][] mPatterns;
diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java
index eaf81b3e..c77dd0f8 100644
--- a/src/main/java/org/distorted/screens/RubikScreenPlay.java
+++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java
@@ -354,11 +354,8 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd
       @Override
       public void onClick(View v)
         {
-        int currObject = RubikObjectList.getCurrObject();
-        RubikObject object = RubikObjectList.getObject(currObject);
-        int numScrambles = object==null ? 0 : 2*object.getNumScramble();
         mShouldReactToEndOfScrambling = false;
-        act.getControl().fastScrambleObject(numScrambles);
+        act.getControl().fastScrambleObject(RubikObject.FAST_SCRAMBLES);
         }
       });
     }
diff --git a/src/main/java/org/distorted/tutorials/TutorialScreen.java b/src/main/java/org/distorted/tutorials/TutorialScreen.java
index 4348e975..96f1d7d3 100644
--- a/src/main/java/org/distorted/tutorials/TutorialScreen.java
+++ b/src/main/java/org/distorted/tutorials/TutorialScreen.java
@@ -18,7 +18,6 @@ import org.distorted.helpers.LockController;
 import org.distorted.main.R;
 import org.distorted.main.RubikActivity;
 import org.distorted.objects.RubikObject;
-import org.distorted.objects.RubikObjectList;
 import org.distorted.helpers.TransparentImageButton;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -61,10 +60,7 @@ public class TutorialScreen
       @Override
       public void onClick(View v)
         {
-        int object = RubikObjectList.getCurrObject();
-        RubikObject obj = RubikObjectList.getObject(object);
-        int numScrambles = obj==null ? 0 : 2*obj.getNumScramble();
-        act.getControl().fastScrambleObject(numScrambles);
+        act.getControl().fastScrambleObject(RubikObject.FAST_SCRAMBLES);
         }
       });
     }