fix new pieces not matching

This commit is contained in:
2022-08-30 15:38:36 +00:00
parent 154b696280
commit fc3bf543ec

View File

@@ -411,12 +411,16 @@
(r.shuffle startingPoints) (r.shuffle startingPoints)
(set jigsaw j) (set jigsaw j)
(r.shuffle jigsaw.jigs) (r.shuffle jigsaw.jigs)
(localVar spriteGrid (for y (range PUZZLE_HEIGHT) (for x (range PUZZLE_WIDTH) null)))
(localVar indexGrid (for y (range PUZZLE_HEIGHT) (for x (range PUZZLE_WIDTH) -1)))
(localVar piecesUnlocked (min TOTAL_PIECES (* currentRewardFile.piecesPerPoint (- p currentRewardFile.startingPoints)))) (localVar piecesUnlocked (min TOTAL_PIECES (* currentRewardFile.piecesPerPoint (- p currentRewardFile.startingPoints))))
(localVar piecesAlreadyMade rewardSprites.length) (localVar piecesAlreadyMade rewardSprites.length)
(localVar newPieces (- piecesUnlocked piecesAlreadyMade)) (localVar newPieces (- piecesUnlocked piecesAlreadyMade))
(prop &mut :Array<Array<KissExtendedSprite>> spriteGrid)
(prop &mut :Array<Array<Int>> indexGrid)
(unless (< 0 piecesAlreadyMade)
(set spriteGrid (for y (range PUZZLE_HEIGHT) (for x (range PUZZLE_WIDTH) null)))
(set indexGrid (for y (range PUZZLE_HEIGHT) (for x (range PUZZLE_WIDTH) -1))))
(localVar makeJig -+>count [] (localVar makeJig -+>count []
(let [i (+ piecesAlreadyMade count -1) (let [i (+ piecesAlreadyMade count -1)
@@ -572,8 +576,8 @@
(entryWindow.makeText (+ s (pointsStr points)) action)) (entryWindow.makeText (+ s (pointsStr points)) action))
(method :Void log [:String message] (method :Void log [:String message]
(when (> message.length 100) (log (message.substr 0 100)) (return))
(trace message) (trace message)
(when (> message.length (defAndReturn var FLX_LOG_MAX 100)) (set message (message.substr FLX_LOG_MAX)))
(prop &mut logTextY 0) (prop &mut logTextY 0)
(#when debug (#when debug
(when (> logTextY FlxG.height) (when (> logTextY FlxG.height)