From 8e3d24509d9cc806bc3c02dea1ff22eeeccffb88 Mon Sep 17 00:00:00 2001 From: Aotumuri Date: Sun, 1 Jun 2025 11:00:22 +0900 Subject: [PATCH] fixed --- resources/territory_patterns.json | 29 +++++++++++++++-------------- src/client/TerritoryPatterns.ts | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/resources/territory_patterns.json b/resources/territory_patterns.json index a98e077fd..732eca6ea 100644 --- a/resources/territory_patterns.json +++ b/resources/territory_patterns.json @@ -1,18 +1,19 @@ { - "stripes_v": "AQACAAIACKA=", - "stripes_h": "AQACAAIACMA=", - "checkerboard": "AQACAAIACJA=", - "diagonal": "AQAQABAAAYAAQAAgABAACAAEAAIAAQAAgABAACAAEAAIAAQAAgAB", - "cross": "AQAQABAAAYABQAIgBBAICBAEIAJAAYABgAJABCAIEBAIIARAAoAB", - "mini_cross": "AQAQAAgAAcADMAwMMAPAA8AMMDAMwAM=", + "stripes_v": "AQACAAIACAU=", + "stripes_h": "AQACAAIACAM=", + "checkerboard": "AQACAAIACAk=", + "diagonal": "AQAQABAAAQEAAgAEAAgAEAAgAEAAgAAAAQACAAQACAAQACAAQACA", + "cross": "AQAQABAAAQGAAkAEIAgQEAggBEACgAGAAUACIAQQCAgQBCACQAGA", + "mini_cross": "AQAQAAgAAQPADDAwDMADwAMwDAwwA8A=", "horizontal_stripes": "AQAQABAAAf//AAAAAAAAAAAAAAAAAAD//wAAAAAAAAAAAAAAAAAA", - "sparse_dots": "AQAQABAAAYCAAAAAAAAAAAAAAAAAAACAgAAAAAAAAAAAAAAAAAAA", - "evan": "AQAYAAcABQAAAHkjEkEkmnEnlkDEknjEkgAAAA==", - "diagonal_stripe": "AQAQAAgAAYABQAIgBBAICBAEIAJAAYA=", + "sparse_dots": "AQAQABAAAQEBAAAAAAAAAAAAAAAAAAABAQAAAAAAAAAAAAAAAAAA", + "evan": "AQAYAAcABQAAAJ7ESIIkWY7kaQIjSR4jSQAAAA==", + "diagonal_stripe": "AQAQAAgAAQGAAkAEIAgQEAggBEACgAE=", "mountain_ridge": "AQAQAAgAAQAAGBg8PH5+//9+fjw8GBg=", - "scattered_dots": "AQAQAAgAAQAAQAQAAAAAAAAAABAIAAA=", - "circuit_board": "AQAQAAgAAcPDw8MwMDAwDDAMMMPDw8M=", - "vertical_bars": "AQAQAAgAAZJJkkmSSZJJkkmSSZJJkkk=", - ".w.": "AQAQAAgAAQAAAAAAAEACQYIiRHQuaBY=", - "openfront": "AQBCAAoABQAAAAAAAAAAAAAAAAAAAAABw4+RD54cRfCJEgZCBEiZECJEgVCBEiVECJ48TDx4iTECJAgRCBQiRECJAgRCBIiREBxA+RCBEcREAAAAAAAAAAAA" + "scattered_dots": "AQAQAAgAAQAAAiAAAAAAAAAAAAgQAAA=", + "circuit_board": "AQAQAAgAAcPDw8MMDAwMMAwwDMPDw8M=", + "vertical_bars": "AQAQAAgAAUmSSZJJkkmSSZJJkkmSSZI=", + ".w.": "AQAQAAgAAQAAAAAAAAJAgkFEIi50Fmg=", + "openfront": "AQBCAAoABQAAAAAAAAAAAAAAAAAAAACAw/GJ8Hk4og+RSGBCIBKZCEQigQqBSKQiEHk8MjwekYxAJBCIEChEIgKRQCBCIBGJCDgCnwiBiCMiAAAAAAAAAAAA", + "test": "AQAQAAgAAQAAAAAAAFVVqqoAAAAAAAA=" } diff --git a/src/client/TerritoryPatterns.ts b/src/client/TerritoryPatterns.ts index 6c2012e85..8f84362d6 100644 --- a/src/client/TerritoryPatterns.ts +++ b/src/client/TerritoryPatterns.ts @@ -54,7 +54,7 @@ export class PatternDecoder { const py = norm((y / this.scale) | 0, this.tileHeight); const idx = py * this.tileWidth + px; const byteIndex = idx >> 3; - const bitIndex = 7 - (idx % 8); + const bitIndex = idx & 7; const byte = this.bytes[this.dataStart + byteIndex]; if (byte === undefined) throw new Error("Invalid pattern"); return (byte & (1 << bitIndex)) !== 0;