mikl/hollow-knight-completion-check
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed mask shards world checking

Browse source
This commit is contained in:
ReznoRMichael 2021-07-02 16:02:54 +02:00
parent 2658a1cf62
commit e6f99e696f
4 changed files with 79 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
build/app.js
View file

@ -122,7 +122,7 @@ function HKCheckCompletion(jsonObject) {
CheckNailUpgrades(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.nailUpgrades, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.nailUpgrades.entries, HKPlayerData); // ---------------- Mask Shards --------------------- // CheckNailUpgrades(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.nailUpgrades, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.nailUpgrades.entries, HKPlayerData); // ---------------- Mask Shards --------------------- //
CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.maskShards, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.maskShards.entries, HKPlayerData); // ---------------- Mask Shards (World Map) --------------------- // CheckIfDataTrue(_hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.maskShards, _hk_database_js__WEBPACK_IMPORTED_MODULE_0__.default.SECTION.maskShards.entries, HKPlayerData, HKWorldItems); // ---------------- Mask Shards (World Map) --------------------- //
/* CheckWorldDataTrue(HK.SECTION.maskShards, "Heart Piece", HK.SECTION.maskShards.entries, HKWorldItems); */ /* CheckWorldDataTrue(HK.SECTION.maskShards, "Heart Piece", HK.SECTION.maskShards.entries, HKWorldItems); */
// ---------------- Nail Arts --------------------- // // ---------------- Nail Arts --------------------- //
@ -453,6 +453,17 @@ function CheckIfDataTrue(divId, dataObject, playerData) {
case "bossGruzMother": case "bossGruzMother":
case "bossBroodingMawlek": case "bossBroodingMawlek":
case "maskShardCrossroadsSprings":
case "maskShardCrossroadsMawlek":
case "maskShardGrubfather":
case "maskShardBretta":
case "maskShardQueensStation":
case "maskShardWaterways":
case "maskShardStoneSanctuary":
case "maskShardCrystalPeak":
case "maskShardDeepnest":
case "maskShardHive":
case "maskShardDelicateFlower":
WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData) ? CurrentDataTrue(divId) : CurrentDataFalse(); WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData) ? CurrentDataTrue(divId) : CurrentDataFalse();
break; break;
@ -3078,60 +3089,82 @@ var HK = {
/* ########## Mask Shards World ########## */ /* ########## Mask Shards World ########## */
/* "Heart Piece" sceneData.persistentBoolItems.id */ /* "Heart Piece" sceneData.persistentBoolItems.id */
Crossroads_13: { maskShardCrossroadsSprings: {
name: "Mask Shard #6", name: "Mask Shard #6",
spoiler: "Forgotten Crossroads, below Hot Springs", spoiler: "Forgotten Crossroads: below Hot Springs",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Crossroads_13"
}, },
Crossroads_09: { maskShardCrossroadsMawlek: {
name: "Mask Shard #7", name: "Mask Shard #7",
spoiler: "Forgotten Crossroads: defeat Brooding Mawlek", spoiler: "Forgotten Crossroads: defeat Brooding Mawlek",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Crossroads_09"
}, },
Crossroads_38: { maskShardGrubfather: {
name: "Mask Shard #8", name: "Mask Shard #8",
spoiler: "Grubfather: 5 Grubs rescued", spoiler: "Grubfather: 5 Grubs rescued",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Crossroads_38"
}, },
Room_Bretta: { maskShardBretta: {
name: "Mask Shard #9", name: "Mask Shard #9",
spoiler: "Dirtmouth: Bretta's Room, rescue Bretta", spoiler: "Dirtmouth: Bretta's Room, rescue Bretta",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Room_Bretta"
}, },
Fungus2_01: { maskShardQueensStation: {
name: "Mask Shard #10", name: "Mask Shard #10",
spoiler: "Queen's Station, requires Mantis Claw", spoiler: "Queen's Station: requires Mantis Claw",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Fungus2_01"
}, },
Waterways_04b: { maskShardWaterways: {
name: "Mask Shard #11", name: "Mask Shard #11",
spoiler: "Royal Waterways, top left area, swim left", spoiler: "Royal Waterways: top left area, swim left",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Waterways_04b"
}, },
Fungus1_36: { maskShardStoneSanctuary: {
name: "Mask Shard #12", name: "Mask Shard #12",
spoiler: "Greenpath: Stone Sanctuary, Lumafly Lantern", spoiler: "Greenpath: Stone Sanctuary, Lumafly Lantern",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Fungus1_36"
}, },
Mines_32: { maskShardCrystalPeak: {
name: "Mask Shard #13", name: "Mask Shard #13",
spoiler: "Crystal Peak: defeat Enraged Guardian", spoiler: "Crystal Peak: defeat Enraged Guardian",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Mines_32"
}, },
Fungus2_25: { maskShardDeepnest: {
name: "Mask Shard #14", name: "Mask Shard #14",
spoiler: "Deepnest, from Fungal Core (Monarch Wings)", spoiler: "Deepnest: from Fungal Core (Monarch Wings)",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Fungus2_25"
}, },
Hive_04: { maskShardHive: {
name: "Mask Shard #15", name: "Mask Shard #15",
spoiler: "The Hive, use Hive Guardian to break wall", spoiler: "The Hive: use Hive Guardian to break wall",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Hive_04"
}, },
Room_Mansion: { maskShardDelicateFlower: {
name: "Mask Shard #16", name: "Mask Shard #16",
spoiler: "Resting Grounds: Delicate Flower (Grey Mourner)", spoiler: "Resting Grounds: Delicate Flower (Grey Mourner)",
wiki: "Mask_Shard" wiki: "Mask_Shard",
id: "Heart Piece",
sceneName: "Room_Mansion"
} }
} }
}, },

