release: 2025.2.2

Kruptein · web-flow · commit 9b79edd3da8f · 2025-06-19T19:16:40.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -95,20 +95,16 @@ jobs:
                   command: mkdir C:\Users\circleci\dist
 
             - run:
-                  name: Upgrade pip
-                  command: python -m pip install --upgrade pip
+                  name: Install uv
+                  command: python -m pip install uv
 
             - run:
                   name: Install python dependencies
-                  command: python -m pip install -r requirements.txt
+                  command: uv sync
 
-            - run: python -m pip install wheel
+            - run: uv add ordered-set nuitka
 
-            - run: python -m pip install ordered-set
-
-            - run: python -m pip install nuitka
-
-            - run: python -m nuitka --standalone --assume-yes-for-downloads --include-data-files=VERSION=VERSION --include-data-files=server_config.cfg=server_config.cfg --include-data-dir=static=static --include-data-dir=templates=templates --windows-icon-from-ico=static/favicon.ico ./planarally.py
+            - run: uv run -m nuitka --standalone --assume-yes-for-downloads --include-data-files=VERSION=VERSION --include-data-files=server_config.cfg=server_config.cfg --include-data-dir=static=static --include-data-dir=templates=templates --windows-icon-from-ico=static/favicon.ico ./planarally.py
 
             - run:
                   name: Zip artifacts
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,14 @@ tech changes will usually be stripped from release notes for the public
 
 ## Unreleased
 
+## [2025.2.2]
+
+### Fixed
+
+-   Initiative effect rename losing focus after pressing 1 character
+-   Locked shapes not being selectable directly
+-   DM only auras where no longer rendered due to a bug in the new access logic
+
 ## [2025.2.1]
 
 This fixes/adds support for a wider variety of smtp email servers.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "client",
-    "version": "2025.2.1",
+    "version": "2025.2.2",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/client/src/game/systems/access/index.ts b/client/src/game/systems/access/index.ts
@@ -51,7 +51,7 @@ class AccessSystem implements ShapeSystem {
     clear(): void {
         this.dropState();
         for (const al of ACCESS_LEVELS) {
-            $.activeTokenFilters.set(al, undefined);
+            $.activeTokenFilters.delete(al);
             $.ownedTokens.get(al)?.clear();
         }
         mutable.access.clear();
@@ -112,6 +112,11 @@ class AccessSystem implements ShapeSystem {
 
         const _access: AccessLevel[] = Array.isArray(access) ? access : [access];
 
+        // This is an extra case to cover the special case where the shape has no attached users
+        // in which case the auras would be hidden for the DM with the normal behaviour.
+        // If we're not actively filtering tokens, we can assume we want to show them.
+        if (gameState.raw.isDm && _access.every((al) => !raw.activeTokenFilters.has(al))) return true;
+
         // 2. Otherwise check in the active tokens or owned tokens depending on the limitToActiveTokens flag
         return _access.every((al) => (limitToActiveTokens ? activeTokens.value : raw.ownedTokens).get(al)?.has(id));
     }
diff --git a/client/src/game/systems/access/state.ts b/client/src/game/systems/access/state.ts
@@ -17,7 +17,7 @@ interface ReactiveAccessState {
     playerAccess: Map<string, AccessConfig>;
 
     ownedTokens: Map<AccessLevel, Set<LocalId>>;
-    activeTokenFilters: Map<AccessLevel, Set<LocalId> | undefined>;
+    activeTokenFilters: Map<AccessLevel, Set<LocalId>>;
 }
 
 interface AccessState {
@@ -35,7 +35,7 @@ const state = buildState<ReactiveAccessState, AccessState>(
         playerAccess: new Map(),
 
         ownedTokens: new Map(ACCESS_LEVELS.map((al) => [al, new Set<LocalId>()])),
-        activeTokenFilters: new Map(ACCESS_LEVELS.map((al) => [al, undefined])),
+        activeTokenFilters: new Map(),
     },
     { access: new Map<LocalId, AccessMap>() },
 );
diff --git a/client/src/game/tools/variants/select/index.ts b/client/src/game/tools/variants/select/index.ts
@@ -70,6 +70,7 @@ enum SelectOperations {
     Noop,
     Resize,
     Drag,
+    Select,
     GroupSelect,
     Rotate,
 }
@@ -227,12 +228,15 @@ class SelectTool extends Tool implements ISelectTool {
     }
 
     // Syncs the local state tracked selection state to the global selection state
-    private syncSelection(): void {
+    private syncSelection(resetCurrentSelection = false): void {
         if (this.currentSelection.length === 0) {
             selectedSystem.clear();
         } else {
             selectedSystem.set(...this.currentSelection.map((s) => s.id));
         }
+        if (resetCurrentSelection) {
+            this.currentSelection = [];
+        }
     }
 
     // INPUT HANDLERS
@@ -382,6 +386,8 @@ class SelectTool extends Tool implements ISelectTool {
                                 visionState.removeBlocker(TriangulationTarget.MOVEMENT, shape.floorId, shape, true);
                         }
                     }
+                } else {
+                    this.mode = SelectOperations.Select;
                 }
                 layer.invalidate(true);
                 hit = true;
@@ -834,19 +840,19 @@ class SelectTool extends Tool implements ISelectTool {
                 if (recalcVision) visionState.recalculateVision(floorId);
                 if (recalcMovement) visionState.recalculateMovement(floorId);
             }
-            layer.invalidate(false);
 
             if (this.mode !== SelectOperations.Rotate) {
                 this.removeRotationUi();
                 this.createRotationUi(features);
             }
         }
 
