ttpg-darrell 1.1.72 → 1.1.73
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/game-object/garbage/garbage-container.d.ts +1 -1
- package/build/cjs/lib/game-object/garbage/garbage-container.js +3 -2
- package/build/cjs/lib/game-object/garbage/garbage-container.js.map +1 -1
- package/build/esm/lib/game-object/garbage/garbage-container.d.ts +1 -1
- package/build/esm/lib/game-object/garbage/garbage-container.js +3 -2
- package/build/esm/lib/game-object/garbage/garbage-container.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,7 +22,7 @@ export declare abstract class GarbageHandler {
|
|
|
22
22
|
* Attempt to recycle deposited objects, break up decks into individual cards.
|
|
23
23
|
*/
|
|
24
24
|
export declare class GarbageContainer {
|
|
25
|
-
static onRecycled: TriggerableMulticastDelegate<(objName: string, objMetadata: string, player: Player | undefined) => void>;
|
|
25
|
+
static onRecycled: TriggerableMulticastDelegate<(objId: string, objName: string, objMetadata: string, player: Player | undefined) => void>;
|
|
26
26
|
private static _garbageHandlers;
|
|
27
27
|
private readonly _container;
|
|
28
28
|
/**
|
|
@@ -39,7 +39,8 @@ class GarbageContainer {
|
|
|
39
39
|
static _tryRecycleObj(obj, player) {
|
|
40
40
|
for (const handler of this._garbageHandlers) {
|
|
41
41
|
if (handler.canRecycle(obj, player)) {
|
|
42
|
-
//
|
|
42
|
+
// Object fields might be lost during recycle, read early.
|
|
43
|
+
const objId = obj.getId();
|
|
43
44
|
let objName = obj.getName();
|
|
44
45
|
const objMetadata = nsid_1.NSID.get(obj);
|
|
45
46
|
if (obj instanceof api_1.Card && obj.getStackSize() === 1) {
|
|
@@ -47,7 +48,7 @@ class GarbageContainer {
|
|
|
47
48
|
objName = cardDetails.name;
|
|
48
49
|
}
|
|
49
50
|
if (handler.recycle(obj, player)) {
|
|
50
|
-
GarbageContainer.onRecycled.trigger(objName, objMetadata, player);
|
|
51
|
+
GarbageContainer.onRecycled.trigger(objId, objName, objMetadata, player);
|
|
51
52
|
return true;
|
|
52
53
|
}
|
|
53
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"garbage-container.js","sourceRoot":"","sources":["../../../../../src/lib/game-object/garbage/garbage-container.ts"],"names":[],"mappings":";;;AAAA,kDAOkC;AAClC,8HAAyH;AACzH,0CAAuC;AAEvC;;GAEG;AACH,MAAsB,cAAc;CAqBnC;AArBD,wCAqBC;AAED;;GAEG;AACH,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"garbage-container.js","sourceRoot":"","sources":["../../../../../src/lib/game-object/garbage/garbage-container.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare abstract class GarbageHandler {
|
|
|
22
22
|
* Attempt to recycle deposited objects, break up decks into individual cards.
|
|
23
23
|
*/
|
|
24
24
|
export declare class GarbageContainer {
|
|
25
|
-
static onRecycled: TriggerableMulticastDelegate<(objName: string, objMetadata: string, player: Player | undefined) => void>;
|
|
25
|
+
static onRecycled: TriggerableMulticastDelegate<(objId: string, objName: string, objMetadata: string, player: Player | undefined) => void>;
|
|
26
26
|
private static _garbageHandlers;
|
|
27
27
|
private readonly _container;
|
|
28
28
|
/**
|
|
@@ -35,7 +35,8 @@ export class GarbageContainer {
|
|
|
35
35
|
static _tryRecycleObj(obj, player) {
|
|
36
36
|
for (const handler of this._garbageHandlers) {
|
|
37
37
|
if (handler.canRecycle(obj, player)) {
|
|
38
|
-
//
|
|
38
|
+
// Object fields might be lost during recycle, read early.
|
|
39
|
+
const objId = obj.getId();
|
|
39
40
|
let objName = obj.getName();
|
|
40
41
|
const objMetadata = NSID.get(obj);
|
|
41
42
|
if (obj instanceof Card && obj.getStackSize() === 1) {
|
|
@@ -43,7 +44,7 @@ export class GarbageContainer {
|
|
|
43
44
|
objName = cardDetails.name;
|
|
44
45
|
}
|
|
45
46
|
if (handler.recycle(obj, player)) {
|
|
46
|
-
GarbageContainer.onRecycled.trigger(objName, objMetadata, player);
|
|
47
|
+
GarbageContainer.onRecycled.trigger(objId, objName, objMetadata, player);
|
|
47
48
|
return true;
|
|
48
49
|
}
|
|
49
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"garbage-container.js","sourceRoot":"","sources":["../../../../../src/lib/game-object/garbage/garbage-container.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,IAAI,EAEJ,SAAS,GAIZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,2EAA2E,CAAC;AACzH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC;;GAEG;AACH,MAAM,OAAgB,cAAc;CAqBnC;AAED;;GAEG;AACH,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"garbage-container.js","sourceRoot":"","sources":["../../../../../src/lib/game-object/garbage/garbage-container.ts"],"names":[],"mappings":"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"}
|