Ivan Andrus avatar Ivan Andrus committed 3434fd8

Don't reset score when calculating so it can be used in predicates

Comments (0)

Files changed (2)

 ;;{{{ Display
 
 (defun achievements-update-score ()
-  (setq achievement-score 0)
-  (dolist (achievement achievements-list)
-    (let ((pred (emacs-achievement-predicate achievement)))
-      (when (achievements-earned-p achievement)
-        (setq achievement-score (+ achievement-score
-                                   (emacs-achievement-points achievement)))
-        (unless (emacs-achievement-transient achievement)
-          (setf (emacs-achievement-predicate achievement) t)))))
-  achievement-score)
+  (let ((score 0)
+        (total 0))
+    (dolist (achievement achievements-list)
+      (let ((points (emacs-achievement-points achievement))
+            (pred (emacs-achievement-predicate achievement)))
+        (incf total points)
+        (when (achievements-earned-p achievement)
+          (incf achievement-score points)
+          (unless (emacs-achievement-transient achievement)
+            (setf (emacs-achievement-predicate achievement) t)))))
+  ;; Save the updated list of achievements
+  (achievement-save-achievements)
+  (setq achievement-total total)
+  (setq achievement-score score)))
 
 (defun achievements-earned-p (achievement)
   "Returns non-nil if the achievement is earned."

basic-achievements.el

 (defachievement "Not All There"
   "You have a fractional achievement score."
   ;; Note: This is meant to be the only one that has fractional score
-  :points .5)
+  :points .5
+  :predicate '(/= achievement-score (round achievement-score)))
 
 (defachievement "Unlocker"
   "You have earned over 50 points in Emacs achievements.  Not bad."
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.