+        layer.invalidate(false);
+
         if (this.operationReady) addOperation(this.operationList!);
 
         _$.hasSelection = this.currentSelection.length > 0;
-        this.syncSelection();
-        this.currentSelection = [];
+        this.syncSelection(true);
 
         this.mode = SelectOperations.Noop;
     }
diff --git a/client/src/game/ui/initiative/Initiative.vue b/client/src/game/ui/initiative/Initiative.vue
@@ -268,7 +268,7 @@ function n(e: any): number {
                             class="initiative-effect"
                             :class="{ 'effect-visible': alwaysShowEffects }"
                         >
-                            <div v-for="(effect, e) of actor.effects" :key="`${actor.globalId}-${effect.name}`">
+                            <div v-for="(effect, e) of actor.effects" :key="`${actor.globalId}-${e}`">
                                 <input
                                     v-model="effect.name"
                                     type="text"
diff --git a/client/test/game/systems/access/index.test.ts b/client/test/game/systems/access/index.test.ts
@@ -114,18 +114,26 @@ describe("Access System", () => {
         let id: LocalId;
         let id2: LocalId;
         let id3: LocalId;
+        let id4: LocalId;
+        let id5: LocalId;
 
         beforeEach(() => {
             // Shape 1: Only some default access rights
             // Shape 2: Full access rights for a specific user
             // Shape 3: Mixed default & specific access rights
+            // Shape 4: No access rights
+            // Shape 5: Player with only edit access rights
             id = generateTestLocalId();
             id2 = generateTestLocalId();
             id3 = generateTestLocalId();
+            id4 = generateTestLocalId();
+            id5 = generateTestLocalId();
 
             const id1Default = { edit: true, movement: false, vision: true };
             const id2Default = { edit: false, movement: true, vision: false };
             const id3Default = { edit: false, movement: false, vision: true };
+            const id4Default = { edit: false, movement: false, vision: false };
+            const id5Default = { edit: false, movement: false, vision: false };
 
             const id2TestUser = {
                 access: { edit: true, movement: true, vision: true },
@@ -153,6 +161,14 @@ describe("Access System", () => {
                 default: id3Default,
                 extra: [id3TestUser],
             });
+            accessSystem.inform(id4, {
+                default: id4Default,
+                extra: [],
+            });
+            accessSystem.inform(id5, {
+                default: id5Default,
+                extra: [id3TestUser],
+            });
         });
         it("should return true for the DM without limiters", () => {
             // setup
@@ -161,6 +177,8 @@ describe("Access System", () => {
             accessCheck(id, { edit: true, movement: true, vision: true });
             accessCheck(id2, { edit: true, movement: true, vision: true });
             accessCheck(id3, { edit: true, movement: true, vision: true });
+            accessCheck(id4, { edit: true, movement: true, vision: true });
+            accessCheck(id5, { edit: true, movement: true, vision: true });
             // teardown
             gameSystem.setDm(false);
         });
@@ -172,36 +190,72 @@ describe("Access System", () => {
             accessCheck(id, { edit: true, movement: true, vision: true });
             accessCheck(id2, { edit: true, movement: true, vision: true });
             accessCheck(id3, { edit: true, movement: true, vision: true });
+            accessCheck(id4, { edit: true, movement: true, vision: true });
+            accessCheck(id5, { edit: true, movement: true, vision: true });
             // teardown
             gameSystem.setDm(false);
         });
-        it("should return according to the access rights for the DM with a limiter and the shape in the active filter", () => {
+        it("should return true for the DM with a limiter and the shape in the active filter", () => {
             // setup
             gameSystem.setDm(true);
-            // test shape 1
+            // test only shape 1 active
             accessSystem.setActiveVisionTokens(id);
-            accessCheck(id, { edit: true, movement: false, vision: true }, true);
+            accessCheck(id, { edit: true, movement: true, vision: true }, true);
             // test shape 2
             accessSystem.setActiveVisionTokens(id2);
             accessCheck(id2, { edit: true, movement: true, vision: true }, true);
             // test shape 3
             accessSystem.setActiveVisionTokens(id3);
-            accessCheck(id3, { edit: true, movement: false, vision: true }, true);
+            accessCheck(id3, { edit: true, movement: true, vision: true }, true);
+            // test shape 4
+            accessSystem.setActiveVisionTokens(id4);
+            accessCheck(id4, { edit: true, movement: true, vision: true }, true);
+            // test shape 5
+            accessSystem.setActiveVisionTokens(id5);
+            accessCheck(id5, { edit: true, movement: true, vision: true }, true);
             // test all shapes
-            accessSystem.setActiveVisionTokens(id, id2, id3);
+            accessSystem.setActiveVisionTokens(id, id2, id3, id4, id5);
             expect(accessSystem.hasAccessTo(id, "edit", true)).toBe(true);
             expect(accessSystem.hasAccessTo(id2, "movement", true)).toBe(true);
             expect(accessSystem.hasAccessTo(id3, "vision", true)).toBe(true);
+            expect(accessSystem.hasAccessTo(id4, "vision", true)).toBe(true);
+            expect(accessSystem.hasAccessTo(id5, "vision", true)).toBe(true);
             // teardown
             gameSystem.setDm(false);
         });
         it("should return false for the DM with a limiter and the shape not in the active filter", () => {
             // setup
             gameSystem.setDm(true);
+            // test shape 1 active
             accessSystem.setActiveVisionTokens(id);
-            // test
             expect(accessSystem.hasAccessTo(id2, "vision", true)).toBe(false);
             expect(accessSystem.hasAccessTo(id3, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id4, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id5, "vision", true)).toBe(false);
+            // test shape 2 active
+            accessSystem.setActiveVisionTokens(id2);
+            expect(accessSystem.hasAccessTo(id, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id3, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id4, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id5, "vision", true)).toBe(false);
+            // test shape 3 active
+            accessSystem.setActiveVisionTokens(id3);
+            expect(accessSystem.hasAccessTo(id, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id2, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id4, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id5, "vision", true)).toBe(false);
+            // test shape 4 active
+            accessSystem.setActiveVisionTokens(id4);
+            expect(accessSystem.hasAccessTo(id, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id2, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id3, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id5, "vision", true)).toBe(false);
+            // test shape 5 active
+            accessSystem.setActiveVisionTokens(id5);
+            expect(accessSystem.hasAccessTo(id, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id2, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id3, "vision", true)).toBe(false);
+            expect(accessSystem.hasAccessTo(id4, "vision", true)).toBe(false);
             // teardown
             gameSystem.setDm(false);
         });
@@ -260,6 +314,10 @@ describe("Access System", () => {
             accessCheck(id2, { edit: false, movement: true, vision: false });
             //   Shape 3
             accessCheck(id3, { edit: false, movement: false, vision: true });
+            //   Shape 4
+            accessCheck(id4, { edit: false, movement: false, vision: false });
+            //   Shape 5
+            accessCheck(id5, { edit: false, movement: false, vision: false });
             // User 2: Full access
             coreStore.setUsername("userWithFullRights");
             //   Shape 1
@@ -268,6 +326,10 @@ describe("Access System", () => {
             accessCheck(id2, { edit: true, movement: true, vision: true });
             //   Shape 3
             accessCheck(id3, { edit: false, movement: false, vision: true });
+            //   Shape 4
+            accessCheck(id4, { edit: false, movement: false, vision: false });
+            //   Shape 5
+            accessCheck(id5, { edit: false, movement: false, vision: false });
             // User 3: Mixed access
             coreStore.setUsername("userWithLimitedRights");
             //   Shape 1
@@ -276,6 +338,10 @@ describe("Access System", () => {
             accessCheck(id2, { edit: false, movement: true, vision: false });
             //   Shape 3
             accessCheck(id3, { edit: true, movement: false, vision: true });
+            //   Shape 4
+            accessCheck(id4, { edit: false, movement: false, vision: false });
+            //   Shape 5
+            accessCheck(id5, { edit: true, movement: false, vision: false });
         });
     });
     describe("getAccess", () => {
diff --git a/server/VERSION b/server/VERSION
@@ -1,4 +1,4 @@
-2025.2.1
+2025.2.2
 
 **Server owners:** The server config has changed location and format. Ensure you check the release notes for the necessary info.
 The old config files are not yet removed from git to prevent losing modifications you made to these files.
diff --git a/server/pyproject.toml b/server/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "planarally-server"
-version = "2025.2.1"
+version = "2025.2.2"
 description = "Planarally server"
 readme = "README.md"
 requires-python = ">=3.13.2"
diff --git a/server/uv.lock b/server/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "client",`
`3`		`- "version": "2025.2.1",`
	`3`	`+ "version": "2025.2.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ enum SelectOperations {`
`70`	`70`	`Noop,`
`71`	`71`	`Resize,`
`72`	`72`	`Drag,`
	`73`	`+ Select,`
`73`	`74`	`GroupSelect,`
`74`	`75`	`Rotate,`
`75`	`76`	`}`
`@@ -227,12 +228,15 @@ class SelectTool extends Tool implements ISelectTool {`
`227`	`228`	`}`
`228`	`229`
`229`	`230`	`// Syncs the local state tracked selection state to the global selection state`
`230`		`- private syncSelection(): void {`
	`231`	`+ private syncSelection(resetCurrentSelection = false): void {`
`231`	`232`	`if (this.currentSelection.length === 0) {`
`232`	`233`	`selectedSystem.clear();`
`233`	`234`	`} else {`
`234`	`235`	`selectedSystem.set(...this.currentSelection.map((s) => s.id));`
`235`	`236`	`}`
	`237`	`+ if (resetCurrentSelection) {`
	`238`	`+ this.currentSelection = [];`
	`239`	`+ }`
`236`	`240`	`}`
`237`	`241`
`238`	`242`	`// INPUT HANDLERS`
`@@ -382,6 +386,8 @@ class SelectTool extends Tool implements ISelectTool {`
`382`	`386`	`visionState.removeBlocker(TriangulationTarget.MOVEMENT, shape.floorId, shape, true);`
`383`	`387`	`}`
`384`	`388`	`}`
	`389`	`+ } else {`
	`390`	`+ this.mode = SelectOperations.Select;`
`385`	`391`	`}`
`386`	`392`	`layer.invalidate(true);`
`387`	`393`	`hit = true;`
`@@ -834,19 +840,19 @@ class SelectTool extends Tool implements ISelectTool {`
`834`	`840`	`if (recalcVision) visionState.recalculateVision(floorId);`
`835`	`841`	`if (recalcMovement) visionState.recalculateMovement(floorId);`
`836`	`842`	`}`
`837`		`- layer.invalidate(false);`
`838`	`843`
`839`	`844`	`if (this.mode !== SelectOperations.Rotate) {`
`840`	`845`	`this.removeRotationUi();`
`841`	`846`	`this.createRotationUi(features);`
`842`	`847`	`}`
`843`	`848`	`}`
`844`	`849`
	`850`	`+ layer.invalidate(false);`
	`851`	`+`
`845`	`852`	`if (this.operationReady) addOperation(this.operationList!);`
`846`	`853`
`847`	`854`	`_$.hasSelection = this.currentSelection.length > 0;`
`848`		`- this.syncSelection();`
`849`		`- this.currentSelection = [];`
	`855`	`+ this.syncSelection(true);`
`850`	`856`
`851`	`857`	`this.mode = SelectOperations.Noop;`
`852`	`858`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ function n(e: any): number {`
`268`	`268`	`class="initiative-effect"`
`269`	`269`	`:class="{ 'effect-visible': alwaysShowEffects }"`
`270`	`270`	`>`
`271`		- <div v-for="(effect, e) of actor.effects" :key="`${actor.globalId}-${effect.name}`">
	`271`	+ <div v-for="(effect, e) of actor.effects" :key="`${actor.globalId}-${e}`">
`272`	`272`	`<input`
`273`	`273`	`v-model="effect.name"`
`274`	`274`	`type="text"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-2025.2.1`
	`1`	`+2025.2.2`
`2`	`2`
`3`	`3`	`Server owners: The server config has changed location and format. Ensure you check the release notes for the necessary info.`
`4`	`4`	`The old config files are not yet removed from git to prevent losing modifications you made to these files.`