isaacscript-common 20.16.0 → 20.17.0

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.
Files changed (10) hide show
  1. package/dist/index.d.ts +25 -18
  2. package/dist/isaacscript-common.lua +76 -34
  3. package/dist/src/functions/collectibles.d.ts +24 -18
  4. package/dist/src/functions/collectibles.d.ts.map +1 -1
  5. package/dist/src/functions/collectibles.lua +68 -24
  6. package/dist/src/functions/pickupVariants.d.ts.map +1 -1
  7. package/dist/src/functions/pickupVariants.lua +12 -11
  8. package/package.json +1 -1
  9. package/src/functions/collectibles.ts +149 -24
  10. package/src/functions/pickupVariants.ts +38 -12
package/src/functions/pickupVariants.ts CHANGED
@@ -1,60 +1,86 @@
1
1
  /* eslint-disable sort-exports/sort-exports */
2
2
 
3
- import { PickupVariant } from "isaac-typescript-definitions";
3
+ import { EntityType, PickupVariant } from "isaac-typescript-definitions";
4
4
 
5
5
  /** For `PickupVariant.HEART` (10). */
6
6
  export function isHeart(pickup: EntityPickup): pickup is EntityPickupHeart {
7
- return pickup.Variant === PickupVariant.HEART;
7
+ return (
8
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.HEART
9
+ );
8
10
  }
9
11
 
10
12
  /** For `PickupVariant.COIN` (20). */
11
13
  export function isCoin(pickup: EntityPickup): pickup is EntityPickupCoin {
12
- return pickup.Variant === PickupVariant.COIN;
14
+ return (
15
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.COIN
16
+ );
13
17
  }
14
18
 
15
19
  /** For `PickupVariant.KEY` (30). */
16
20
  export function isKey(pickup: EntityPickup): pickup is EntityPickupKey {
17
- return pickup.Variant === PickupVariant.KEY;
21
+ return (
22
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.KEY
23
+ );
18
24
  }
19
25
 
20
26
  /** For `PickupVariant.BOMB` (40). */
21
27
  export function isBombPickup(pickup: EntityPickup): pickup is EntityPickupBomb {
22
- return pickup.Variant === PickupVariant.BOMB;
28
+ return (
29
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.BOMB
30
+ );
23
31
  }
24
32
 
25
33
  /** For `PickupVariant.POOP` (42). */
26
34
  export function isPoopPickup(pickup: EntityPickup): pickup is EntityPickupPoop {
27
- return pickup.Variant === PickupVariant.POOP;
35
+ return (
36
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.POOP
37
+ );
28
38
  }
29
39
 
30
40
  /** For `PickupVariant.SACK` (69). */
31
41
  export function isSack(pickup: EntityPickup): pickup is EntityPickupSack {
32
- return pickup.Variant === PickupVariant.SACK;
42
+ return (
43
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.SACK
44
+ );
33
45
  }
34
46
 
35
47
  /** For `PickupVariant.PILL` (70). */
36
48
  export function isPill(pickup: EntityPickup): pickup is EntityPickupPill {
37
- return pickup.Variant === PickupVariant.PILL;
49
+ return (
50
+ pickup.Type === EntityType.PICKUP && pickup.Variant === PickupVariant.PILL
51
+ );
38
52
  }
39
53
 
40
54
  /** For `PickupVariant.LIL_BATTERY` (90). */
41
55
  export function isBattery(pickup: EntityPickup): pickup is EntityPickupBattery {
42
- return pickup.Variant === PickupVariant.LIL_BATTERY;
56
+ return (
57
+ pickup.Type === EntityType.PICKUP &&
58
+ pickup.Variant === PickupVariant.LIL_BATTERY
59
+ );
43
60
  }
44
61
 
45
62
  /** For `PickupVariant.COLLECTIBLE` (100). */
46
63
  export function isCollectible(
47
64
  pickup: EntityPickup,
48
65
  ): pickup is EntityPickupCollectible {
49
- return pickup.Variant === PickupVariant.COLLECTIBLE;
66
+ return (
67
+ pickup.Type === EntityType.PICKUP &&
68
+ pickup.Variant === PickupVariant.COLLECTIBLE
69
+ );
50
70
  }
51
71
 
52
72
  /** For `PickupVariant.TAROT_CARD` (300). */
53
73
  export function isCardPickup(pickup: EntityPickup): pickup is EntityPickupCard {
54
- return pickup.Variant === PickupVariant.TAROT_CARD;
74
+ return (
75
+ pickup.Type === EntityType.PICKUP &&
76
+ pickup.Variant === PickupVariant.TAROT_CARD
77
+ );
55
78
  }
56
79
 
57
80
  /** For `PickupVariant.TRINKET` (350). */
58
81
  export function isTrinket(pickup: EntityPickup): pickup is EntityPickupTrinket {
59
- return pickup.Variant === PickupVariant.TRINKET;
82
+ return (
83
+ pickup.Type === EntityType.PICKUP &&
84
+ pickup.Variant === PickupVariant.TRINKET
85
+ );
60
86
  }