2
build/app.js.map
View file

File diff suppressed because one or more lines are too long

13
src/js/HKCheckCompletion.js
View file

@ -160,7 +160,7 @@ function HKCheckCompletion(jsonObject) {
// ---------------- Mask Shards --------------------- // // ---------------- Mask Shards --------------------- //
CheckIfDataTrue(HK.SECTION.maskShards, HK.SECTION.maskShards.entries, HKPlayerData); CheckIfDataTrue(HK.SECTION.maskShards, HK.SECTION.maskShards.entries, HKPlayerData, HKWorldItems);
// ---------------- Mask Shards (World Map) --------------------- // // ---------------- Mask Shards (World Map) --------------------- //
@ -535,6 +535,17 @@ function CheckIfDataTrue(divId, dataObject, playerData, worldData = []) {
break; break;
case "bossGruzMother": case "bossGruzMother":
case "bossBroodingMawlek": case "bossBroodingMawlek":
case "maskShardCrossroadsSprings":
case "maskShardCrossroadsMawlek":
case "maskShardGrubfather":
case "maskShardBretta":
case "maskShardQueensStation":
case "maskShardWaterways":
case "maskShardStoneSanctuary":
case "maskShardCrystalPeak":
case "maskShardDeepnest":
case "maskShardHive":
case "maskShardDelicateFlower":
(WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData)) ? CurrentDataTrue(divId): CurrentDataFalse(); (WorldDataActivated(dataObject[i].id, dataObject[i].sceneName, worldData)) ? CurrentDataTrue(divId): CurrentDataFalse();
break; break;
default: default:

10
src/js/hk-database.js
View file

@ -604,7 +604,7 @@ const HK = {
/* "Heart Piece" sceneData.persistentBoolItems.id */ /* "Heart Piece" sceneData.persistentBoolItems.id */
maskShardCrossroadsSprings: { maskShardCrossroadsSprings: {
name: "Mask Shard #6", name: "Mask Shard #6",
spoiler: "Forgotten Crossroads, below Hot Springs", spoiler: "Forgotten Crossroads: below Hot Springs",
wiki: "Mask_Shard", wiki: "Mask_Shard",
id: "Heart Piece", id: "Heart Piece",
sceneName: "Crossroads_13" sceneName: "Crossroads_13"
@ -632,14 +632,14 @@ const HK = {
}, },
maskShardQueensStation: { maskShardQueensStation: {
name: "Mask Shard #10", name: "Mask Shard #10",
spoiler: "Queen's Station, requires Mantis Claw", spoiler: "Queen's Station: requires Mantis Claw",
wiki: "Mask_Shard", wiki: "Mask_Shard",
id: "Heart Piece", id: "Heart Piece",
sceneName: "Fungus2_01" sceneName: "Fungus2_01"
}, },
maskShardWaterways: { maskShardWaterways: {
name: "Mask Shard #11", name: "Mask Shard #11",
spoiler: "Royal Waterways, top left area, swim left", spoiler: "Royal Waterways: top left area, swim left",
wiki: "Mask_Shard", wiki: "Mask_Shard",
id: "Heart Piece", id: "Heart Piece",
sceneName: "Waterways_04b" sceneName: "Waterways_04b"
@ -660,14 +660,14 @@ const HK = {
}, },
maskShardDeepnest: { maskShardDeepnest: {
name: "Mask Shard #14", name: "Mask Shard #14",
spoiler: "Deepnest, from Fungal Core (Monarch Wings)", spoiler: "Deepnest: from Fungal Core (Monarch Wings)",
wiki: "Mask_Shard", wiki: "Mask_Shard",
id: "Heart Piece", id: "Heart Piece",
sceneName: "Fungus2_25" sceneName: "Fungus2_25"
}, },
maskShardHive: { maskShardHive: {
name: "Mask Shard #15", name: "Mask Shard #15",
spoiler: "The Hive, use Hive Guardian to break wall", spoiler: "The Hive: use Hive Guardian to break wall",
wiki: "Mask_Shard", wiki: "Mask_Shard",
id: "Heart Piece", id: "Heart Piece",
sceneName: "Hive_04" sceneName: "Hive_04"