add blacklisting

moves.yaml

@@ -3,44 +3,50 @@ finger_tricks:
   - name: "U push"
     move: "U"
     grip_pre:
-      index: BL
+      index: LB
     grip_post:
-      index: B
+      index: BR
+    grip_pre_blacklist: {}
     score: 5
   - name: "U flick"
     move: "U"
     grip_pre:
       index: F
     grip_post:
-      index: BL
+      index: LB
+    grip_pre_blacklist: {}
     score: 4
   - name: "U' push"
     move: "U'"
     grip_pre:
-      index: FL
+      index: LF
     grip_post:
       index: F
+    grip_pre_blacklist: {}
     score: 5
   - name: "U' flick"
     move: "U'"
     grip_pre:
-      index: B
+      index: BL
     grip_post:
-      index: FL
+      index: LF
+    grip_pre_blacklist: {}
     score: 3
   - name: "U2 feido"
     move: "U2"
     grip_pre:
-      index: B
+      index: BL
     grip_post:
       index: F
+    grip_pre_blacklist: {}
     score: 5
   - name: "U2 double flick"
     move: "U2"
     grip_pre:
-      index: B
+      index: BL
     grip_post:
-      index: FL
+      index: LF
+    grip_pre_blacklist: {}
     score: 6
   - name: "U2' double flick"
     move: "U2"
@@ -48,13 +54,15 @@ finger_tricks:
       index: F
     grip_post:
       index: BL
+    grip_pre_blacklist: {}
     score: 9
   - name: "U2 beido"
     move: "U2"
     grip_pre:
       index: F
     grip_post:
-      index: B
+      index: BR
+    grip_pre_blacklist: {}
     score: 5
   - name: "M' ring flick"
     move: "M'"
@@ -62,13 +70,18 @@ finger_tricks:
       ring: B
     grip_post:
       ring: DF
+    grip_pre_blacklist: {}
     score: 3
   - name: "M' pinky flick"
     move: "M'"
+    # I can't do M' after finishing beido
     grip_pre:
       pinky: B
     grip_post:
       pinky: F floating
+    grip_pre_blacklist:
+      index:
+        - BL
     score: 6
   - name: "M push"
     move: "M"
@@ -76,6 +89,7 @@ finger_tricks:
       pinky: F
     grip_post:
       pinky: DB
+    grip_pre_blacklist: {}
     score: 6
   - name: "M2 double flick"
     move: "M2"
@@ -85,56 +99,70 @@ finger_tricks:
     grip_post:
       pinky: F floating
       ring: DB
+    grip_pre_blacklist: {}
     score: 7
 regrips:
   # TODO: rethink this format?
+  # TODO: be able to write all possible grips for a finger and score JUST adj regrips
   - finger: index
-    pre: B
+    pre: BR
+    post: LB
+    score: 2
+  - finger: index
+    pre: BL
+    post: LB
+    score: 1
+  - finger: index
+    pre: BR
+    post: LF
+    score: 3
+  - finger: index
+    pre: BL
+    post: LF
+    score: 2
+  - finger: index
+    pre: BR
+    post: F
+    score: 3
+  - finger: index
+    pre: BL
+    post: F
+    score: 2
+  - finger: index
+    pre: LB
     post: BL
     score: 1
   - finger: index
-    pre: B
-    post: FL
-    score: 2
+    pre: LB
+    post: LF
+    score: 1
   - finger: index
-    pre: B
+    pre: LB
     post: F
     score: 2
   - finger: index
-    pre: BL
-    post: B
-    score: 1
-  - finger: index
-    pre: BL
-    post: FL
-    score: 1
-  - finger: index
-    pre: BL
-    post: F
+    pre: LF
+    post: BR
     score: 2
   - finger: index
-    pre: FL
-    post: B
-    score: 2
-  - finger: index
-    pre: FL
-    post: BL
+    pre: LF
+    post: LB
     score: 1
   - finger: index
-    pre: FL
+    pre: LF
     post: F
     score: 1
-  - finger: index
-    pre: F
-    post: B
-    score: 2
   - finger: index
     pre: F
     post: BL
     score: 2
   - finger: index
     pre: F
-    post: FL
+    post: LB
+    score: 2
+  - finger: index
+    pre: F
+    post: LF
     score: 1
   - finger: ring
     pre: B