@pretty-chitty/core 1.2.9 → 1.2.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +23 -0
- package/dist/components/ActionLogDisplay.js +1 -1
- package/dist/components/ActionLogDisplay.js.map +1 -1
- package/dist/components/ActionLogHistory.js +1 -1
- package/dist/components/ActionLogHistory.js.map +1 -1
- package/dist/components/BottomBarButton.d.ts.map +1 -1
- package/dist/components/BottomBarButton.js +12 -1
- package/dist/components/BottomBarButton.js.map +1 -1
- package/dist/components/FullScreenGalleryDisplay.d.ts.map +1 -1
- package/dist/components/FullScreenGalleryDisplay.js +5 -1
- package/dist/components/FullScreenGalleryDisplay.js.map +1 -1
- package/dist/components/Gallery/AnimationController.d.ts +1 -0
- package/dist/components/Gallery/AnimationController.d.ts.map +1 -1
- package/dist/components/Gallery/AnimationController.js +9 -0
- package/dist/components/Gallery/AnimationController.js.map +1 -1
- package/dist/components/Gallery/BuiltItem.d.ts +2 -1
- package/dist/components/Gallery/BuiltItem.d.ts.map +1 -1
- package/dist/components/Gallery/BuiltItem.js +15 -3
- package/dist/components/Gallery/BuiltItem.js.map +1 -1
- package/dist/components/Gallery/GalleryController.d.ts +1 -0
- package/dist/components/Gallery/GalleryController.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryController.js +15 -4
- package/dist/components/Gallery/GalleryController.js.map +1 -1
- package/dist/components/Gallery/GalleryViewer.d.ts +2 -1
- package/dist/components/Gallery/GalleryViewer.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryViewer.js +13 -4
- package/dist/components/Gallery/GalleryViewer.js.map +1 -1
- package/dist/components/GameDialog.js +1 -1
- package/dist/components/GameDialog.js.map +1 -1
- package/dist/components/InlineGalleryDisplay.d.ts.map +1 -1
- package/dist/components/InlineGalleryDisplay.js +5 -1
- package/dist/components/InlineGalleryDisplay.js.map +1 -1
- package/dist/components/Playground.d.ts.map +1 -1
- package/dist/components/Playground.js +59 -21
- package/dist/components/Playground.js.map +1 -1
- package/dist/components/ServerTrustMatchViewer.d.ts.map +1 -1
- package/dist/components/ServerTrustMatchViewer.js +10 -2
- package/dist/components/ServerTrustMatchViewer.js.map +1 -1
- package/dist/components/SparkLineChart.d.ts.map +1 -1
- package/dist/components/SparkLineChart.js +62 -22
- package/dist/components/SparkLineChart.js.map +1 -1
- package/dist/components/TopBarDropdown.js +4 -4
- package/dist/components/TopBarDropdown.js.map +1 -1
- package/dist/components/TopBarPlayers.d.ts.map +1 -1
- package/dist/components/TopBarPlayers.js +9 -3
- package/dist/components/TopBarPlayers.js.map +1 -1
- package/dist/components/Viewer.d.ts.map +1 -1
- package/dist/components/Viewer.js +15 -6
- package/dist/components/Viewer.js.map +1 -1
- package/dist/game/Chit.d.ts +10 -1
- package/dist/game/Chit.d.ts.map +1 -1
- package/dist/game/Chit.js +125 -4
- package/dist/game/Chit.js.map +1 -1
- package/dist/game/Connection.d.ts +1 -0
- package/dist/game/Connection.d.ts.map +1 -1
- package/dist/game/Connection.js +27 -8
- package/dist/game/Connection.js.map +1 -1
- package/dist/game/ConnectionTransport.d.ts +5 -0
- package/dist/game/ConnectionTransport.d.ts.map +1 -1
- package/dist/game/ConnectionTransport.js +32 -0
- package/dist/game/ConnectionTransport.js.map +1 -1
- package/dist/game/GalleryItemChitChildrenSource.d.ts.map +1 -1
- package/dist/game/GalleryItemChitChildrenSource.js +9 -1
- package/dist/game/GalleryItemChitChildrenSource.js.map +1 -1
- package/dist/game/GameTheme.d.ts +3 -0
- package/dist/game/GameTheme.d.ts.map +1 -1
- package/dist/game/GameTheme.js +3 -0
- package/dist/game/GameTheme.js.map +1 -1
- package/dist/game/OrderedOutlet.d.ts +4 -1
- package/dist/game/OrderedOutlet.d.ts.map +1 -1
- package/dist/game/OrderedOutlet.js +25 -4
- package/dist/game/OrderedOutlet.js.map +1 -1
- package/dist/game/Pick.d.ts +1 -0
- package/dist/game/Pick.d.ts.map +1 -1
- package/dist/game/Pick.js +40 -1
- package/dist/game/Pick.js.map +1 -1
- package/dist/game/Prompt.d.ts +11 -1
- package/dist/game/Prompt.d.ts.map +1 -1
- package/dist/game/Prompt.js +34 -1
- package/dist/game/Prompt.js.map +1 -1
- package/dist/game/Turn.d.ts +17 -0
- package/dist/game/Turn.d.ts.map +1 -1
- package/dist/game/Turn.js +114 -63
- package/dist/game/Turn.js.map +1 -1
- package/dist/game/badAiTransport/BadAIClientPrompts.d.ts.map +1 -1
- package/dist/game/badAiTransport/BadAIClientPrompts.js +24 -4
- package/dist/game/badAiTransport/BadAIClientPrompts.js.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.d.ts +2 -0
- package/dist/game/clientTransport/ClientPrompts.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.js +48 -16
- package/dist/game/clientTransport/ClientPrompts.js.map +1 -1
- package/dist/game/clientTransport/ClientTime.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientTime.js +58 -52
- package/dist/game/clientTransport/ClientTime.js.map +1 -1
- package/dist/game/serverTransport/ServerPrompts.d.ts +1 -1
- package/dist/game/serverTransport/ServerPrompts.d.ts.map +1 -1
- package/dist/game/serverTransport/ServerPrompts.js +14 -3
- package/dist/game/serverTransport/ServerPrompts.js.map +1 -1
- package/dist/game/serverTransport/ServerStatus.d.ts.map +1 -1
- package/dist/game/serverTransport/ServerStatus.js +6 -2
- package/dist/game/serverTransport/ServerStatus.js.map +1 -1
- package/dist/game/serverTransport/ServerTime.d.ts.map +1 -1
- package/dist/game/serverTransport/ServerTime.js +6 -2
- package/dist/game/serverTransport/ServerTime.js.map +1 -1
- package/dist/hooks/useTimeController.d.ts.map +1 -1
- package/dist/hooks/useTimeController.js +3 -0
- package/dist/hooks/useTimeController.js.map +1 -1
- package/dist/hooks/useWebGlRenderer.d.ts +27 -1
- package/dist/hooks/useWebGlRenderer.d.ts.map +1 -1
- package/dist/hooks/useWebGlRenderer.js +179 -6
- package/dist/hooks/useWebGlRenderer.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/rendering/ChitGalleryItemInstance.js +1 -1
- package/dist/rendering/ChitGalleryItemInstance.js.map +1 -1
- package/dist/rendering/ChitRenderInstance.d.ts.map +1 -1
- package/dist/rendering/ChitRenderInstance.js +30 -9
- package/dist/rendering/ChitRenderInstance.js.map +1 -1
- package/dist/rendering/ChitRenderSpec.js +1 -1
- package/dist/rendering/ChitRenderSpec.js.map +1 -1
- package/dist/rendering/outline/IDBasedOutlinePass.d.ts.map +1 -1
- package/dist/rendering/outline/IDBasedOutlinePass.js +6 -2
- package/dist/rendering/outline/IDBasedOutlinePass.js.map +1 -1
- package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.d.ts.map +1 -1
- package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.js +7 -3
- package/dist/rendering/outline/passes/InterMeshEdgeDetectionPass.js.map +1 -1
- package/dist/utilities/CanvasStack/CanvasOperations.d.ts.map +1 -1
- package/dist/utilities/CanvasStack/CanvasOperations.js +34 -13
- package/dist/utilities/CanvasStack/CanvasOperations.js.map +1 -1
- package/dist/utilities/CanvasStack/CanvasStack.d.ts +9 -0
- package/dist/utilities/CanvasStack/CanvasStack.d.ts.map +1 -1
- package/dist/utilities/CanvasStack/CanvasStack.js +37 -2
- package/dist/utilities/CanvasStack/CanvasStack.js.map +1 -1
- package/dist/utilities/CanvasStack/RichTextRenderer.d.ts +2 -0
- package/dist/utilities/CanvasStack/RichTextRenderer.d.ts.map +1 -1
- package/dist/utilities/CanvasStack/RichTextRenderer.js +47 -4
- package/dist/utilities/CanvasStack/RichTextRenderer.js.map +1 -1
- package/package.json +1 -1
- package/src/library/components/ActionLogDisplay.tsx +1 -1
- package/src/library/components/ActionLogHistory.tsx +2 -2
- package/src/library/components/BottomBarButton.tsx +19 -2
- package/src/library/components/FullScreenGalleryDisplay.tsx +5 -0
- package/src/library/components/Gallery/AnimationController.ts +10 -0
- package/src/library/components/Gallery/BuiltItem.ts +16 -3
- package/src/library/components/Gallery/GalleryController.ts +15 -4
- package/src/library/components/Gallery/GalleryViewer.tsx +17 -3
- package/src/library/components/GameDialog.tsx +1 -1
- package/src/library/components/InlineGalleryDisplay.tsx +5 -0
- package/src/library/components/Playground.tsx +76 -20
- package/src/library/components/ServerTrustMatchViewer.tsx +10 -2
- package/src/library/components/SparkLineChart.tsx +85 -24
- package/src/library/components/TopBarDropdown.tsx +4 -4
- package/src/library/components/TopBarPlayers.tsx +9 -3
- package/src/library/components/Viewer.tsx +15 -6
- package/src/library/game/Chit.test.ts +91 -0
- package/src/library/game/Chit.ts +122 -9
- package/src/library/game/Connection.ts +27 -8
- package/src/library/game/ConnectionTransport.ts +38 -0
- package/src/library/game/GalleryItemChitChildrenSource.ts +9 -1
- package/src/library/game/GameTheme.ts +4 -0
- package/src/library/game/OrderedOutlet.ts +27 -4
- package/src/library/game/Pick.ts +46 -4
- package/src/library/game/Prompt.ts +43 -3
- package/src/library/game/Turn.ts +127 -78
- package/src/library/game/badAiTransport/BadAIClientPrompts.ts +21 -4
- package/src/library/game/clientTransport/ClientPrompts.ts +50 -16
- package/src/library/game/clientTransport/ClientTime.ts +61 -56
- package/src/library/game/serverTransport/ServerPrompts.ts +25 -7
- package/src/library/game/serverTransport/ServerStatus.ts +6 -2
- package/src/library/game/serverTransport/ServerTime.ts +6 -2
- package/src/library/hooks/useTimeController.tsx +3 -0
- package/src/library/hooks/useWebGlRenderer.tsx +212 -6
- package/src/library/index.ts +1 -1
- package/src/library/rendering/ChitGalleryItemInstance.ts +1 -1
- package/src/library/rendering/ChitRenderInstance.ts +32 -9
- package/src/library/rendering/ChitRenderSpec.ts +1 -1
- package/src/library/rendering/outline/IDBasedOutlinePass.ts +6 -2
- package/src/library/rendering/outline/passes/InterMeshEdgeDetectionPass.ts +7 -3
- package/src/library/utilities/CanvasStack/CanvasOperations.tsx +44 -13
- package/src/library/utilities/CanvasStack/CanvasStack.ts +38 -1
- package/src/library/utilities/CanvasStack/RichTextRenderer.ts +66 -5
package/dist/game/Prompt.d.ts
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { Chit } from "./Chit";
|
|
2
2
|
import { IButtonLibrary } from "./Game";
|
|
3
3
|
import { GameButton } from "./GameButton";
|
|
4
|
-
import { Pick } from "./Pick";
|
|
4
|
+
import { Pick, PickType } from "./Pick";
|
|
5
5
|
import { Turn } from "./Turn";
|
|
6
6
|
type PromptType = "PickPrompt" | "NoValidMovesPrompt";
|
|
7
7
|
export type PromptSerialization = {
|
|
8
|
+
id: string;
|
|
8
9
|
type: PromptType;
|
|
9
10
|
canReset: boolean;
|
|
10
11
|
details: any;
|
|
12
|
+
canStageInEarly: number;
|
|
11
13
|
};
|
|
12
14
|
type FindChit = (id: string) => Chit;
|
|
13
15
|
export declare abstract class Prompt {
|
|
@@ -23,12 +25,16 @@ export declare abstract class Prompt {
|
|
|
23
25
|
shouldReset: boolean;
|
|
24
26
|
canReset: boolean;
|
|
25
27
|
serialize(): PromptSerialization;
|
|
28
|
+
private serializationThatCreatedThisPrompt?;
|
|
29
|
+
isSameSerialization(promptSpec: PromptSerialization): boolean;
|
|
26
30
|
deserialize(prompt: PromptSerialization): void;
|
|
27
31
|
onResolve(cb: (success: boolean) => void): void;
|
|
28
32
|
destroy(): void;
|
|
29
33
|
resolve(details: any): void;
|
|
30
34
|
stepBack(fullReset?: boolean): void;
|
|
35
|
+
get canStageInEarly(): number;
|
|
31
36
|
abstract get type(): PromptType;
|
|
37
|
+
abstract canResolveResponse(response: any): boolean;
|
|
32
38
|
abstract serializeDetails(): any;
|
|
33
39
|
abstract deserializeDetails(state: any): void;
|
|
34
40
|
abstract resolveDetails(details: any): void;
|
|
@@ -48,6 +54,7 @@ export declare class NoValidMovesPrompt extends Prompt {
|
|
|
48
54
|
set message(newMessage: string);
|
|
49
55
|
get help(): string;
|
|
50
56
|
set help(newHelp: string);
|
|
57
|
+
canResolveResponse(): boolean;
|
|
51
58
|
serializeDetails(): any;
|
|
52
59
|
deserializeDetails(state: any): void;
|
|
53
60
|
resolveDetails(): void;
|
|
@@ -57,6 +64,7 @@ export declare class NoValidMovesPrompt extends Prompt {
|
|
|
57
64
|
type PickResolution = {
|
|
58
65
|
idx: number;
|
|
59
66
|
value: any;
|
|
67
|
+
pickType?: PickType;
|
|
60
68
|
};
|
|
61
69
|
export declare class PickPrompt extends Prompt {
|
|
62
70
|
type: PromptType;
|
|
@@ -64,8 +72,10 @@ export declare class PickPrompt extends Prompt {
|
|
|
64
72
|
private _help?;
|
|
65
73
|
picks: Pick[];
|
|
66
74
|
finished: () => void | Promise<void>;
|
|
75
|
+
get canStageInEarly(): number;
|
|
67
76
|
get message(): string;
|
|
68
77
|
get help(): string;
|
|
78
|
+
canResolveResponse(response: any): boolean;
|
|
69
79
|
autoResolve(): Promise<boolean>;
|
|
70
80
|
serializeDetails(): any;
|
|
71
81
|
deserializeDetails(details: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prompt.d.ts","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAW,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAwB,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"Prompt.d.ts","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"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"}
|
package/dist/game/Prompt.js
CHANGED
|
@@ -16,15 +16,23 @@ export class Prompt {
|
|
|
16
16
|
this.shouldStepBack = false;
|
|
17
17
|
this.shouldReset = false;
|
|
18
18
|
this.canReset = false;
|
|
19
|
+
this.serializationThatCreatedThisPrompt = undefined;
|
|
19
20
|
}
|
|
20
21
|
serialize() {
|
|
21
22
|
return {
|
|
23
|
+
id: this.id,
|
|
22
24
|
type: this.type,
|
|
23
25
|
canReset: this.canReset,
|
|
26
|
+
canStageInEarly: this.canStageInEarly,
|
|
24
27
|
details: this.serializeDetails(),
|
|
25
28
|
};
|
|
26
29
|
}
|
|
30
|
+
isSameSerialization(promptSpec) {
|
|
31
|
+
return this.serializationThatCreatedThisPrompt === promptSpec;
|
|
32
|
+
}
|
|
27
33
|
deserialize(prompt) {
|
|
34
|
+
this.serializationThatCreatedThisPrompt = prompt;
|
|
35
|
+
this.id = prompt.id;
|
|
28
36
|
this.canReset = prompt.canReset;
|
|
29
37
|
this.deserializeDetails(prompt.details);
|
|
30
38
|
}
|
|
@@ -49,6 +57,9 @@ export class Prompt {
|
|
|
49
57
|
this.shouldStepBack = true;
|
|
50
58
|
this.cbs.forEach((cb) => cb(false));
|
|
51
59
|
}
|
|
60
|
+
get canStageInEarly() {
|
|
61
|
+
return 0;
|
|
62
|
+
}
|
|
52
63
|
get message() {
|
|
53
64
|
return "Message";
|
|
54
65
|
}
|
|
@@ -101,6 +112,9 @@ export class NoValidMovesPrompt extends Prompt {
|
|
|
101
112
|
set help(newHelp) {
|
|
102
113
|
this._help = newHelp;
|
|
103
114
|
}
|
|
115
|
+
canResolveResponse() {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
104
118
|
serializeDetails() {
|
|
105
119
|
return {
|
|
106
120
|
message: this._message,
|
|
@@ -126,6 +140,9 @@ export class PickPrompt extends Prompt {
|
|
|
126
140
|
this.picks = [];
|
|
127
141
|
this.finished = () => { };
|
|
128
142
|
}
|
|
143
|
+
get canStageInEarly() {
|
|
144
|
+
return Math.max(0, ...this.picks.map((p) => p.canStageInEarly));
|
|
145
|
+
}
|
|
129
146
|
get message() {
|
|
130
147
|
if (this._message) {
|
|
131
148
|
return this._message;
|
|
@@ -144,6 +161,22 @@ export class PickPrompt extends Prompt {
|
|
|
144
161
|
.filter((d) => d)
|
|
145
162
|
.join("\n\nor\n\n");
|
|
146
163
|
}
|
|
164
|
+
canResolveResponse(response) {
|
|
165
|
+
if (this.resolved) {
|
|
166
|
+
return false;
|
|
167
|
+
}
|
|
168
|
+
if (response?.idx === undefined) {
|
|
169
|
+
return false;
|
|
170
|
+
}
|
|
171
|
+
const pick = this.picks[response.idx];
|
|
172
|
+
if (!pick) {
|
|
173
|
+
return false;
|
|
174
|
+
}
|
|
175
|
+
if (response.pickType && response.pickType !== pick.type) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
return pick.canResolveResponse(response.value);
|
|
179
|
+
}
|
|
147
180
|
async autoResolve() {
|
|
148
181
|
if (this.picks.length === 1 && this.picks[0].canAutoResolve()) {
|
|
149
182
|
await this.picks[0].autoResolve();
|
|
@@ -165,7 +198,7 @@ export class PickPrompt extends Prompt {
|
|
|
165
198
|
}
|
|
166
199
|
resolvePick(pick, value) {
|
|
167
200
|
const idx = this.picks.indexOf(pick);
|
|
168
|
-
this.resolve({ idx, value });
|
|
201
|
+
this.resolve({ idx, value, pickType: pick.type });
|
|
169
202
|
}
|
|
170
203
|
resolveDetails(resolution) {
|
|
171
204
|
if (resolution.idx === undefined) {
|
package/dist/game/Prompt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prompt.js","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAc,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"Prompt.js","sourceRoot":"","sources":["../../src/library/game/Prompt.ts"],"names":[],"mappings":"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"}
|
package/dist/game/Turn.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { ButtonPick, Pick } from "./Pick";
|
|
|
5
5
|
import { GameButton } from "./GameButton";
|
|
6
6
|
import { PlayerChit } from "./PlayerChit";
|
|
7
7
|
import { RootChit } from "./RootChit";
|
|
8
|
+
export type ConfirmContext = "turn_end" | "roll" | "switch_player";
|
|
8
9
|
type ValidPick = undefined | false | Pick | Pick[] | ButtonPick | ButtonPick[] | GameButton | GameButton[];
|
|
9
10
|
export type Picks = ValidPick | ValidPick[];
|
|
10
11
|
/**
|
|
@@ -51,6 +52,16 @@ export declare class Turn<T, P extends PlayerChit, R extends RootChit<P>> {
|
|
|
51
52
|
private chitLookup;
|
|
52
53
|
private lockedChitStates;
|
|
53
54
|
private lastChitStates;
|
|
55
|
+
private dirtyChitIds;
|
|
56
|
+
private pendingNewChits;
|
|
57
|
+
private _statePool?;
|
|
58
|
+
private get statePool();
|
|
59
|
+
/**
|
|
60
|
+
* Intern a serialized state string. If `hint` is provided (e.g. the last known state),
|
|
61
|
+
* a cheap content comparison is done first to avoid the Map lookup entirely — which matters
|
|
62
|
+
* because Map.get with large string keys is O(n) on string length.
|
|
63
|
+
*/
|
|
64
|
+
private internState;
|
|
54
65
|
/**
|
|
55
66
|
* The root chit instance of the game. All chits in the game have this chit somewhere in its hierarchy
|
|
56
67
|
*/
|
|
@@ -94,6 +105,7 @@ export declare class Turn<T, P extends PlayerChit, R extends RootChit<P>> {
|
|
|
94
105
|
* @returns
|
|
95
106
|
*/
|
|
96
107
|
amendLog(message: string | ((previous: string) => string)): void;
|
|
108
|
+
_zipStartPoint: number;
|
|
97
109
|
/**
|
|
98
110
|
* Compress the history in the timeline such that a user with maybe many moves (and changing their minds) won't
|
|
99
111
|
* clock up the replay timeline. Basically takes all of the flushes and smushes them together into a single flush.
|
|
@@ -103,6 +115,11 @@ export declare class Turn<T, P extends PlayerChit, R extends RootChit<P>> {
|
|
|
103
115
|
* This should only be done immediately after every zippable action *or* after undos are no longer possible.
|
|
104
116
|
*/
|
|
105
117
|
zip(): void;
|
|
118
|
+
/**
|
|
119
|
+
* Marks the current point in the clock steps as a "zip start point". This does nothing by itself, but when you later call zip(),
|
|
120
|
+
* it will not zip past this point
|
|
121
|
+
*/
|
|
122
|
+
markZipStartPoint(): void;
|
|
106
123
|
/**
|
|
107
124
|
* Scan all of the chits managed by this turn. If any of them have changed, group them together into a
|
|
108
125
|
* "ClockStep". If any new chits appear, then add them to our lookup. If any chits are deleted (orphaned),
|
package/dist/game/Turn.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Turn.d.ts","sourceRoot":"","sources":["../../src/library/game/Turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAA+B,SAAS,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAW,UAAU,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAuBtC,KAAK,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,GAAG,UAAU,GAAG,UAAU,EAAE,CAAC;AAC3G,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,qBAAa,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Turn.d.ts","sourceRoot":"","sources":["../../src/library/game/Turn.ts"],"names":[],"mappings":"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"}
|
package/dist/game/Turn.js
CHANGED
|
@@ -37,6 +37,37 @@ import { Confirm, GameButton } from "./GameButton";
|
|
|
37
37
|
* @group Core Game Elements
|
|
38
38
|
*/
|
|
39
39
|
export class Turn {
|
|
40
|
+
get statePool() {
|
|
41
|
+
if (this.parent)
|
|
42
|
+
return this.parent.statePool;
|
|
43
|
+
if (!this._statePool)
|
|
44
|
+
this._statePool = new Map();
|
|
45
|
+
return this._statePool;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Intern a serialized state string. If `hint` is provided (e.g. the last known state),
|
|
49
|
+
* a cheap content comparison is done first to avoid the Map lookup entirely — which matters
|
|
50
|
+
* because Map.get with large string keys is O(n) on string length.
|
|
51
|
+
*/
|
|
52
|
+
internState(s, hint) {
|
|
53
|
+
if (hint !== undefined && s === hint)
|
|
54
|
+
return hint;
|
|
55
|
+
const pool = this.statePool;
|
|
56
|
+
const existing = pool.get(s);
|
|
57
|
+
if (existing !== undefined)
|
|
58
|
+
return existing;
|
|
59
|
+
pool.set(s, s);
|
|
60
|
+
return s;
|
|
61
|
+
}
|
|
62
|
+
/** @internal */
|
|
63
|
+
notifyChitDirty(chit) {
|
|
64
|
+
if (chit.id) {
|
|
65
|
+
this.dirtyChitIds.add(chit.id);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
this.pendingNewChits.add(chit);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
40
71
|
/**
|
|
41
72
|
* The root chit instance of the game. All chits in the game have this chit somewhere in its hierarchy
|
|
42
73
|
*/
|
|
@@ -78,6 +109,9 @@ export class Turn {
|
|
|
78
109
|
this.chitLookup = {};
|
|
79
110
|
this.lockedChitStates = {};
|
|
80
111
|
this.lastChitStates = {};
|
|
112
|
+
this.dirtyChitIds = new Set();
|
|
113
|
+
this.pendingNewChits = new Set();
|
|
114
|
+
this._statePool = undefined;
|
|
81
115
|
/**
|
|
82
116
|
* Locates a chit by its ID. If not found, will throw.
|
|
83
117
|
* @param id
|
|
@@ -97,6 +131,7 @@ export class Turn {
|
|
|
97
131
|
return result;
|
|
98
132
|
};
|
|
99
133
|
this._playerIds = undefined;
|
|
134
|
+
this._zipStartPoint = 0;
|
|
100
135
|
/** @internal */
|
|
101
136
|
this.nextSavedStateToProcess = undefined;
|
|
102
137
|
this.isProcessingSavedState = false;
|
|
@@ -127,7 +162,7 @@ export class Turn {
|
|
|
127
162
|
if (!c.id) {
|
|
128
163
|
throw new Error("Cannot serialize a chit without an id");
|
|
129
164
|
}
|
|
130
|
-
this.lastChitStates[c.id] = this.lockedChitStates[c.id] = c.serialize(this._playerIds);
|
|
165
|
+
this.lastChitStates[c.id] = this.lockedChitStates[c.id] = this.internState(c.serialize(this._playerIds));
|
|
131
166
|
});
|
|
132
167
|
}
|
|
133
168
|
/**
|
|
@@ -211,7 +246,7 @@ export class Turn {
|
|
|
211
246
|
zip() {
|
|
212
247
|
this.flush();
|
|
213
248
|
let hasChange = false;
|
|
214
|
-
while (this.clockSteps.length >= 2) {
|
|
249
|
+
while (this.clockSteps.length >= this._zipStartPoint + 2) {
|
|
215
250
|
const lastStep = this.clockSteps[this.clockSteps.length - 1];
|
|
216
251
|
const previousStep = this.clockSteps[this.clockSteps.length - 2];
|
|
217
252
|
if (!(lastStep instanceof FlushClockStep) || !(previousStep instanceof FlushClockStep)) {
|
|
@@ -223,94 +258,103 @@ export class Turn {
|
|
|
223
258
|
}
|
|
224
259
|
if (hasChange) {
|
|
225
260
|
this.pass++;
|
|
226
|
-
this.flush();
|
|
261
|
+
this.flush(true);
|
|
227
262
|
}
|
|
228
263
|
}
|
|
264
|
+
/**
|
|
265
|
+
* Marks the current point in the clock steps as a "zip start point". This does nothing by itself, but when you later call zip(),
|
|
266
|
+
* it will not zip past this point
|
|
267
|
+
*/
|
|
268
|
+
markZipStartPoint() {
|
|
269
|
+
this._zipStartPoint = this.clockSteps.length;
|
|
270
|
+
}
|
|
229
271
|
/**
|
|
230
272
|
* Scan all of the chits managed by this turn. If any of them have changed, group them together into a
|
|
231
273
|
* "ClockStep". If any new chits appear, then add them to our lookup. If any chits are deleted (orphaned),
|
|
232
274
|
* then we have to identify those as well.
|
|
233
275
|
*/
|
|
234
276
|
flush(force = false) {
|
|
235
|
-
const seenIds = new Set();
|
|
236
277
|
const newStates = {};
|
|
237
278
|
let sawChange = force;
|
|
238
|
-
//
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
c.id = `${this.id}.${type}.${counter}`;
|
|
251
|
-
c.lock(this);
|
|
252
|
-
const existing = this.chitLookup[c.id];
|
|
253
|
-
this.chitLookup[c.id] = c; // it's possible that this is kicking out an "old" version of this chit from a previous pass
|
|
254
|
-
if (existing) {
|
|
255
|
-
existing.removeFromParent(); // do not want to leave stray references to this cloned chit around!
|
|
256
|
-
existing.unlock(this);
|
|
257
|
-
}
|
|
258
|
-
});
|
|
259
|
-
// now (once per chit) we serialize the state if it changed
|
|
260
|
-
Chit.walk(this.chitsToLock, (c) => {
|
|
261
|
-
if (!c.id) {
|
|
262
|
-
throw new Error("Should not be possible unless Chit.walk is misbehaving");
|
|
279
|
+
// 1. Assign IDs to pending new chits and their children
|
|
280
|
+
if (this.pendingNewChits.size > 0) {
|
|
281
|
+
// collect all chits needing IDs by walking each new chit's subtree
|
|
282
|
+
const chitsToAddIdsTo = [];
|
|
283
|
+
for (const c of this.pendingNewChits) {
|
|
284
|
+
if (!c.parent)
|
|
285
|
+
continue; // created then deleted before flush — skip
|
|
286
|
+
c.walk((child) => {
|
|
287
|
+
if (!child.id) {
|
|
288
|
+
chitsToAddIdsTo.push(child);
|
|
289
|
+
}
|
|
290
|
+
});
|
|
263
291
|
}
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
292
|
+
this.pendingNewChits.clear();
|
|
293
|
+
chitsToAddIdsTo.sort((a, b) => a.createdOrder - b.createdOrder);
|
|
294
|
+
for (const c of chitsToAddIdsTo) {
|
|
295
|
+
if (c.id)
|
|
296
|
+
continue; // may have been assigned by a prior iteration
|
|
297
|
+
const type = c.chitTypeName();
|
|
298
|
+
const counter = (this.newChitCounter[type] || 0) + 1;
|
|
299
|
+
this.newChitCounter[type] = counter;
|
|
300
|
+
c.id = `${this.id}.${type}.${counter}`;
|
|
301
|
+
c.lock(this);
|
|
302
|
+
const existing = this.chitLookup[c.id];
|
|
303
|
+
this.chitLookup[c.id] = c;
|
|
304
|
+
if (existing) {
|
|
305
|
+
existing.removeFromParent();
|
|
306
|
+
existing.unlock(this);
|
|
274
307
|
}
|
|
308
|
+
this.dirtyChitIds.add(c.id);
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
// 2. Serialize only dirty chits
|
|
312
|
+
for (const id of this.dirtyChitIds) {
|
|
313
|
+
const chit = this.chitLookup[id];
|
|
314
|
+
if (!chit)
|
|
315
|
+
continue;
|
|
316
|
+
const lastState = this.lastChitStates[id];
|
|
317
|
+
const serialized = this.internState(chit.serialize(this._playerIds), lastState);
|
|
318
|
+
if (serialized !== lastState) {
|
|
319
|
+
this.lastChitStates[id] = newStates[id] = serialized;
|
|
320
|
+
sawChange = true;
|
|
275
321
|
}
|
|
276
322
|
else {
|
|
277
|
-
|
|
323
|
+
newStates[id] = serialized;
|
|
278
324
|
}
|
|
279
|
-
}
|
|
280
|
-
|
|
281
|
-
//
|
|
282
|
-
const
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
325
|
+
}
|
|
326
|
+
this.dirtyChitIds.clear();
|
|
327
|
+
// 4. Carry forward all non-dirty chit states
|
|
328
|
+
for (const id of Object.keys(this.lastChitStates)) {
|
|
329
|
+
if (newStates[id] === undefined) {
|
|
330
|
+
newStates[id] = this.lastChitStates[id];
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
// 5. Detect deleted chits — orphans in lastChitStates that weren't serialized above
|
|
334
|
+
const deletedRoots = [];
|
|
335
|
+
for (const id of Object.keys(this.lastChitStates)) {
|
|
336
|
+
if (this.lastChitStates[id] === Chit.deletedIfSerialized())
|
|
337
|
+
continue;
|
|
338
|
+
const chit = this.chitLookup[id];
|
|
339
|
+
if (chit && !chit.parent && !this.chitsToLock.includes(chit)) {
|
|
340
|
+
deletedRoots.push(chit);
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
for (const chit of deletedRoots) {
|
|
295
344
|
if (chit.id) {
|
|
296
345
|
sawChange = true;
|
|
297
346
|
chit.unlock(this);
|
|
298
347
|
newStates[chit.id] = Chit.deletedIfSerialized();
|
|
299
|
-
|
|
348
|
+
this.lastChitStates[chit.id] = Chit.deletedIfSerialized();
|
|
349
|
+
// walk only the deleted subtree to mark descendants as deleted
|
|
300
350
|
chit.walk((c) => {
|
|
301
351
|
if (c.id) {
|
|
302
|
-
seenIds.add(c.id);
|
|
303
352
|
this.lastChitStates[c.id] = Chit.deletedIfSerialized();
|
|
304
353
|
newStates[c.id] = Chit.deletedIfSerialized();
|
|
305
354
|
chit.unlock(this);
|
|
306
355
|
}
|
|
307
356
|
});
|
|
308
357
|
}
|
|
309
|
-
});
|
|
310
|
-
// any chits remaining that we haven't seen are bad news - they have likely been reparented to some other Turn, which
|
|
311
|
-
// is against the rules. They need to remain under this turns control.
|
|
312
|
-
if (chitsToDelete.find((c) => c.id && !seenIds.has(c.id))) {
|
|
313
|
-
throw new Error("Chit has been reparented to another Turn which will corrupt control");
|
|
314
358
|
}
|
|
315
359
|
if (sawChange) {
|
|
316
360
|
// flushing any changes while there are active subturns makes timelines *VERY* difficult
|
|
@@ -970,6 +1014,13 @@ export class Turn {
|
|
|
970
1014
|
}
|
|
971
1015
|
});
|
|
972
1016
|
this.lastChitStates = { ...this.lockedChitStates }; // reset our known chit states
|
|
1017
|
+
this.dirtyChitIds.clear();
|
|
1018
|
+
this.pendingNewChits.clear();
|
|
1019
|
+
// chits were deserialized back to locked state — mark them clean so future
|
|
1020
|
+
// modifications correctly trigger markDirty() → notifyChitDirty()
|
|
1021
|
+
Chit.walk(this.chitsToLock, (c) => {
|
|
1022
|
+
c._dirty = false;
|
|
1023
|
+
});
|
|
973
1024
|
this.clockSteps = [];
|
|
974
1025
|
this.decisionIndex = 0;
|
|
975
1026
|
this.newChitCounter = {};
|