Merge pull request TodePond#356 from Paalui/patch-1

Added rounding in conditionFunction and fixed merging

the-one-true-todey-file-of-cellpond.js

@@ -2165,10 +2165,10 @@ on.load(() => {
 				const neighbour = pickCell(centerX, centerY)
 
 				if (neighbour === undefined) return [undefined, undefined]
-				if (neighbour.left !== x) return [undefined, undefined]
-				if (neighbour.top !== y) return [undefined, undefined]
-				if (neighbour.width !== width) return [undefined, undefined]
-				if (neighbour.height !== height) return [undefined, undefined]
+				if (neighbour.left+8 !== x+8) return [undefined, undefined]
+				if (neighbour.top+8 !== y+8) return [undefined, undefined]
+				if (neighbour.width+8 !== width+8) return [undefined, undefined]
+				if (neighbour.height+8 !== height+8) return [undefined, undefined]
 				if (!splashes.has(neighbour.colour)) return [undefined, undefined]
 
 				return [neighbour, cell.content.stamp]
@@ -2257,8 +2257,8 @@ on.load(() => {
 				if (bonusTargets.length === 0) {
 					neighbourId++
 					if (skip > 0) {
-						neighbourId++
-						skip--
+						neighbourId+= skip
+						skip = 0
 					}
 				}
 			}
@@ -8310,6 +8310,7 @@ registerRule(
 			//======//
 			// LEFT //
 			//======//
+			let miniCount = 0
 			if (cellAtom.isLeftSlot) {
 
 				const red = makeNumber({values: [true, true, true, true, true, true, true, true, true, true], channel: 0})
@@ -8337,6 +8338,7 @@ registerRule(
 						content: miniClone,
 					})
 					left.push(diagramCell)
+					miniCount++
 				}
 
 			} else {
@@ -8352,24 +8354,39 @@ registerRule(
 			//=======//
 			// RIGHT //
 			//=======//
+			const rightContent = cellAtom.slotted === undefined? undefined : cellAtom.slotted.value
 
 			// Merge!!!
 			if (!cellAtom.isLeftSlot && cellAtom.value.isDiagram) {
-				const maxiLeft = makeMaximisedDiagram(cellAtom.value)
-				const [maxiWidth, maxiHeight] = getDiagramDimensions(maxiLeft)
 
-				const mergeCell = makeDiagramCell({
-					x,
-					y,
-					instruction: DRAGON_INSTRUCTION.merge,
-					splitX: maxiWidth,
-					splitY: maxiHeight,
-				})
-
-				right.push(mergeCell)
+				if (rightContent === undefined) {
+					while(miniCount>1){
+						const nothingCell = makeDiagramCell({
+							x,
+							y,
+							instruction: DRAGON_INSTRUCTION.nothing,
+						})
+
+						right.push(nothingCell)
+						miniCount--
+					}
+				}
+				else{
+					const maxiLeft = makeMaximisedDiagram(cellAtom.value)
+					const [maxiWidth, maxiHeight] = getDiagramDimensions(maxiLeft)
+
+					const mergeCell = makeDiagramCell({
+						x,
+						y,
+						instruction: DRAGON_INSTRUCTION.merge,
+						splitX: maxiWidth,
+						splitY: maxiHeight,
+					})
+
+					right.push(mergeCell)
+				}
 			}
 
-			const rightContent = cellAtom.slotted === undefined? undefined : cellAtom.slotted.value
 
 			if (rightContent === undefined) {
 				const nothingCell = makeDiagramCell({