Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parser Changes #19

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Parser Changes #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f37d508
Parser Changes
SomeRandom-WhoLikesCode Oct 8, 2021
705af22
Fixed Lint Issues
SomeRandom-WhoLikesCode Oct 9, 2021
c9dc8af
Add back data separators
SomeRandom-WhoLikesCode Oct 9, 2021
5a31d44
Fix issues raised weeks ago ;-;
SomeRandom-WhoLikesCode Oct 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/constants/leveling.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,33 @@ module.exports = {
24: 15300,
25: 19050,
},
socialXp: {
1: 50,
2: 100,
3: 150,
4: 250,
5: 500,
6: 750,
7: 1000,
8: 1250,
9: 1500,
10: 2000,
11: 2500,
12: 3000,
13: 3750,
14: 4500,
15: 6000,
16: 8000,
17: 10000,
18: 12500,
19: 15000,
20: 20000,
21: 25000,
22: 30000,
23: 35000,
24: 40000,
25: 50000,
},

// total XP required for level of Slayer
slayerXp: {
Expand Down
38 changes: 0 additions & 38 deletions src/constants/pets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,44 +2102,6 @@ module.exports = {
}],
},
},
BAL: {
name: 'Bal',
statModifiers: {
strength: 0.25,
ferocity: 0.1,
},
abilityModifiers: {
0: {},
1: {},
2: {
ability: [0.1, 0.1],
},
3: {
ability: [0.15],
4: {},
},
abilities: {
0: [{
name: 'Protective Skin',
desc: ['§7Gives Heat immunity'],
}],
1: [],
2: [{
name: 'Fire Whip',
desc: ['§7Every 5s while in combat the Balrog will strike nearby enemies with his fire whip dealing §a%ability%% of your damage as True Damage'],
descFn: (level, multiplier) => Math.floor(level * multiplier),
func: () => ([]), // TODO
}],
3: [{
name: 'Made of Lava',
desc: ['§7Gain §a%ability%% on ALL stats when inside the Magma Fields'],
descFn: (level, multiplier) => Math.floor(level * multiplier),
func: () => ([]), // TODO
}],
4: [],
},
},
},
},

