diff --git a/projects/handloose/source/DocumentModel.kiss b/projects/handloose/source/DocumentModel.kiss index f913cb0d..6b3347ce 100644 --- a/projects/handloose/source/DocumentModel.kiss +++ b/projects/handloose/source/DocumentModel.kiss @@ -1,10 +1,10 @@ (defNew [&prop :String path] + (when (FileSystem.exists path) (set content (File.getContent path))) (type "") // If the file can't be written to, throw the error right away // Use files with the same extension in the current working directory to determine letter frequencies (walkDirectory "" (FileSystem.absolutePath "") ->file (when (= (Path.extension file) (Path.extension path)) - (learnFrequencies ~(File.getContent ~file)) - ~charFrequencies))) + (learnFrequencies (File.getContent file))))) (prop &mut :String content "") (method :Void type [:String str] @@ -17,6 +17,7 @@ (method incFrequency [:Map> m :String c :String following] (when c + (when (= c "\r") (set c "\n")) (unless (m.exists following) (dictSet m following (new Map))) (let [followingMap (dictGet m following)] (dictSet followingMap c (+ 1 (or (dictGet followingMap c) 0)))))) diff --git a/projects/handloose/source/TypingState.kiss b/projects/handloose/source/TypingState.kiss index 6e5315e2..50bbba37 100644 --- a/projects/handloose/source/TypingState.kiss +++ b/projects/handloose/source/TypingState.kiss @@ -107,10 +107,14 @@ case "\t": ""; default: text; }; - var text = new FlxText(text, TEXT_SIZE); - text.angle = -spr.angle; - text.color = FlxColor.BLACK; - spr.stamp(text, Math.floor(SPRITE_SIZE/2) - Math.floor(text.width / 2), Math.floor(SPRITE_SIZE/2) - Math.floor(text.height / 2)); + var ftext = new FlxText(text, TEXT_SIZE); + ftext.angle = -spr.angle; + ftext.color = FlxColor.BLACK; + + if (text.length > 1) { + ftext.size = 12; + } + spr.stamp(ftext, Math.floor(SPRITE_SIZE/2) - Math.floor(ftext.width / 2), Math.floor(SPRITE_SIZE/2) - Math.floor(ftext.height / 2)); spr.x = SPRITE_SPACING + DIR_ORDER.indexOf(dir) * (SPRITE_SIZE + SPRITE_SPACING); spr.y = y;