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

Fix a devious depth/match bug

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-08-01 20:26:38 +00:00
parent 91c0665777
commit 90f4368a59
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,7 @@
(prop &mut :Map<Int,JigsawPiece> pieceData (new Map)) (prop &mut :Map<Int,JigsawPiece> pieceData (new Map))
(prop &mut :Map<Int,Array<FlxExtendedSprite>> connectedPieces (new Map)) (prop &mut :Map<Int,Array<FlxExtendedSprite>> connectedPieces (new Map))
(prop &mut :Map<FlxExtendedSprite,Int> indexMap (new Map)) (prop &mut :Map<FlxExtendedSprite,Int> indexMap (new Map))
(prop &mut :Map<Int,FlxExtendedSprite> spriteMap (new Map)) // Because rewardSprites will be re-ordered in depth handling, this is required
(prop &mut rewardFileIndex 0) (prop &mut rewardFileIndex 0)
(prop &mut maxRewardFile 0) (prop &mut maxRewardFile 0)
@@ -202,6 +203,7 @@
(setNth indexGrid jig.row jig.col i) (setNth indexGrid jig.row jig.col i)
(dictSet pieceData i jig) (dictSet pieceData i jig)
(dictSet indexMap s i) (dictSet indexMap s i)
(dictSet spriteMap i s)
(set s.draggable true) (set s.draggable true)
(s.enableMouseDrag false true) (s.enableMouseDrag false true)
(set s.mouseStartDragCallback (set s.mouseStartDragCallback
@@ -370,17 +372,11 @@
(method :Void checkMatches [id] (method :Void checkMatches [id]
(when !(pieceData.exists id) (return)) (when !(pieceData.exists id) (return))
(let [s (nth rewardSprites.members id) (let [s (dictGet spriteMap id)
jig (dictGet pieceData id) jig (dictGet pieceData id)
row jig.row row jig.row
col jig.col] col jig.col]
/* // TODO tune the match zones
(let [l (matchZoneLeft s)
r (matchZoneRight s)]
(s.drawRect (- l.x s.x) (- l.y s.y) l.width l.height)
(s.drawRect (- r.x s.x) (- r.y s.y) r.width r.height)) */
(whenLet [toLeft (dictGet matchingPiecesLeft id) (whenLet [toLeft (dictGet matchingPiecesLeft id)
mzl (matchZoneLeft s) mzl (matchZoneLeft s)
mzr (matchZoneRight toLeft)] mzr (matchZoneRight toLeft)]