petData: {
Expand Down
68 changes: 25 additions & 43 deletions src/player/Player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class Player {
disabled_potions,
cake_buffs: cake_soul_buffs,
};
this.HOTM_Data = {
this.hotm_data = {
mining_core,
forge,
};
Expand Down Expand Up @@ -355,24 +355,20 @@ class Player {
}

getPristineStats() {
const { gemstones } = constants.bonusStats;
// check if actibe armour has any gems that are topaz
if (this.armor.length < 1) return;
const gemstones = {
TOPAZ: {
ROUGH: 0.4, FLAWED: 0.8, FINE: 1.2, FLAWLESS: 1.6, PERFECT: 2,
},
};
for (let i = 0; i < this.armor.length; i++) {
const armour_Piece = this.armor[i];
const armourPiece = this.armor[i];

const hasGems = armour_Piece.attributes?.gems;
const hasGems = armourPiece.attributes?.gems;
if (hasGems) {
const gem_Keys = Object.keys(hasGems);
for (let t = 0; t < gem_Keys.length; t++) {
if (gem_Keys[t].includes('TOPAZ_')) {
this.attributes.pristine += gemstones.TOPAZ[hasGems[gem_Keys[t]]];
} else if (gem_Keys[t].match(/UNIVERSAL_\d_gem/g) && hasGems[gem_Keys[t]].includes('TOPAZ')) {
this.attributes.pristine += gemstones.TOPAZ[`${hasGems[gem_Keys[t].replace(/_gem/, '')]}`];
const gemKeys = Object.keys(hasGems);
for (let t = 0; t < gemKeys.length; t++) {
if (gemKeys[t].includes('TOPAZ_')) {
this.attributes.pristine += gemstones.TOPAZ[hasGems[gemKeys[t]]];
} else if (gemKeys[t].match(/UNIVERSAL_\d_gem/g) && hasGems[gemKeys[t]].includes('TOPAZ')) {
this.attributes.pristine += gemstones.TOPAZ[`${hasGems[gemKeys[t].replace(/_gem/, '')]}`];
}
}
}
Expand All @@ -382,7 +378,9 @@ class Player {
let pristine_values = [];
const temp_inv = this.inventory;
for (let i = 0; i < 8; i++) {
if (['pickaxe', 'drill', 'gauntlet'].includes(temp_inv[`${i}`].type)) {
const item = temp_inv[`${i}`];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can just use temp_inv[i] here :)

const itemType = item?.type;
if (['pickaxe', 'drill', 'gauntlet'].includes(itemType)) {
const item_json = temp_inv[i];
item_json.pristine = 0;
if (item_json?.attributes?.gems && item_json?.attributes?.enchantments) {
Expand Down Expand Up @@ -413,9 +411,9 @@ class Player {
// check if player has power artifact
this.active_accessories.forEach((object) => {
if (object.attributes.id === 'POWER_ARTIFACT') {
const gemstonevalue = gemstones.TOPAZ[object.attributes?.gems?.TOPAZ_0];
if (gemstonevalue) {
pristine_values.push(gemstonevalue);
const gemstoneValue = gemstones.TOPAZ[object.attributes?.gems?.TOPAZ_0];
if (gemstoneValue) {
pristine_values.push(gemstoneValue);
} else {
pristine_values.push(0);
}
Expand Down Expand Up @@ -703,35 +701,19 @@ class Player {
}

// eslint-disable-next-line class-methods-use-this
calculateLevel(experience) {
let level = 0;
const XpValues = [
50, 75, 110, 160, 230, 330, 470, 670, 950, 1340, 1890, 2665, 3760, 5260, 7380, 10300, 14400,
20000, 27600, 38000, 52500, 71500, 97000, 132000, 180000, 243000, 328000, 445000, 600000,
800000, 1065000, 1410000, 1900000, 2500000, 3300000, 4300000, 5600000, 7200000, 9200000,
12000000, 15000000, 19000000, 24000000, 30000000, 38000000, 48000000, 60000000, 75000000,
93000000, 116250000,
];
for (let i = 0; i < XpValues.length; i++) {
experience -= XpValues[i];
if (experience < 0) {
level += (1 - (experience * -1) / XpValues[i]);
break;
}
level++;
}

return Math.min(level, 50);
}

addLevelsToLocation(directive) {
addLevelsToDungeonsLocation(directive) {
/*
This function takes in a location from the this object and loops
over the location given to see if the location has an experience key.
If it does, it will then calculate the floatLevel and level and add it to the key.
*/
const location = directive;
const location_keys = Object.keys(location);

for (let i = 0; i < location_keys.length; i++) {
const key = location[location_keys[i]];
if (key?.experience) {
const floatLevel = this.calculateLevel(key.experience);
const floatLevel = util.calculateCatacombsLevel(key.experience);
const level = Math.floor(floatLevel);

key.floatLevel = floatLevel;
Expand All @@ -742,10 +724,10 @@ class Player {

appendDungeonData() {
if (this.dungeons?.dungeon_types) {
this.addLevelsToLocation(this.dungeons.dungeon_types);
this.addLevelsToDungeonsLocation(this.dungeons.dungeon_types);
}
if (this.dungeons?.player_classes) {
this.addLevelsToLocation(this.dungeons.player_classes);
this.addLevelsToDungeonsLocation(this.dungeons.player_classes);
}
}
}
Expand Down
24 changes: 23 additions & 1 deletion src/util/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function getLevelByXp(xp = 0, type) {
xpTable = constants.runecraftingXp;
break;
case 'social':
xpTable = constants.runecraftingXp;
xpTable = constants.socialXp;
break;
default:
xpTable = constants.levelingXp;
Expand Down Expand Up @@ -276,6 +276,27 @@ function getBonusStat(level, skill, max, incrementation) {
return bonus;
}

function calculateCatacombsLevel(experience) {
let level = 0;
const XpValues = [
50, 75, 110, 160, 230, 330, 470, 670, 950, 1340, 1890, 2665, 3760, 5260, 7380, 10300, 14400,
20000, 27600, 38000, 52500, 71500, 97000, 132000, 180000, 243000, 328000, 445000, 600000,
800000, 1065000, 1410000, 1900000, 2500000, 3300000, 4300000, 5600000, 7200000, 9200000,
12000000, 15000000, 19000000, 24000000, 30000000, 38000000, 48000000, 60000000, 75000000,
93000000, 116250000,
];
for (let i = 0; i < XpValues.length; i += 1) {
experience -= XpValues[i];
if (experience < 0) {
level += (1 - (experience * -1) / XpValues[i]);
break;
}
level += 1;
}

return Math.min(level, 50);
}

module.exports = {
removeFormatting,
capitalizeFirstLetter,
Expand All @@ -291,4 +312,5 @@ module.exports = {
getSlayerLevel,
getPetLevel,
getBonusStat,
calculateCatacombsLevel,
};