ttpg-darrell 1.1.74 → 1.1.76
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/build/cjs/lib/layout-objects/layout-objects.js +5 -1
- package/build/cjs/lib/layout-objects/layout-objects.js.map +1 -1
- package/build/cjs/lib/swap-split-combine/swap-split-combine.d.ts +2 -0
- package/build/cjs/lib/swap-split-combine/swap-split-combine.js +14 -0
- package/build/cjs/lib/swap-split-combine/swap-split-combine.js.map +1 -1
- package/build/esm/lib/layout-objects/layout-objects.js +5 -1
- package/build/esm/lib/layout-objects/layout-objects.js.map +1 -1
- package/build/esm/lib/swap-split-combine/swap-split-combine.d.ts +2 -0
- package/build/esm/lib/swap-split-combine/swap-split-combine.js +14 -0
- package/build/esm/lib/swap-split-combine/swap-split-combine.js.map +1 -1
- package/package.json +1 -1
|
@@ -136,7 +136,11 @@ class LayoutObjects {
|
|
|
136
136
|
const currentRotation = true;
|
|
137
137
|
const includeGeometry = false;
|
|
138
138
|
const extent = child.getExtent(currentRotation, includeGeometry);
|
|
139
|
-
|
|
139
|
+
const scale = child.getScale();
|
|
140
|
+
childSize = {
|
|
141
|
+
w: extent.y * 2 * scale.y,
|
|
142
|
+
h: extent.x * 2 * scale.x,
|
|
143
|
+
};
|
|
140
144
|
// Restore UIs.
|
|
141
145
|
for (const ui of uis) {
|
|
142
146
|
child.addUI(ui);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout-objects.js","sourceRoot":"","sources":["../../../../src/lib/layout-objects/layout-objects.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"layout-objects.js","sourceRoot":"","sources":["../../../../src/lib/layout-objects/layout-objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,13 @@ export declare class SwapSplitCombine implements IGlobal {
|
|
|
26
26
|
private readonly _playerSlotToInProgressObjIdSet;
|
|
27
27
|
private readonly _overrideCreate;
|
|
28
28
|
private readonly _overrideDestroy;
|
|
29
|
+
private readonly _overideSupplyCount;
|
|
29
30
|
private readonly _primaryActionHandler;
|
|
30
31
|
private readonly _objectCreatedHandler;
|
|
31
32
|
constructor(rules: Array<SwapSplitCombineRule>, spawn: Spawn);
|
|
32
33
|
addOverrideCreate(nsid: string, create: (player: Player) => GameObject | undefined): this;
|
|
33
34
|
addOverrideDestroy(nsid: string, destroy: (obj: GameObject, player: Player) => void): this;
|
|
35
|
+
addOverrideSupplyCount(nsid: string, supplyCount: (player: Player) => number): this;
|
|
34
36
|
/**
|
|
35
37
|
* Add "r" handler to relevant objects.
|
|
36
38
|
*/
|
|
@@ -17,6 +17,7 @@ class SwapSplitCombine {
|
|
|
17
17
|
this._playerSlotToInProgressObjIdSet = {};
|
|
18
18
|
this._overrideCreate = new Map();
|
|
19
19
|
this._overrideDestroy = new Map();
|
|
20
|
+
this._overideSupplyCount = new Map();
|
|
20
21
|
this._primaryActionHandler = (obj, player) => {
|
|
21
22
|
this._go(obj, player);
|
|
22
23
|
};
|
|
@@ -42,6 +43,10 @@ class SwapSplitCombine {
|
|
|
42
43
|
this._overrideDestroy.set(nsid, destroy);
|
|
43
44
|
return this;
|
|
44
45
|
}
|
|
46
|
+
addOverrideSupplyCount(nsid, supplyCount) {
|
|
47
|
+
this._overideSupplyCount.set(nsid, supplyCount);
|
|
48
|
+
return this;
|
|
49
|
+
}
|
|
45
50
|
/**
|
|
46
51
|
* Add "r" handler to relevant objects.
|
|
47
52
|
*/
|
|
@@ -136,6 +141,15 @@ class SwapSplitCombine {
|
|
|
136
141
|
? Math.floor(srcObjs.length / rule.src.count)
|
|
137
142
|
: 1;
|
|
138
143
|
srcObjs = srcObjs.splice(0, applyCount * rule.src.count);
|
|
144
|
+
// Validate we have enough supply if override is present.
|
|
145
|
+
const overrideSupplyCount = this._overideSupplyCount.get(rule.dst.nsid);
|
|
146
|
+
if (overrideSupplyCount) {
|
|
147
|
+
const supplyCount = overrideSupplyCount(player);
|
|
148
|
+
const requiredCount = applyCount * rule.dst.count;
|
|
149
|
+
if (supplyCount < requiredCount) {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
139
153
|
// Recycle src objects.
|
|
140
154
|
for (const obj of srcObjs) {
|
|
141
155
|
const nsid = nsid_1.NSID.get(obj);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swap-split-combine.js","sourceRoot":"","sources":["../../../../src/lib/swap-split-combine/swap-split-combine.ts"],"names":[],"mappings":";;;AAAA,kDAMkC;AAClC,uCAAoC;AAEpC,gFAA4E;AAC5E,4GAAuG;AAEvG,6CAA0C;AAgB1C;;;;GAIG;AACH,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"swap-split-combine.js","sourceRoot":"","sources":["../../../../src/lib/swap-split-combine/swap-split-combine.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,7 +133,11 @@ export class LayoutObjects {
|
|
|
133
133
|
const currentRotation = true;
|
|
134
134
|
const includeGeometry = false;
|
|
135
135
|
const extent = child.getExtent(currentRotation, includeGeometry);
|
|
136
|
-
|
|
136
|
+
const scale = child.getScale();
|
|
137
|
+
childSize = {
|
|
138
|
+
w: extent.y * 2 * scale.y,
|
|
139
|
+
h: extent.x * 2 * scale.x,
|
|
140
|
+
};
|
|
137
141
|
// Restore UIs.
|
|
138
142
|
for (const ui of uis) {
|
|
139
143
|
child.addUI(ui);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout-objects.js","sourceRoot":"","sources":["../../../../src/lib/layout-objects/layout-objects.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"layout-objects.js","sourceRoot":"","sources":["../../../../src/lib/layout-objects/layout-objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,13 @@ export declare class SwapSplitCombine implements IGlobal {
|
|
|
26
26
|
private readonly _playerSlotToInProgressObjIdSet;
|
|
27
27
|
private readonly _overrideCreate;
|
|
28
28
|
private readonly _overrideDestroy;
|
|
29
|
+
private readonly _overideSupplyCount;
|
|
29
30
|
private readonly _primaryActionHandler;
|
|
30
31
|
private readonly _objectCreatedHandler;
|
|
31
32
|
constructor(rules: Array<SwapSplitCombineRule>, spawn: Spawn);
|
|
32
33
|
addOverrideCreate(nsid: string, create: (player: Player) => GameObject | undefined): this;
|
|
33
34
|
addOverrideDestroy(nsid: string, destroy: (obj: GameObject, player: Player) => void): this;
|
|
35
|
+
addOverrideSupplyCount(nsid: string, supplyCount: (player: Player) => number): this;
|
|
34
36
|
/**
|
|
35
37
|
* Add "r" handler to relevant objects.
|
|
36
38
|
*/
|
|
@@ -14,6 +14,7 @@ export class SwapSplitCombine {
|
|
|
14
14
|
this._playerSlotToInProgressObjIdSet = {};
|
|
15
15
|
this._overrideCreate = new Map();
|
|
16
16
|
this._overrideDestroy = new Map();
|
|
17
|
+
this._overideSupplyCount = new Map();
|
|
17
18
|
this._primaryActionHandler = (obj, player) => {
|
|
18
19
|
this._go(obj, player);
|
|
19
20
|
};
|
|
@@ -39,6 +40,10 @@ export class SwapSplitCombine {
|
|
|
39
40
|
this._overrideDestroy.set(nsid, destroy);
|
|
40
41
|
return this;
|
|
41
42
|
}
|
|
43
|
+
addOverrideSupplyCount(nsid, supplyCount) {
|
|
44
|
+
this._overideSupplyCount.set(nsid, supplyCount);
|
|
45
|
+
return this;
|
|
46
|
+
}
|
|
42
47
|
/**
|
|
43
48
|
* Add "r" handler to relevant objects.
|
|
44
49
|
*/
|
|
@@ -133,6 +138,15 @@ export class SwapSplitCombine {
|
|
|
133
138
|
? Math.floor(srcObjs.length / rule.src.count)
|
|
134
139
|
: 1;
|
|
135
140
|
srcObjs = srcObjs.splice(0, applyCount * rule.src.count);
|
|
141
|
+
// Validate we have enough supply if override is present.
|
|
142
|
+
const overrideSupplyCount = this._overideSupplyCount.get(rule.dst.nsid);
|
|
143
|
+
if (overrideSupplyCount) {
|
|
144
|
+
const supplyCount = overrideSupplyCount(player);
|
|
145
|
+
const requiredCount = applyCount * rule.dst.count;
|
|
146
|
+
if (supplyCount < requiredCount) {
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
136
150
|
// Recycle src objects.
|
|
137
151
|
for (const obj of srcObjs) {
|
|
138
152
|
const nsid = NSID.get(obj);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swap-split-combine.js","sourceRoot":"","sources":["../../../../src/lib/swap-split-combine/swap-split-combine.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,YAAY,EACZ,KAAK,GACR,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAC;AAEvG,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAgB1C;;;;GAIG;AACH,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"swap-split-combine.js","sourceRoot":"","sources":["../../../../src/lib/swap-split-combine/swap-split-combine.ts"],"names":[],"mappings":"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"}
|