@gamepark/react-game 6.24.1 → 6.24.2
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/dist/components/PlayerPanel/Counters.d.ts +13 -0
- package/dist/components/PlayerPanel/Counters.js +44 -0
- package/dist/components/PlayerPanel/Counters.js.map +1 -0
- package/dist/components/PlayerPanel/StyledPlayerPanel.d.ts +4 -2
- package/dist/components/PlayerPanel/StyledPlayerPanel.js +30 -25
- package/dist/components/PlayerPanel/StyledPlayerPanel.js.map +1 -1
- package/dist/components/PlayerPanel/index.d.ts +1 -0
- package/dist/components/PlayerPanel/index.js +1 -0
- package/dist/components/PlayerPanel/index.js.map +1 -1
- package/dist/components/material/GameTable/ItemDisplay.js +2 -2
- package/dist/components/material/GameTable/ItemDisplay.js.map +1 -1
- package/dist/components/material/GameTable/focus/LocationsWithFocus.d.ts +3 -2
- package/dist/components/material/GameTable/focus/LocationsWithFocus.js +10 -3
- package/dist/components/material/GameTable/focus/LocationsWithFocus.js.map +1 -1
- package/dist/components/material/animations/CreateItemAnimations.js +5 -3
- package/dist/components/material/animations/CreateItemAnimations.js.map +1 -1
- package/dist/components/material/animations/DeleteItemAnimations.js +7 -5
- package/dist/components/material/animations/DeleteItemAnimations.js.map +1 -1
- package/dist/components/material/animations/ItemAnimations.d.ts +2 -1
- package/dist/components/material/animations/ItemAnimations.js +9 -0
- package/dist/components/material/animations/ItemAnimations.js.map +1 -1
- package/dist/components/material/animations/MoveItemAnimations.d.ts +1 -2
- package/dist/components/material/animations/MoveItemAnimations.js +8 -19
- package/dist/components/material/animations/MoveItemAnimations.js.map +1 -1
- package/dist/components/material/animations/MoveItemAtOnceAnimations.d.ts +1 -2
- package/dist/components/material/animations/MoveItemAtOnceAnimations.js +8 -19
- package/dist/components/material/animations/MoveItemAtOnceAnimations.js.map +1 -1
- package/dist/components/material/animations/RollItemAnimations.d.ts +1 -2
- package/dist/components/material/animations/RollItemAnimations.js +1 -10
- package/dist/components/material/animations/RollItemAnimations.js.map +1 -1
- package/dist/components/material/animations/adjustRotation.d.ts +1 -1
- package/dist/components/material/animations/adjustRotation.js +60 -19
- package/dist/components/material/animations/adjustRotation.js.map +1 -1
- package/dist/components/material/animations/rotations.utils.d.ts +2 -0
- package/dist/components/material/animations/rotations.utils.js +99 -0
- package/dist/components/material/animations/rotations.utils.js.map +1 -0
- package/dist/components/material/locations/DropAreaDescription.d.ts +1 -1
- package/dist/components/material/locations/DropAreaDescription.js +8 -1
- package/dist/components/material/locations/DropAreaDescription.js.map +1 -1
- package/dist/components/material/locations/LocationsMask.d.ts +2 -1
- package/dist/components/material/locations/LocationsMask.js +2 -2
- package/dist/components/material/locations/LocationsMask.js.map +1 -1
- package/dist/hooks/usePlayers.js +14 -1
- package/dist/hooks/usePlayers.js.map +1 -1
- package/dist/locators/LineLocator.d.ts +8 -8
- package/dist/locators/LineLocator.js +30 -22
- package/dist/locators/LineLocator.js.map +1 -1
- package/dist/locators/Locator.js +3 -2
- package/dist/locators/Locator.js.map +1 -1
- package/dist/locators/PileLocator.d.ts +1 -2
- package/dist/locators/PileLocator.js +19 -18
- package/dist/locators/PileLocator.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoveItemAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/MoveItemAnimations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MoveItemAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/MoveItemAnimations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Interpolation, Theme } from '@emotion/react';
|
|
2
2
|
import { Animation } from '@gamepark/react-client';
|
|
3
|
-
import {
|
|
3
|
+
import { MaterialItem, MoveItemsAtOnce } from '@gamepark/rules-api';
|
|
4
4
|
import { ItemContext } from '../../../locators';
|
|
5
5
|
import { ItemAnimations } from './ItemAnimations';
|
|
6
6
|
export declare class MoveItemAtOnceAnimations<P extends number = number, M extends number = number, L extends number = number> extends ItemAnimations<P, M, L> {
|
|
@@ -10,5 +10,4 @@ export declare class MoveItemAtOnceAnimations<P extends number = number, M exten
|
|
|
10
10
|
getItemAnimation(context: ItemContext<P, M, L>, animation: Animation<MoveItemsAtOnce<P, M, L>>): Interpolation<Theme>;
|
|
11
11
|
getMovedItemAnimation(context: ItemContext<P, M, L>, animation: Animation<MoveItemsAtOnce<P, M, L>>): Interpolation<Theme>;
|
|
12
12
|
getChildItemAnimation(item: MaterialItem<P, L>, context: ItemContext<P, M, L>, animation: Animation<MoveItemsAtOnce<P, M, L>>): Interpolation<Theme>;
|
|
13
|
-
protected getKeyframes(origin: string, destination: string, _animation: Animation<ItemMove<P, M, L>>, _context: ItemContext<P, M, L>): import("@emotion/serialize").Keyframes;
|
|
14
13
|
}
|
|
@@ -14,10 +14,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
18
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
19
|
-
return cooked;
|
|
20
|
-
};
|
|
21
17
|
var __assign = (this && this.__assign) || function () {
|
|
22
18
|
__assign = Object.assign || function(t) {
|
|
23
19
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
@@ -31,10 +27,9 @@ var __assign = (this && this.__assign) || function () {
|
|
|
31
27
|
};
|
|
32
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
29
|
exports.MoveItemAtOnceAnimations = void 0;
|
|
34
|
-
var react_1 = require("@emotion/react");
|
|
35
|
-
var adjustRotation_1 = require("./adjustRotation");
|
|
36
30
|
var ItemAnimations_1 = require("./ItemAnimations");
|
|
37
31
|
var itemMovementCss_util_1 = require("./itemMovementCss.util");
|
|
32
|
+
var rotations_utils_1 = require("./rotations.utils");
|
|
38
33
|
var transformItem_util_1 = require("./transformItem.util");
|
|
39
34
|
var MoveItemAtOnceAnimations = (function (_super) {
|
|
40
35
|
__extends(MoveItemAtOnceAnimations, _super);
|
|
@@ -60,11 +55,10 @@ var MoveItemAtOnceAnimations = (function (_super) {
|
|
|
60
55
|
futureRules.play(animation.move);
|
|
61
56
|
var futureItem = futureRules.material(type).getItem(context.index);
|
|
62
57
|
var futureContext = __assign(__assign({}, context), { rules: futureRules, index: context.index, displayIndex: context.displayIndex });
|
|
63
|
-
var
|
|
64
|
-
var
|
|
65
|
-
|
|
66
|
-
var
|
|
67
|
-
var animationKeyframes = this.getKeyframes(sourceTransform, futureTransform, animation, context);
|
|
58
|
+
var originTransforms = (0, rotations_utils_1.toSingleRotation)((0, transformItem_util_1.transformItem)(context));
|
|
59
|
+
var targetTransforms = (0, rotations_utils_1.toSingleRotation)((_b = (_a = material[type]) === null || _a === void 0 ? void 0 : _a.getItemTransform(futureItem, futureContext)) !== null && _b !== void 0 ? _b : []);
|
|
60
|
+
(0, rotations_utils_1.toClosestRotations)(originTransforms, targetTransforms);
|
|
61
|
+
var animationKeyframes = this.getTransformKeyframes(originTransforms.join(' '), targetTransforms.join(' '), animation, context);
|
|
68
62
|
return (0, itemMovementCss_util_1.movementAnimationCss)(animationKeyframes, animation.duration);
|
|
69
63
|
};
|
|
70
64
|
MoveItemAtOnceAnimations.prototype.getChildItemAnimation = function (item, context, animation) {
|
|
@@ -74,18 +68,13 @@ var MoveItemAtOnceAnimations = (function (_super) {
|
|
|
74
68
|
var futureRules = new Rules(JSON.parse(JSON.stringify(rules.game)), { player: player });
|
|
75
69
|
futureRules.play(animation.move);
|
|
76
70
|
var futureContext = __assign(__assign({}, context), { rules: futureRules });
|
|
77
|
-
var
|
|
78
|
-
var sourceTransform = sourceTransforms.join(' ');
|
|
71
|
+
var originTransforms = (0, transformItem_util_1.transformItem)(context);
|
|
79
72
|
var targetTransforms = (_b = (_a = material[type]) === null || _a === void 0 ? void 0 : _a.getItemTransform(item, futureContext)) !== null && _b !== void 0 ? _b : [];
|
|
80
|
-
|
|
81
|
-
var animationKeyframes = this.
|
|
73
|
+
(0, rotations_utils_1.toClosestRotations)(originTransforms, targetTransforms);
|
|
74
|
+
var animationKeyframes = this.getTransformKeyframes(originTransforms.join(' '), targetTransforms.join(' '), animation, context);
|
|
82
75
|
return (0, itemMovementCss_util_1.movementAnimationCss)(animationKeyframes, animation.duration);
|
|
83
76
|
};
|
|
84
|
-
MoveItemAtOnceAnimations.prototype.getKeyframes = function (origin, destination, _animation, _context) {
|
|
85
|
-
return (0, react_1.keyframes)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n from {\n transform: ", ";\n }\n to {\n transform: ", ";\n }\n "], ["\n from {\n transform: ", ";\n }\n to {\n transform: ", ";\n }\n "])), origin, destination);
|
|
86
|
-
};
|
|
87
77
|
return MoveItemAtOnceAnimations;
|
|
88
78
|
}(ItemAnimations_1.ItemAnimations));
|
|
89
79
|
exports.MoveItemAtOnceAnimations = MoveItemAtOnceAnimations;
|
|
90
|
-
var templateObject_1;
|
|
91
80
|
//# sourceMappingURL=MoveItemAtOnceAnimations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MoveItemAtOnceAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/MoveItemAtOnceAnimations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MoveItemAtOnceAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/MoveItemAtOnceAnimations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Interpolation, Theme } from '@emotion/react';
|
|
2
2
|
import { Animation } from '@gamepark/react-client';
|
|
3
|
-
import { CreateItem,
|
|
3
|
+
import { CreateItem, RollItem } from '@gamepark/rules-api';
|
|
4
4
|
import { ItemContext } from '../../../locators';
|
|
5
5
|
import { ItemAnimations } from './ItemAnimations';
|
|
6
6
|
import { MaterialGameAnimationContext } from './MaterialGameAnimations';
|
|
@@ -10,5 +10,4 @@ export declare class RollItemAnimations<P extends number = number, M extends num
|
|
|
10
10
|
getPreDuration(_move: CreateItem<P, M, L>, _context: MaterialGameAnimationContext<P, M, L>): number;
|
|
11
11
|
getItemAnimation(context: ItemContext<P, M, L>, animation: Animation<RollItem<P, M, L>>): Interpolation<Theme>;
|
|
12
12
|
getRolledItemAnimation(context: ItemContext<P, M, L>, animation: Animation<RollItem<P, M, L>>): Interpolation<Theme>;
|
|
13
|
-
protected getKeyframes(origin: string, destination: string, _animation: Animation<ItemMove<P, M, L>>, _context: ItemContext<P, M, L>): import("@emotion/serialize").Keyframes;
|
|
14
13
|
}
|
|
@@ -14,10 +14,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
-
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
|
|
18
|
-
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
|
|
19
|
-
return cooked;
|
|
20
|
-
};
|
|
21
17
|
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
22
18
|
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
23
19
|
if (ar || !(i in from)) {
|
|
@@ -29,7 +25,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
29
25
|
};
|
|
30
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
27
|
exports.RollItemAnimations = void 0;
|
|
32
|
-
var react_1 = require("@emotion/react");
|
|
33
28
|
var ItemAnimations_1 = require("./ItemAnimations");
|
|
34
29
|
var itemMovementCss_util_1 = require("./itemMovementCss.util");
|
|
35
30
|
var transformItem_util_1 = require("./transformItem.util");
|
|
@@ -61,12 +56,9 @@ var RollItemAnimations = (function (_super) {
|
|
|
61
56
|
addMissingOperations(sourceTransforms, futureTransforms);
|
|
62
57
|
var sourceTransform = __spreadArray(__spreadArray([], sourceTransforms, true), ['rotate3d(-1, -1, 0, 0)'], false).join(' ');
|
|
63
58
|
var futureTransform = __spreadArray(__spreadArray([], futureTransforms, true), ['rotate3d(-1, -1, 0, 1800deg)'], false).join(' ');
|
|
64
|
-
var animationKeyframes = this.
|
|
59
|
+
var animationKeyframes = this.getTransformKeyframes(sourceTransform, futureTransform, animation, context);
|
|
65
60
|
return (0, itemMovementCss_util_1.movementAnimationCss)(animationKeyframes, animation.duration);
|
|
66
61
|
};
|
|
67
|
-
RollItemAnimations.prototype.getKeyframes = function (origin, destination, _animation, _context) {
|
|
68
|
-
return (0, react_1.keyframes)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n from {\n transform: ", ";\n }\n to {\n transform: ", ";\n }\n "], ["\n from {\n transform: ", ";\n }\n to {\n transform: ", ";\n }\n "])), origin, destination);
|
|
69
|
-
};
|
|
70
62
|
return RollItemAnimations;
|
|
71
63
|
}(ItemAnimations_1.ItemAnimations));
|
|
72
64
|
exports.RollItemAnimations = RollItemAnimations;
|
|
@@ -108,5 +100,4 @@ function getNeutralTransform(transform) {
|
|
|
108
100
|
function isSimilarTransform(transform1, transform2) {
|
|
109
101
|
return ['rotate', 'translate', 'scale'].some(function (instruction) { return transform1.startsWith(instruction) && transform2.startsWith(instruction); });
|
|
110
102
|
}
|
|
111
|
-
var templateObject_1;
|
|
112
103
|
//# sourceMappingURL=RollItemAnimations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RollItemAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/RollItemAnimations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RollItemAnimations.js","sourceRoot":"","sources":["../../../../src/components/material/animations/RollItemAnimations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const adjustRotation: (
|
|
1
|
+
export declare const adjustRotation: (transforms: string[], _sourceTransforms?: string[]) => string[];
|
|
@@ -1,26 +1,67 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.adjustRotation = void 0;
|
|
4
|
-
var adjustRotation = function (
|
|
5
|
-
|
|
5
|
+
var adjustRotation = function (transforms, _sourceTransforms) {
|
|
6
|
+
var result = [];
|
|
7
|
+
var rotateZ = 0;
|
|
8
|
+
for (var _i = 0, transforms_1 = transforms; _i < transforms_1.length; _i++) {
|
|
9
|
+
var transform = transforms_1[_i];
|
|
10
|
+
var rotateZMatch = transform.match(/rotateZ?\((-?\d+\.?\d*)([^)]*)\)/);
|
|
11
|
+
if (rotateZMatch) {
|
|
12
|
+
rotateZ += convertAngle(parseFloat(rotateZMatch[1]), rotateZMatch[2]);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
if (Math.abs(rotateZ) % 360 === 0 || !transform.startsWith('translate')) {
|
|
16
|
+
result.push(transform);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
var values = getTranslateValues(transform);
|
|
20
|
+
if (!values)
|
|
21
|
+
result.push(transform);
|
|
22
|
+
else {
|
|
23
|
+
var x = values.x, y = values.y, z = values.z;
|
|
24
|
+
var cos = Math.cos(rotateZ);
|
|
25
|
+
var sin = Math.sin(rotateZ);
|
|
26
|
+
result.push("translate3d(".concat(cos * x - sin * y, "em, ").concat(cos * y + sin * x, "em, ").concat(z, "em)"));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
var radTurn = 2 * Math.PI;
|
|
32
|
+
var finalRotate = ((rotateZ % radTurn) + radTurn) % radTurn;
|
|
33
|
+
if (finalRotate)
|
|
34
|
+
result.push("rotateZ(".concat(finalRotate, "rad)"));
|
|
35
|
+
return result;
|
|
6
36
|
};
|
|
7
37
|
exports.adjustRotation = adjustRotation;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
38
|
+
function getTranslateValues(transform) {
|
|
39
|
+
var translate3d = transform.match(/translate3d\((-?\d+\.?\d*)em, (-?\d+\.?\d*)em, (-?\d+\.?\d*)em\)/);
|
|
40
|
+
if (translate3d) {
|
|
41
|
+
return { x: parseFloat(translate3d[1]), y: parseFloat(translate3d[2]), z: parseFloat(translate3d[3]) };
|
|
42
|
+
}
|
|
43
|
+
var translate = transform.match(/translate\((-?\d+\.?\d*)em, (-?\d+\.?\d*)em\)/);
|
|
44
|
+
if (translate) {
|
|
45
|
+
return { x: parseFloat(translate[1]), y: parseFloat(translate[2]), z: 0 };
|
|
46
|
+
}
|
|
47
|
+
var translateX = transform.match(/translateX?\((-?\d+\.?\d*)em\)/);
|
|
48
|
+
if (translateX) {
|
|
49
|
+
return { x: parseFloat(translateX[1]), y: 0, z: 0 };
|
|
50
|
+
}
|
|
51
|
+
var translateY = transform.match(/translateY\((-?\d+\.?\d*)em\)/);
|
|
52
|
+
if (translateY) {
|
|
53
|
+
return { x: 0, y: parseFloat(translateY[1]), z: 0 };
|
|
54
|
+
}
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
var angleUnitValue = (_a = {},
|
|
58
|
+
_a['deg'] = 360,
|
|
59
|
+
_a['grad'] = 400,
|
|
60
|
+
_a['rad'] = 2 * Math.PI,
|
|
61
|
+
_a['turn'] = 1,
|
|
62
|
+
_a);
|
|
63
|
+
var convertAngle = function (value, unit, targetUnit) {
|
|
64
|
+
if (targetUnit === void 0) { targetUnit = 'rad'; }
|
|
65
|
+
return unit === targetUnit ? value : value * angleUnitValue[targetUnit] / angleUnitValue[unit];
|
|
24
66
|
};
|
|
25
|
-
var getRotationDegrees = function (value, unit) { return unit === 'rad' ? value * 180 / Math.PI : value; };
|
|
26
67
|
//# sourceMappingURL=adjustRotation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adjustRotation.js","sourceRoot":"","sources":["../../../../src/components/material/animations/adjustRotation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adjustRotation.js","sourceRoot":"","sources":["../../../../src/components/material/animations/adjustRotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var _a;
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.toClosestRotations = exports.toSingleRotation = void 0;
|
|
5
|
+
var toSingleRotation = function (transforms) {
|
|
6
|
+
var result = [];
|
|
7
|
+
var rotateZ = 0;
|
|
8
|
+
for (var _i = 0, transforms_1 = transforms; _i < transforms_1.length; _i++) {
|
|
9
|
+
var transform = transforms_1[_i];
|
|
10
|
+
var rotateZMatch = transform.match(/rotateZ?\((-?\d+\.?\d*)([^)]*)\)/);
|
|
11
|
+
if (rotateZMatch) {
|
|
12
|
+
rotateZ += convertAngle(parseFloat(rotateZMatch[1]), rotateZMatch[2]);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
if (Math.abs(rotateZ) % 360 === 0 || !transform.startsWith('translate')) {
|
|
16
|
+
result.push(transform);
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
var values = getTranslateValues(transform);
|
|
20
|
+
if (!values)
|
|
21
|
+
result.push(transform);
|
|
22
|
+
else {
|
|
23
|
+
var x = values.x, y = values.y, z = values.z;
|
|
24
|
+
var cos = Math.cos(rotateZ);
|
|
25
|
+
var sin = Math.sin(rotateZ);
|
|
26
|
+
result.push("translate3d(".concat(cos * x - sin * y, "em, ").concat(cos * y + sin * x, "em, ").concat(z, "em)"));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
var radTurn = 2 * Math.PI;
|
|
32
|
+
var finalRotate = ((rotateZ % radTurn) + radTurn) % radTurn;
|
|
33
|
+
if (finalRotate)
|
|
34
|
+
result.push("rotateZ(".concat(finalRotate, "rad)"));
|
|
35
|
+
return result;
|
|
36
|
+
};
|
|
37
|
+
exports.toSingleRotation = toSingleRotation;
|
|
38
|
+
function getTranslateValues(transform) {
|
|
39
|
+
var translate3d = transform.match(/translate3d\((-?\d+\.?\d*)em, (-?\d+\.?\d*)em, (-?\d+\.?\d*)em\)/);
|
|
40
|
+
if (translate3d) {
|
|
41
|
+
return { x: parseFloat(translate3d[1]), y: parseFloat(translate3d[2]), z: parseFloat(translate3d[3]) };
|
|
42
|
+
}
|
|
43
|
+
var translate = transform.match(/translate\((-?\d+\.?\d*)em, (-?\d+\.?\d*)em\)/);
|
|
44
|
+
if (translate) {
|
|
45
|
+
return { x: parseFloat(translate[1]), y: parseFloat(translate[2]), z: 0 };
|
|
46
|
+
}
|
|
47
|
+
var translateX = transform.match(/translateX?\((-?\d+\.?\d*)em\)/);
|
|
48
|
+
if (translateX) {
|
|
49
|
+
return { x: parseFloat(translateX[1]), y: 0, z: 0 };
|
|
50
|
+
}
|
|
51
|
+
var translateY = transform.match(/translateY\((-?\d+\.?\d*)em\)/);
|
|
52
|
+
if (translateY) {
|
|
53
|
+
return { x: 0, y: parseFloat(translateY[1]), z: 0 };
|
|
54
|
+
}
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
var angleUnitValue = (_a = {},
|
|
58
|
+
_a['deg'] = 360,
|
|
59
|
+
_a['grad'] = 400,
|
|
60
|
+
_a['rad'] = 2 * Math.PI,
|
|
61
|
+
_a['turn'] = 1,
|
|
62
|
+
_a);
|
|
63
|
+
var convertAngle = function (value, unit, targetUnit) {
|
|
64
|
+
if (targetUnit === void 0) { targetUnit = 'rad'; }
|
|
65
|
+
return unit === targetUnit ? value : value * angleUnitValue[targetUnit] / angleUnitValue[unit];
|
|
66
|
+
};
|
|
67
|
+
var toClosestRotations = function (originTransforms, targetTransforms) {
|
|
68
|
+
var _a, _b;
|
|
69
|
+
var lastOriginAngle = 0;
|
|
70
|
+
var lastTargetAngle = 0;
|
|
71
|
+
for (var i = 0; i < Math.max(originTransforms.length, targetTransforms.length); i++) {
|
|
72
|
+
var originMatch = (_a = originTransforms[i]) === null || _a === void 0 ? void 0 : _a.match(/rotateZ?\((-?\d+\.?\d*)([^)]*)\)/);
|
|
73
|
+
if (originMatch) {
|
|
74
|
+
var originAngle = convertAngle(parseFloat(originMatch[1]), originMatch[2]);
|
|
75
|
+
var delta = Math.round((lastTargetAngle - originAngle) / (2 * Math.PI));
|
|
76
|
+
if (delta === 0) {
|
|
77
|
+
lastOriginAngle = originAngle;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
lastOriginAngle = originAngle + delta * 2 * Math.PI;
|
|
81
|
+
originTransforms[i] = "rotateZ(".concat(lastOriginAngle, "rad)");
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
var targetMatch = (_b = targetTransforms[i]) === null || _b === void 0 ? void 0 : _b.match(/rotateZ?\((-?\d+\.?\d*)([^)]*)\)/);
|
|
85
|
+
if (targetMatch) {
|
|
86
|
+
var targetAngle = convertAngle(parseFloat(targetMatch[1]), targetMatch[2]);
|
|
87
|
+
var delta = Math.round((lastOriginAngle - targetAngle) / (2 * Math.PI));
|
|
88
|
+
if (delta === 0) {
|
|
89
|
+
lastTargetAngle = targetAngle;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
lastTargetAngle = targetAngle + delta * 2 * Math.PI;
|
|
93
|
+
targetTransforms[i] = "rotateZ(".concat(lastTargetAngle, "rad)");
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
exports.toClosestRotations = toClosestRotations;
|
|
99
|
+
//# sourceMappingURL=rotations.utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rotations.utils.js","sourceRoot":"","sources":["../../../../src/components/material/animations/rotations.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ import { LocationDescription } from './LocationDescription';
|
|
|
5
5
|
export declare class DropAreaDescription<P extends number = number, M extends number = number, L extends number = number, Id = any> extends LocationDescription<P, M, L, Id> {
|
|
6
6
|
Component: ElementType;
|
|
7
7
|
canDrop(move: MaterialMove<P, M, L>, location: Location<P, L>, context: ItemContext<P, M, L>): boolean;
|
|
8
|
-
getBestDropMove(moves: MaterialMove<P, M, L>[],
|
|
8
|
+
getBestDropMove(moves: MaterialMove<P, M, L>[], location: Location<P, L>, context: ItemContext<P, M, L>): MaterialMove<P, M, L>;
|
|
9
9
|
}
|
|
@@ -14,9 +14,13 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
14
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
+
};
|
|
17
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
21
|
exports.DropAreaDescription = void 0;
|
|
19
22
|
var rules_api_1 = require("@gamepark/rules-api");
|
|
23
|
+
var isEqual_1 = __importDefault(require("lodash/isEqual"));
|
|
20
24
|
var LocationDescription_1 = require("./LocationDescription");
|
|
21
25
|
var SimpleDropArea_1 = require("./SimpleDropArea");
|
|
22
26
|
var DropAreaDescription = (function (_super) {
|
|
@@ -29,7 +33,10 @@ var DropAreaDescription = (function (_super) {
|
|
|
29
33
|
DropAreaDescription.prototype.canDrop = function (move, location, context) {
|
|
30
34
|
return this.isMoveToLocation(move, location, context);
|
|
31
35
|
};
|
|
32
|
-
DropAreaDescription.prototype.getBestDropMove = function (moves,
|
|
36
|
+
DropAreaDescription.prototype.getBestDropMove = function (moves, location, context) {
|
|
37
|
+
var exactMove = moves.find(function (move) { return (0, rules_api_1.isMoveItem)(move) && (0, isEqual_1.default)(location, move.location); });
|
|
38
|
+
if (exactMove)
|
|
39
|
+
return exactMove;
|
|
33
40
|
var moveWithSameRotation = moves.find(function (move) { var _a; return (0, rules_api_1.isMoveItem)(move) && move.location.rotation === ((_a = context.rules.material(move.itemType).getItem(move.itemIndex)) === null || _a === void 0 ? void 0 : _a.location.rotation); });
|
|
34
41
|
return moveWithSameRotation !== null && moveWithSameRotation !== void 0 ? moveWithSameRotation : moves[0];
|
|
35
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropAreaDescription.js","sourceRoot":"","sources":["../../../../src/components/material/locations/DropAreaDescription.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DropAreaDescription.js","sourceRoot":"","sources":["../../../../src/components/material/locations/DropAreaDescription.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,iDAAwE;AACxE,2DAAoC;AAGpC,6DAA2D;AAC3D,mDAAiD;AAEjD;IACU,uCAAgC;IAD1C;QAAA,qEAkBC;QAfC,eAAS,GAAgB,+BAAc,CAAA;;IAezC,CAAC;IAbC,qCAAO,GAAP,UAAQ,IAA2B,EAAE,QAAwB,EAAE,OAA6B;QAC1F,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IACvD,CAAC;IAED,6CAAe,GAAf,UAAgB,KAA8B,EAAE,QAAwB,EAAE,OAA6B;QACrG,IAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,IAAA,iBAAO,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EAApD,CAAoD,CAAC,CAAA;QAC5F,IAAI,SAAS;YAAE,OAAO,SAAS,CAAA;QAE/B,IAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAA,IAAI,YAC1C,OAAA,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,MAAK,MAAA,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,0CAAE,QAAQ,CAAC,QAAQ,CAAA,CAAA,EAAA,CAChI,CAAA;QACD,OAAO,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,KAAK,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC;IACH,0BAAC;AAAD,CAAC,AAlBD,CACU,yCAAmB,GAiB5B;AAlBY,kDAAmB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Location } from '@gamepark/rules-api';
|
|
2
2
|
export type LocationsMaskProps = {
|
|
3
3
|
locations: Location[];
|
|
4
|
+
borderRadius: number;
|
|
4
5
|
};
|
|
5
|
-
export declare const LocationsMask: ({ locations }: LocationsMaskProps) => JSX.Element;
|
|
6
|
+
export declare const LocationsMask: ({ borderRadius, locations }: LocationsMaskProps) => JSX.Element;
|
|
@@ -20,9 +20,9 @@ var uniqueId_1 = __importDefault(require("lodash/uniqueId"));
|
|
|
20
20
|
var react_1 = require("react");
|
|
21
21
|
var hooks_1 = require("../../../hooks");
|
|
22
22
|
var LocationsMask = function (_a) {
|
|
23
|
-
var locations = _a.locations;
|
|
23
|
+
var borderRadius = _a.borderRadius, locations = _a.locations;
|
|
24
24
|
var id = (0, react_1.useMemo)(function () { return (0, uniqueId_1.default)('mask'); }, []);
|
|
25
|
-
return ((0, jsx_runtime_1.jsxs)("svg", __assign({ width: "100%", height: "100%", style: { position: 'absolute' } }, { children: [(0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("mask", __assign({ id: id }, { children: [(0, jsx_runtime_1.jsx)("rect", { width: "100%", height: "100%", fill: "white" }), locations.map(function (location) { return (0, jsx_runtime_1.jsx)(LocationRect, { location: location }, JSON.stringify(location)); })] })) }), (0, jsx_runtime_1.jsx)("rect", { width: "100%", height: "100%", fill: "black", fillOpacity: 0.5, mask: "url(#".concat(id, ")") })] })));
|
|
25
|
+
return ((0, jsx_runtime_1.jsxs)("svg", __assign({ width: "100%", height: "100%", style: { position: 'absolute', borderRadius: borderRadius + 'em' } }, { children: [(0, jsx_runtime_1.jsx)("defs", { children: (0, jsx_runtime_1.jsxs)("mask", __assign({ id: id }, { children: [(0, jsx_runtime_1.jsx)("rect", { width: "100%", height: "100%", fill: "white" }), locations.map(function (location) { return (0, jsx_runtime_1.jsx)(LocationRect, { location: location }, JSON.stringify(location)); })] })) }), (0, jsx_runtime_1.jsx)("rect", { width: "100%", height: "100%", fill: "black", fillOpacity: 0.5, mask: "url(#".concat(id, ")") })] })));
|
|
26
26
|
};
|
|
27
27
|
exports.LocationsMask = LocationsMask;
|
|
28
28
|
var LocationRect = function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocationsMask.js","sourceRoot":"","sources":["../../../../src/components/material/locations/LocationsMask.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,6DAAsC;AACtC,+BAA+B;AAC/B,wCAAmE;
|
|
1
|
+
{"version":3,"file":"LocationsMask.js","sourceRoot":"","sources":["../../../../src/components/material/locations/LocationsMask.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AACA,6DAAsC;AACtC,+BAA+B;AAC/B,wCAAmE;AAO5D,IAAM,aAAa,GAAG,UAAC,EAA+C;QAA7C,YAAY,kBAAA,EAAE,SAAS,eAAA;IACrD,IAAM,EAAE,GAAG,IAAA,eAAO,EAAC,cAAM,OAAA,IAAA,kBAAQ,EAAC,MAAM,CAAC,EAAhB,CAAgB,EAAE,EAAE,CAAC,CAAA;IAC9C,OAAO,CACL,0CAAK,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,EAAE,iBAChG,2CACE,2CAAM,EAAE,EAAE,EAAE,iBACV,iCAAM,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,IAAI,EAAC,OAAO,GAAE,EAC9C,SAAS,CAAC,GAAG,CAAC,UAAA,QAAQ,IAAI,OAAA,uBAAC,YAAY,IAAgC,QAAQ,EAAE,QAAQ,IAA5C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAuB,EAAlE,CAAkE,CAAC,KACzF,GACF,EACP,iCAAM,KAAK,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,IAAI,EAAC,OAAO,EAAC,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,EAAE,MAAG,GAAG,KAClF,CACP,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAMD,IAAM,YAAY,GAAG,UAAC,EAA+B;;QAA7B,QAAQ,cAAA;IAC9B,IAAM,OAAO,GAAG,IAAA,sBAAc,EAAC,QAAQ,CAAC,IAAI,CAAE,CAAA;IAC9C,IAAM,OAAO,GAAG,IAAA,0BAAkB,GAAE,CAAA;IACpC,IAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAE,CAAA;IACtE,IAAM,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzD,IAAA,KAAoB,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAhE,KAAK,WAAA,EAAE,MAAM,YAAmD,CAAA;IACxE,IAAM,MAAM,GAAG,MAAA,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAA;IAC5D,IAAM,UAAU,GAAa,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAChF,OAAO,CACL,iCAAM,IAAI,EAAC,OAAO,EAAC,CAAC,EAAE,UAAG,QAAQ,CAAC,CAAC,MAAG,EAAE,CAAC,EAAE,UAAG,QAAQ,CAAC,CAAC,MAAG,EAAE,KAAK,EAAE,UAAG,KAAK,OAAI,EAAE,MAAM,EAAE,UAAG,MAAM,OAAI,EAAE,EAAE,EAAE,UAAG,MAAM,OAAI,EAAE,EAAE,EAAE,UAAG,MAAM,OAAI,EACvI,KAAK,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,CACzG,CAAA;AACH,CAAC,CAAA"}
|
package/dist/hooks/usePlayers.js
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
3
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
4
|
+
if (ar || !(i in from)) {
|
|
5
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
6
|
+
ar[i] = from[i];
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
@@ -12,7 +21,11 @@ var react_1 = require("react");
|
|
|
12
21
|
var usePlayers = function (options) {
|
|
13
22
|
var now = (0, useNow_1.useNow)({ standby: !(options === null || options === void 0 ? void 0 : options.withTimeUpdate) });
|
|
14
23
|
var playerId = (0, usePlayerId_1.usePlayerId)();
|
|
15
|
-
var rawPlayers = (0, react_redux_1.useSelector)(function (state) { return state.players; });
|
|
24
|
+
var rawPlayers = __spreadArray([], (0, react_redux_1.useSelector)(function (state) { return state.players; }), true);
|
|
25
|
+
var playerIds = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.state) === null || _a === void 0 ? void 0 : _a.players; });
|
|
26
|
+
if (Array.isArray(playerIds)) {
|
|
27
|
+
rawPlayers.sort(function (a, b) { return playerIds.indexOf(a.id) - playerIds.indexOf(b.id); });
|
|
28
|
+
}
|
|
16
29
|
var players = (0, react_1.useMemo)(function () {
|
|
17
30
|
var index = rawPlayers.findIndex(function (player) { return player.id === playerId; });
|
|
18
31
|
if (!(options === null || options === void 0 ? void 0 : options.sortFromMe) || index < 1)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePlayers.js","sourceRoot":"","sources":["../../src/hooks/usePlayers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"usePlayers.js","sourceRoot":"","sources":["../../src/hooks/usePlayers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gDAA2B;AAC3B,2CAAyC;AACzC,mCAAiC;AACjC,6CAA2C;AAC3C,+BAA+B;AAQxB,IAAM,UAAU,GAAG,UAAiB,OAAiB;IAC1D,IAAM,GAAG,GAAG,IAAA,eAAM,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAAA,EAAE,CAAC,CAAA;IACzD,IAAM,QAAQ,GAAG,IAAA,yBAAW,GAAY,CAAA;IACxC,IAAM,UAAU,qBAAO,IAAA,yBAAW,EAAC,UAAC,KAAwC,IAAK,OAAA,KAAK,CAAC,OAAO,EAAb,CAAa,CAAC,OAAC,CAAA;IAChG,IAAM,SAAS,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAwC,YAAK,OAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,OAAO,CAAA,EAAA,CAAC,CAAA;IACjG,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAjD,CAAiD,CAAC,CAAA;KAC7E;IACD,IAAM,OAAO,GAAG,IAAA,eAAO,EAAC;QACtB,IAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,EAAE,KAAK,QAAQ,EAAtB,CAAsB,CAAC,CAAA;QACpE,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAA,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO,UAAU,CAAA;QACxD,OAAO,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IACnE,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;IAE1B,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,KAAI,OAAO,CAAC,KAAK,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,EAAX,CAAW,CAAC,EAAE;QACnE,OAAO,IAAA,eAAO,EAAC,OAAO,EAAE,UAAA,KAAK,IAAI,OAAA,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,EAA7B,CAA6B,CAAC,CAAA;KAChE;SAAM;QACL,OAAO,OAAO,CAAA;KACf;AACH,CAAC,CAAA;AAnBY,QAAA,UAAU,cAmBtB;AAEM,IAAM,SAAS,GAAG,UAAiB,QAAmB,EAAE,EAAuD;QAAvD,qBAA8B,EAAE,cAAc,EAAE,KAAK,EAAE,KAAA,EAArD,cAAc,oBAAA;IAC7E,IAAM,eAAe,GAAG,IAAA,yBAAW,GAAE,CAAA;IACrC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,eAAe,CAAA;IACtC,IAAI,OAAO,GAAG,IAAA,yBAAW,EAAC,UAAC,KAAwC,IAAK,OAAA,KAAK,CAAC,OAAO,EAAb,CAAa,CAAC,CAAA;IACtF,IAAM,OAAO,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,UAAA,MAAM,YAAI,OAAA,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAA,CAAA,EAAA,CAAC,CAAA;IACjF,IAAM,GAAG,GAAG,IAAA,eAAM,EAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,EAAX,CAAW,CAAC,EAAE;QACpD,OAAO,GAAG,IAAA,eAAO,EAAC,OAAO,EAAE,UAAA,KAAK,IAAI,OAAA,iBAAiB,CAAC,KAAK,EAAE,GAAG,CAAC,EAA7B,CAA6B,CAAC,CAAA;KACnE;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,EAAE,KAAK,QAAQ,EAAtB,CAAsB,CAAC,CAAA;AACvD,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAED,IAAM,iBAAiB,GAAG,UAAW,OAA2B,EAAE,GAAW;IAC3E,IAAM,aAAa,GAAuB,OAAO,CAAC,MAAM,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAK,CAAC,OAAO,EAApB,CAAoB,CAAC,CAAA;IACxF,IAAI,aAAa,CAAC,MAAM,EAAE;QACxB,IAAM,uBAAuB,GAAW,OAAO,CAAC,MAAM,CAAC,UAAC,WAAW,EAAE,MAAM,IAAK,OAAA,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAK,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,EAAhE,CAAgE,EAAE,QAAQ,CAAC,CAAA;QAC3J,IAAM,mBAAiB,GAAG,uBAAuB,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;QAC3F,IAAM,kBAAgB,GAAG,uBAAuB,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAA;QACjH,OAAO,CAAC,OAAO,CAAC,UAAA,MAAM;YACpB,IAAM,6BAA6B,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAK,CAAC,UAAU,CAAC,CAAA;YAC/E,IAAI,MAAM,CAAC,IAAK,CAAC,OAAO,EAAE;gBACxB,IAAI,MAAM,CAAC,IAAK,CAAC,aAAa,KAAK,IAAI,EAAE;oBACvC,MAAM,CAAC,IAAK,CAAC,aAAa,IAAI,6BAA6B,CAAA;iBAC5D;gBACD,MAAM,CAAC,IAAK,CAAC,iBAAiB,IAAI,6BAA6B,CAAA;gBAC/D,MAAM,CAAC,IAAK,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAK,CAAC,eAAe,EAAE,6BAA6B,CAAC,CAAA;gBACpG,MAAM,CAAC,IAAK,CAAC,sBAAsB,IAAI,mBAAiB,CAAA;gBACxD,MAAM,CAAC,IAAK,CAAC,qBAAqB,IAAI,kBAAgB,CAAA;aACvD;iBAAM;gBACL,MAAM,CAAC,IAAK,CAAC,iBAAiB,IAAI,6BAA6B,CAAA;gBAC/D,MAAM,CAAC,IAAK,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAK,CAAC,eAAe,EAAE,6BAA6B,CAAC,CAAA;aACrG;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAA"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Coordinates,
|
|
2
|
-
import { ItemContext,
|
|
3
|
-
export declare abstract class LineLocator<P extends number = number, M extends number = number, L extends number = number> extends
|
|
4
|
-
|
|
5
|
-
getLocationCoordinates(location: Location<P, L>, context: MaterialContext<P, M, L>, index?: number): Coordinates;
|
|
6
|
-
getItemCoordinates(item: MaterialItem<P, L>, context: ItemContext<P, M, L>): Coordinates;
|
|
1
|
+
import { Coordinates, MaterialItem } from '@gamepark/rules-api';
|
|
2
|
+
import { ItemContext, ItemLocator } from './ItemLocator';
|
|
3
|
+
export declare abstract class LineLocator<P extends number = number, M extends number = number, L extends number = number> extends ItemLocator<P, M, L> {
|
|
4
|
+
getPosition(item: MaterialItem<P, L>, context: ItemContext<P, M, L>): Coordinates;
|
|
7
5
|
getDeltaValue(delta: number | undefined, max: number | undefined, count: number): number;
|
|
6
|
+
coordinates: Coordinates;
|
|
7
|
+
getCoordinates(_item: MaterialItem<P, L>, _context: ItemContext<P, M, L>): Coordinates;
|
|
8
8
|
delta?: Partial<Coordinates>;
|
|
9
|
-
getDelta(
|
|
9
|
+
getDelta(_item: MaterialItem<P, L>, _context: ItemContext<P, M, L>): Partial<Coordinates>;
|
|
10
10
|
deltaMax?: Partial<Coordinates>;
|
|
11
|
-
getDeltaMax(
|
|
11
|
+
getDeltaMax(_item: MaterialItem<P, L>, _context: ItemContext<P, M, L>): Partial<Coordinates>;
|
|
12
12
|
}
|