more reasonable behavior for label sequences on non-bonus habits

projects/flixel-desktop-habit-puzzle-game/playtest-todo.txt

@@ -1,17 +1,17 @@
-~~first time opening, choose puzzle pack menu doesn't go away~~
+-[x] first time opening, choose puzzle pack menu doesn't go away
 
 
-- create task menu goes away after choosing type?
+-[ ] create task menu goes away after choosing type?
-- no way to cancel deleting task/etc. (Forces them to delete one)
+-[ ] no way to cancel deleting task/etc. (Forces them to delete one)
-	- can only delete one at a time
+	-[ ] can only delete one at a time (window closes after)
-- delete key shouldn't close the application
+-[ ] delete key shouldn't close the application
-- press escape to work on puzzle needs explanation/a more intuitive way to do it
+-[ ] press escape to work on puzzle needs explanation/a more intuitive way to do it
-- Explain that clicking on habits marks them finished
+-[ ] Explain that clicking on habits marks them finished
-- right click rotates pieces explanation/tooltip
+-[ ] right click (and space bar) rotates pieces ONLY WHEN HOLDING explanation/tooltip
-- add a label for this [TYPE OF] habit
+-[x] add a label for this [TYPE OF] habit
-- don't allow slash in habit labels (unless inside brackets)
+-[ ] don't allow slash in habit labels (unless inside brackets)
 
-- Interval multi-part tasks (i.e. laundry) will behave counter-intuitively (i.e. it tells you to dry your laundry a week after washing it)
+-[x] Interval multi-part tasks (i.e. laundry) will behave counter-intuitively (i.e. it tells you to dry your laundry a week after washing it)
-	- but sometimes the counter-intuitive behavior may be wanted
+	-[x] but sometimes the counter-intuitive behavior may be wanted (I doubt it)
 	
-- fullscreen button
+-[ ] fullscreen button

projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss

@@ -237,10 +237,12 @@
 (method addPoint [:Entry e]
     (let [label (activeLabel e)]
         (+= label.points 1)
-        (whenLet [(Daily days lastDayDone) e.type]
+        // For task-list types, set lastDayDone when the final label is done
-            (set e.type (Daily days (HabitModel.todayString))))
+        (when (apply = (for label e.labels label.points))
-        (whenLet [(Monthly days lastDayDone) e.type]
+            (whenLet [(Daily days lastDayDone) e.type]
-            (set e.type (Monthly days (.toString (DateTime.now)))))
+                (set e.type (Daily days (HabitModel.todayString))))
-        (whenLet [(Interval days lastDayDone) e.type]
+            (whenLet [(Monthly days lastDayDone) e.type]
-            (set e.type (Interval days (.toString (DateTime.now))))))
+                (set e.type (Monthly days (.toString (DateTime.now)))))
+            (whenLet [(Interval days lastDayDone) e.type]
+                (set e.type (Interval days (.toString (DateTime.now)))))))
     (save))