kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

use pointsStr in habit file/delete screen

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-09-11 21:52:19 +00:00
parent f9fbe86a19
commit 0bd6f4e4bf
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/flixel-desktop-habit-puzzle-game/source/Entry.kiss
View File

@@ -24,4 +24,4 @@
((Interval days lastDayDone)
"$days ${lastDayDone}: ")
(otherwise ""))$(.join (for label labels
"${label.label} $(* "|" label.points)") "/")")
"${label.label} $(HabitModel.pointsStr label.points)") "/")")

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

@@ -110,8 +110,8 @@
(otherwise (throw "bad header: $lastHeader")))
(for l (line.split "/")
(object
label (StringTools.trim (StringTools.replace l "|" ""))
points (count (l.split "") ->c (= c "|"))))
label (StringTools.trim (withoutPointsStr l))
points (countPoints l)))
topPriority))))
(otherwise (break))))))
@@ -273,4 +273,26 @@
(set e.type (Monthly days (.toString (DateTime.now)))))
(whenLet [(Interval days lastDayDone) e.type]
(set e.type (Interval days (.toString (DateTime.now)))))))
(save))
(save))
(var tallyUnit 5)
(function pointsStr [points]
(let [&mut str "" symbols ["+" "*" "\$"]]
(doFor i (reverse (collect (range symbols.length)))
(let [scaledTallyUnit (^ tallyUnit i)
tallies (Math.floor (/ points scaledTallyUnit))]
(+= str (* (nth symbols i) tallies))
(-= points (* tallies scaledTallyUnit))))
str))
(function withoutPointsStr [:String label]
(doFor c (.split "|+*\$" "") (set label (label.replace c ""))))
(function countPoints [:String pointStr]
(apply + (for char (pointStr.split "")
(case char
("|" 1)
("+" 1)
("*" tallyUnit)
("\$" (^ tallyUnit 2))
(otherwise 0)))))

12
projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss
View File

@@ -139,6 +139,7 @@
(localVar title
"Add a label for this ${typeDescriptor}, or use SHIFT+ENTER to add a ${multipleLabelDescriptor}:")
(set entryCreationWindow (new SimpleWindow title null null 0.9 0.9))
// TODO don't allow /, +, $, *
(set entryNameText (new FlxInputText 0 0 FlxG.width "" textSize true))
(entryCreationWindow.addControl entryNameText)
(entryCreationWindow.makeText "Create" FlxColor.LIME ->:Void _ (addCreatedEntry))
@@ -608,7 +609,7 @@
// TODO configurable text size
(method _makeText [:String s :Int points &opt :Action action]
(entryWindow.makeText (+ s (pointsStr points)) action))
(entryWindow.makeText (+ s (HabitModel.pointsStr points)) action))
(method :Void log [:String message]
(trace message)
@@ -822,15 +823,6 @@
(method createTaskEntry [] (startAdding Todo))
(method createBonusEntry [] (startAdding Bonus))
(function pointsStr [points]
(let [&mut str "" tallyUnit 5 symbols ["+" "*" "\$"]]
(doFor i (reverse (collect (range symbols.length)))
(let [scaledTallyUnit (^ tallyUnit i)
tallies (Math.floor (/ points scaledTallyUnit))]
(+= str (* (nth symbols i) tallies))
(-= points (* tallies scaledTallyUnit))))
str))
(method addCreatedEntry []
// addEntry() calls save()
(when (entryNameText.text.trim)