Skip to content

Commit

Permalink
chore: update deps + rename ShowPills --> ShowPillsOnHUD
Browse files Browse the repository at this point in the history
  • Loading branch information
Zamiell committed Jan 29, 2024
1 parent c968f11 commit 4caf515
Show file tree
Hide file tree
Showing 9 changed files with 478 additions and 596 deletions.
2 changes: 1 addition & 1 deletion docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Post-flip actions:
- `0507` <!-- ShowRunTimer --> The run timer (for in-game time) will only be shown when the player holds down the map key.
- `0508` <!-- ShowMaxFamiliars --> An icon will be shown on the UI when the player has reached the maximum amount of familiars (i.e. 64).
- `0509` <!-- ShowNumSacrifices --> The number of sacrifices will be shown in the top-left when in a Sacrifice Room.
- `0510` <!-- ShowPills --> Identified pills will be shown when the player presses the map button (tab). (Only up to 7 will be shown.)
- `0510` <!-- ShowPillsOnHUD --> Identified pills will be shown when the player presses the map button (tab). (Only up to 7 will be shown.)

> Why? Items that generate familiars (e.g. Compost) will be do nothing if the player is currently at the maximum amount.
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@
"update": "isaacscript update"
},
"dependencies": {
"isaac-typescript-definitions": "^40.0.4",
"isaacscript-common": "^85.0.2"
"isaac-typescript-definitions": "^41.0.0",
"isaacscript-common": "^87.1.0"
},
"devDependencies": {
"cloc": "^1.98.0-cloc",
"convert-xml-to-json": "^1.0.3",
"isaacscript": "^3.36.1",
"isaacscript": "^3.38.1",
"isaacscript-common-node": "^3.0.0",
"isaacscript-lint": "^6.13.0",
"isaacscript-spell": "^1.13.0",
"isaacscript-lint": "^6.18.0",
"isaacscript-spell": "^1.14.0",
"isaacscript-tsconfig": "^5.0.0",
"tsx": "^4.7.0",
"typescript": "^5.3.3",
"typescript-to-lua": "^1.22.0"
"typescript-to-lua": "^1.23.0"
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion src/classes/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class Config {
RunTimer = true;
ShowMaxFamiliars = true;
ShowNumSacrifices = true;
ShowPills = true;
ShowPillsOnHUD = true;
SpeedUpFadeIn = true;
SubvertTeleport = true;
TaintedSamsonChargeBar = true; // 27 (charge bar)
Expand Down
4 changes: 2 additions & 2 deletions src/classes/features/optional/quality/RunTimer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
getTopLeftUIPositionShowMaxFamiliars,
showingMaxFamiliarsIcon,
} from "./ShowMaxFamiliars";
import { getNumIdentifiedPills } from "./ShowPills";
import { getNumIdentifiedPills } from "./ShowPillsOnHUD";

const OFFSET_FROM_WHERE_AN_ICON_WOULD_BE = Vector(14, -10);

Expand Down Expand Up @@ -44,7 +44,7 @@ export class RunTimer extends ConfigurableModFeature {
hud.IsVisible() &&
isActionPressedOnAnyInput(ButtonAction.MAP) &&
// Don't show it if we have identified a lot of pills, since it will overlap with the pill UI.
(!config.ShowPills || getNumIdentifiedPills() < 11)
(!config.ShowPillsOnHUD || getNumIdentifiedPills() < 11)
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ const v = {
},
};

export class ShowPills extends ConfigurableModFeature {
configKey: keyof Config = "ShowPills";
export class ShowPillsOnHUD extends ConfigurableModFeature {
configKey: keyof Config = "ShowPillsOnHUD";
v = v;

constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/configDescription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ export const QUALITY_OF_LIFE_CHANGES_1 = [
],
],
[
"ShowPills",
"ShowPillsOnHUD",
[
ModConfigMenuOptionType.BOOLEAN,
"0510",
Expand Down
2 changes: 1 addition & 1 deletion src/featureClasses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export { RunTimer } from "./classes/features/optional/quality/RunTimer";
export { ShowDreamCatcher } from "./classes/features/optional/quality/ShowDreamCatcher";
export { ShowMaxFamiliars } from "./classes/features/optional/quality/ShowMaxFamiliars";
export { ShowNumSacrifices } from "./classes/features/optional/quality/ShowNumSacrifices";
export { ShowPills } from "./classes/features/optional/quality/ShowPills";
export { ShowPillsOnHUD } from "./classes/features/optional/quality/ShowPillsOnHUD";
export { SpeedUpFadeIn } from "./classes/features/optional/quality/SpeedUpFadeIn";
export { SubvertTeleport } from "./classes/features/optional/quality/SubvertTeleport";
export { TaintedSamsonChargeBar } from "./classes/features/optional/quality/TaintedSamsonChargeBar";
Expand Down
2 changes: 1 addition & 1 deletion src/initFeatureClasses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const FEATURE_CLASSES = [
fc.RunTimer,
fc.ShowMaxFamiliars,
fc.ShowNumSacrifices,
fc.ShowPills,
fc.ShowPillsOnHUD,
fc.SpeedUpFadeIn,
fc.SubvertTeleport,
fc.TaintedSamsonChargeBar, // 27 (charge bar)
Expand Down
Loading

0 comments on commit 4caf515

Please sign in to comment.