mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-22 23:53:48 +01:00
Merge pull request #3460 from Undeemiss/stanek-collision
STANEK: FIX #3277 Can no longer overlap rotated fragments
This commit is contained in:
commit
18fafff91f
@ -40,8 +40,9 @@ export class ActiveFragment {
|
|||||||
// These 2 variables converts 'this' local coordinates to world to other local.
|
// These 2 variables converts 'this' local coordinates to world to other local.
|
||||||
const dx: number = other.x - this.x;
|
const dx: number = other.x - this.x;
|
||||||
const dy: number = other.y - this.y;
|
const dy: number = other.y - this.y;
|
||||||
for (let j = 0; j < thisFragment.shape.length; j++) {
|
const fragSize = Math.max(thisFragment.shape.length, thisFragment.shape[0].length);
|
||||||
for (let i = 0; i < thisFragment.shape[j].length; i++) {
|
for (let j = 0; j < fragSize; j++) {
|
||||||
|
for (let i = 0; i < fragSize; i++) {
|
||||||
if (thisFragment.fullAt(i, j, this.rotation) && otherFragment.fullAt(i - dx, j - dy, other.rotation))
|
if (thisFragment.fullAt(i, j, this.rotation) && otherFragment.fullAt(i - dx, j - dy, other.rotation))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user