Skip to content

Commit

Permalink
chore: update deps + reformatting
Browse files Browse the repository at this point in the history
Zamiell committed Dec 17, 2023
1 parent ad0fc8b commit b6b638a
Showing 5 changed files with 494 additions and 329 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -30,16 +30,16 @@
"update": "isaacscript update"
},
"dependencies": {
"isaac-typescript-definitions": "^40.0.1",
"isaacscript-common": "^83.4.1"
"isaac-typescript-definitions": "^40.0.2",
"isaacscript-common": "^85.0.0"
},
"devDependencies": {
"cloc": "^1.98.0-cloc",
"convert-xml-to-json": "^1.0.3",
"isaacscript": "^3.30.0",
"isaacscript-common-node": "^1.4.0",
"isaacscript-lint": "^6.11.0",
"isaacscript-spell": "^1.12.0",
"isaacscript": "^3.36.1",
"isaacscript-common-node": "^3.0.0",
"isaacscript-lint": "^6.12.1",
"isaacscript-spell": "^1.13.0",
"isaacscript-tsconfig": "^5.0.0",
"tsx": "^4.6.2",
"typescript": "^5.3.3",
4 changes: 2 additions & 2 deletions src/classes/features/mandatory/misc/SeededDeath.ts
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import {
GRID_INDEX_CENTER_OF_1X1_ROOM,
ModCallbackCustom,
RENDER_FRAMES_PER_SECOND,
characterCanTakeFreeDevilDeals,
canCharacterTakeFreeDevilDeals,
findFreePosition,
game,
getEnumValues,
@@ -358,7 +358,7 @@ export class SeededDeath extends MandatoryModFeature {

canCharacterDieFromTakingADevilDeal(player: EntityPlayer): boolean {
const character = player.GetPlayerType();
return !characterCanTakeFreeDevilDeals(character) && !isKeeper(player);
return !canCharacterTakeFreeDevilDeals(character) && !isKeeper(player);
}

preRevivalDeathAnimation(player: EntityPlayer): void {
12 changes: 6 additions & 6 deletions src/classes/features/mandatory/misc/SeededFloors.ts
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ import type { PlayerHealth } from "isaacscript-common";
import {
CallbackCustom,
ModCallbackCustom,
characterCanHaveRedHearts,
characterGetsBlackHeartFromEternalHeart,
canCharacterHaveRedHearts,
doesCharacterGetBlackHeartFromEternalHeart,
game,
getPlayerHealth,
getRandom,
@@ -96,11 +96,11 @@ export function seededFloorsBefore(): void {

// Eternal Hearts will be lost since we are about to change floors, so convert it to other types
// of health. `eternalHearts` will be equal to 1 if we have an Eternal Heart.
if (characterCanHaveRedHearts(character)) {
if (canCharacterHaveRedHearts(character)) {
v.run.playerHealth.maxHearts += v.run.playerHealth.eternalHearts * 2;
v.run.playerHealth.hearts += v.run.playerHealth.eternalHearts * 2;
} else {
const heartSubType = characterGetsBlackHeartFromEternalHeart(character)
const heartSubType = doesCharacterGetBlackHeartFromEternalHeart(character)
? HeartSubType.BLACK
: HeartSubType.SOUL;
repeat(v.run.playerHealth.eternalHearts, () => {
@@ -147,7 +147,7 @@ export function seededFloorsBefore(): void {

// Modification 5: Full health (which always applies to characters who cannot have red heart
// containers)
if (characterCanHaveRedHearts(character)) {
if (canCharacterHaveRedHearts(character)) {
player.AddMaxHearts(2, false);
player.AddHearts(1);
const fullHealthMod = getRandom(rng);
@@ -164,7 +164,7 @@ export function seededFloorsBefore(): void {
const criticalHealthMod = getRandom(rng);
if (criticalHealthMod < 0.75) {
// 75% chance to not be at critical health.
if (characterCanHaveRedHearts(character)) {
if (canCharacterHaveRedHearts(character)) {
player.AddMaxHearts(2, false);
player.AddHearts(2);
} else {
8 changes: 4 additions & 4 deletions src/classes/features/race/RaceFormatSetup.ts
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ import {
CallbackCustom,
ModCallbackCustom,
ReadonlySet,
characterStartsWithActiveItem,
copyArray,
doesCharacterStartWithActiveItem,
game,
getCollectibleName,
getTrinketName,
@@ -57,7 +57,7 @@ const CHARACTERS_WITH_AN_ACTIVE_ITEM_RACING_PLUS = new ReadonlySet<PlayerType>([
PlayerType.JACOB_2_B, // 39
]);

function characterStartsWithActiveItemRacingPlus(character: PlayerType) {
function doesCharacterStartWithActiveItemRacingPlus(character: PlayerType) {
return CHARACTERS_WITH_AN_ACTIVE_ITEM_RACING_PLUS.has(character);
}

@@ -254,8 +254,8 @@ export function giveDiversityItemsAndDoItemBans(
function shouldGetSchoolbagInDiversity(player: EntityPlayer): boolean {
const character = player.GetPlayerType();
const startsWithActiveItem =
characterStartsWithActiveItem(character) ||
characterStartsWithActiveItemRacingPlus(character);
doesCharacterStartWithActiveItem(character) ||
doesCharacterStartWithActiveItemRacingPlus(character);

return (
// Characters that already start with an active item should be given the Schoolbag so that they
787 changes: 476 additions & 311 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit b6b638a

Please sign in to comment.