isaacscript-common 30.11.4 → 30.11.5

package/dist/src/objects/pillEffectClasses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pillEffectClasses.d.ts","sourceRoot":"","sources":["../../../src/objects/pillEffectClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAE1B,MAAM,8BAA8B,CAAC;AAEtC,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAE1E,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDkC,CAAC"}
+{"version":3,"file":"pillEffectClasses.d.ts","sourceRoot":"","sources":["../../../src/objects/pillEffectClasses.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAE1B,MAAM,8BAA8B,CAAC;AAEtC,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAE1E,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoDkC,CAAC"}

package/dist/src/objects/pillEffectClasses.lua

@@ -53,7 +53,6 @@ ____exports.PILL_EFFECT_CLASSES = {
     [PillEffect.VURP] = ItemConfigPillEffectClass.MEDIUM,
     [PillEffect.SHOT_SPEED_DOWN] = ItemConfigPillEffectClass.MAJOR,
     [PillEffect.SHOT_SPEED_UP] = ItemConfigPillEffectClass.MAJOR,
-    [PillEffect.EXPERIMENTAL] = ItemConfigPillEffectClass.MAJOR,
     [PillEffect.EXPERIMENTAL] = ItemConfigPillEffectClass.MAJOR
 }
 return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "30.11.4",
+  "version": "30.11.5",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/other/PreventCollectibleRotation.ts

@@ -18,6 +18,7 @@ import { PickupIndex } from "../../../types/PickupIndex";
 import { ReadonlySet } from "../../../types/ReadonlySet";
 import { Feature } from "../../private/Feature";
 import { PickupIndexCreation } from "./PickupIndexCreation";
+import { RunInNFrames } from "./RunInNFrames";
 
 const ROLL_COLLECTIBLE_TYPES = new ReadonlySet([
   // The `PRE_USE_ITEM` D6 callback is fired for D6, D100, Dice Shard, 4-pip Dice Room, and 6-pip
@@ -44,12 +45,19 @@ export class PreventCollectibleRotation extends Feature {
   public override v = v;
 
   private pickupIndexCreation: PickupIndexCreation;
+  private runInNFrames: RunInNFrames;
 
   /** @internal */
-  constructor(pickupIndexCreation: PickupIndexCreation) {
+  constructor(
+    pickupIndexCreation: PickupIndexCreation,
+    runInNFrames: RunInNFrames,
+  ) {
     super();
 
-    this.featuresUsed = [ISCFeature.PICKUP_INDEX_CREATION];
+    this.featuresUsed = [
+      ISCFeature.PICKUP_INDEX_CREATION,
+      ISCFeature.RUN_IN_N_FRAMES,
+    ];
 
     this.callbacksUsed = [
       // 5
@@ -69,6 +77,7 @@ export class PreventCollectibleRotation extends Feature {
     ];
 
     this.pickupIndexCreation = pickupIndexCreation;
+    this.runInNFrames = runInNFrames;
   }
 
   private preUseItem = (
@@ -169,7 +178,7 @@ export class PreventCollectibleRotation extends Feature {
     if (!isCollectible(collectible)) {
       const entityID = getEntityID(collectible);
       error(
-        `The "preventCollectibleRotate" function was given a non-collectible: ${entityID}`,
+        `The "preventCollectibleRotation" function was given a non-collectible: ${entityID}`,
       );
     }
 
@@ -181,5 +190,17 @@ export class PreventCollectibleRotation extends Feature {
     if (collectible.SubType !== collectibleType) {
       setCollectibleSubType(collectible, collectibleType);
     }
+
+    // It takes a frame for the `setCollectibleSubType` function to apply. There is a race condition
+    // whereby if the next frame is a collectible rotation (which occurs on frame 30, 60, 90, and so
+    // on), the collectible rotation will overwrite the `setCollectibleSubType` function. Thus, we
+    // must check again on the next frame. However, we cannot use an `EntityPtr`, because the
+    // reference is destroyed when the rotation occurs. Thus, we resort to using the `Exists` method
+    // and hope that no crashes occur.
+    this.runInNFrames.runNextGameFrame(() => {
+      if (collectible.Exists() && collectible.SubType !== collectibleType) {
+        setCollectibleSubType(collectible, collectibleType);
+      }
+    });
   }
 }

package/src/features.ts

@@ -156,6 +156,7 @@ export function getFeatures(
   );
   const preventCollectibleRotation = new PreventCollectibleRotation(
     pickupIndexCreation,
+    runInNFrames,
   );
 
   const customGridEntities = new CustomGridEntities(runInNFrames);

package/src/objects/pillEffectClasses.ts

@@ -6,56 +6,55 @@ import {
 export const DEFAULT_PILL_EFFECT_CLASS = ItemConfigPillEffectClass.MODDED;
 
 export const PILL_EFFECT_CLASSES = {
-  [PillEffect.BAD_GAS]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.BAD_TRIP]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.BALLS_OF_STEEL]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.BOMBS_ARE_KEYS]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.EXPLOSIVE_DIARRHEA]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.FULL_HEALTH]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.HEALTH_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.HEALTH_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.I_FOUND_PILLS]: ItemConfigPillEffectClass.JOKE,
-  [PillEffect.PUBERTY]: ItemConfigPillEffectClass.JOKE,
-  [PillEffect.PRETTY_FLY]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.RANGE_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.RANGE_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.SPEED_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.SPEED_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.TEARS_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.TEARS_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.LUCK_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.LUCK_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.TELEPILLS]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.FORTY_EIGHT_HOUR_ENERGY]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.HEMATEMESIS]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.PARALYSIS]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.I_CAN_SEE_FOREVER]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.PHEROMONES]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.AMNESIA]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.LEMON_PARTY]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.R_U_A_WIZARD]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.PERCS]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.ADDICTED]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.RELAX]: ItemConfigPillEffectClass.JOKE,
-  [PillEffect.QUESTION_MARKS]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.ONE_MAKES_YOU_LARGER]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.ONE_MAKES_YOU_SMALL]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.INFESTED_EXCLAMATION]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.INFESTED_QUESTION]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.POWER]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.RETRO_VISION]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.FRIENDS_TILL_THE_END]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.X_LAX]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.SOMETHINGS_WRONG]: ItemConfigPillEffectClass.JOKE,
-  [PillEffect.IM_DROWSY]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.IM_EXCITED]: ItemConfigPillEffectClass.MINOR,
-  [PillEffect.GULP]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.HORF]: ItemConfigPillEffectClass.JOKE,
+  [PillEffect.BAD_GAS]: ItemConfigPillEffectClass.MINOR, // 0
+  [PillEffect.BAD_TRIP]: ItemConfigPillEffectClass.MEDIUM, // 1
+  [PillEffect.BALLS_OF_STEEL]: ItemConfigPillEffectClass.MEDIUM, // 2
+  [PillEffect.BOMBS_ARE_KEYS]: ItemConfigPillEffectClass.MEDIUM, // 3
+  [PillEffect.EXPLOSIVE_DIARRHEA]: ItemConfigPillEffectClass.MINOR, // 4
+  [PillEffect.FULL_HEALTH]: ItemConfigPillEffectClass.MEDIUM, // 5
+  [PillEffect.HEALTH_DOWN]: ItemConfigPillEffectClass.MAJOR, // 6
+  [PillEffect.HEALTH_UP]: ItemConfigPillEffectClass.MAJOR, // 7
+  [PillEffect.I_FOUND_PILLS]: ItemConfigPillEffectClass.JOKE, // 8
+  [PillEffect.PUBERTY]: ItemConfigPillEffectClass.JOKE, // 9
+  [PillEffect.PRETTY_FLY]: ItemConfigPillEffectClass.MEDIUM, // 10
+  [PillEffect.RANGE_DOWN]: ItemConfigPillEffectClass.MAJOR, // 11
+  [PillEffect.RANGE_UP]: ItemConfigPillEffectClass.MAJOR, // 12
+  [PillEffect.SPEED_DOWN]: ItemConfigPillEffectClass.MAJOR, // 13
+  [PillEffect.SPEED_UP]: ItemConfigPillEffectClass.MAJOR, // 14
+  [PillEffect.TEARS_DOWN]: ItemConfigPillEffectClass.MAJOR, // 15
+  [PillEffect.TEARS_UP]: ItemConfigPillEffectClass.MAJOR, // 16
+  [PillEffect.LUCK_DOWN]: ItemConfigPillEffectClass.MAJOR, // 17
+  [PillEffect.LUCK_UP]: ItemConfigPillEffectClass.MAJOR, // 18
+  [PillEffect.TELEPILLS]: ItemConfigPillEffectClass.MAJOR, // 19
+  [PillEffect.FORTY_EIGHT_HOUR_ENERGY]: ItemConfigPillEffectClass.MEDIUM, // 20
+  [PillEffect.HEMATEMESIS]: ItemConfigPillEffectClass.MEDIUM, // 21
+  [PillEffect.PARALYSIS]: ItemConfigPillEffectClass.MINOR, // 22
+  [PillEffect.I_CAN_SEE_FOREVER]: ItemConfigPillEffectClass.MEDIUM, // 23
+  [PillEffect.PHEROMONES]: ItemConfigPillEffectClass.MINOR, // 24
+  [PillEffect.AMNESIA]: ItemConfigPillEffectClass.MEDIUM, // 25
+  [PillEffect.LEMON_PARTY]: ItemConfigPillEffectClass.MINOR, // 26
+  [PillEffect.R_U_A_WIZARD]: ItemConfigPillEffectClass.MINOR, // 27
+  [PillEffect.PERCS]: ItemConfigPillEffectClass.MINOR, // 28
+  [PillEffect.ADDICTED]: ItemConfigPillEffectClass.MINOR, // 29
+  [PillEffect.RELAX]: ItemConfigPillEffectClass.JOKE, // 30
+  [PillEffect.QUESTION_MARKS]: ItemConfigPillEffectClass.MINOR, // 31
+  [PillEffect.ONE_MAKES_YOU_LARGER]: ItemConfigPillEffectClass.MINOR, // 32
+  [PillEffect.ONE_MAKES_YOU_SMALL]: ItemConfigPillEffectClass.MINOR, // 33
+  [PillEffect.INFESTED_EXCLAMATION]: ItemConfigPillEffectClass.MINOR, // 34
+  [PillEffect.INFESTED_QUESTION]: ItemConfigPillEffectClass.MINOR, // 35
+  [PillEffect.POWER]: ItemConfigPillEffectClass.MINOR, // 36
+  [PillEffect.RETRO_VISION]: ItemConfigPillEffectClass.MINOR, // 37
+  [PillEffect.FRIENDS_TILL_THE_END]: ItemConfigPillEffectClass.MINOR, // 38
+  [PillEffect.X_LAX]: ItemConfigPillEffectClass.MINOR, // 39
+  [PillEffect.SOMETHINGS_WRONG]: ItemConfigPillEffectClass.JOKE, // 40
+  [PillEffect.IM_DROWSY]: ItemConfigPillEffectClass.MINOR, // 41
+  [PillEffect.IM_EXCITED]: ItemConfigPillEffectClass.MINOR, // 42
+  [PillEffect.GULP]: ItemConfigPillEffectClass.MEDIUM, // 43
+  [PillEffect.HORF]: ItemConfigPillEffectClass.JOKE, // 44
   [PillEffect.FEELS_LIKE_IM_WALKING_ON_SUNSHINE]:
-    ItemConfigPillEffectClass.MINOR,
-  [PillEffect.VURP]: ItemConfigPillEffectClass.MEDIUM,
-  [PillEffect.SHOT_SPEED_DOWN]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.SHOT_SPEED_UP]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.EXPERIMENTAL]: ItemConfigPillEffectClass.MAJOR,
-  [PillEffect.EXPERIMENTAL]: ItemConfigPillEffectClass.MAJOR,
+    ItemConfigPillEffectClass.MINOR, // 45
+  [PillEffect.VURP]: ItemConfigPillEffectClass.MEDIUM, // 46
+  [PillEffect.SHOT_SPEED_DOWN]: ItemConfigPillEffectClass.MAJOR, // 47
+  [PillEffect.SHOT_SPEED_UP]: ItemConfigPillEffectClass.MAJOR, // 48
+  [PillEffect.EXPERIMENTAL]: ItemConfigPillEffectClass.MAJOR, // 49
 } as const satisfies Record<PillEffect, ItemConfigPillEffectClass>;