Merge remote-tracking branch 'upstream/master' into feature/skill-positions

# Conflicts:
#	src/pages/Gunner/skills.js
This commit is contained in:
Ben McAllister 2020-04-14 19:29:24 -04:00
commit ef868bd776

View file

@ -1,10 +1,10 @@
import SKILLS from '@constants/skills'; import SKILLS from '@constants/skills';
function percent (rank, unit) { function percent(rank, unit) {
return Math.round(rank * unit * 10) / 10; return Math.round(rank * unit * 10) / 10;
} }
function percentTwoDecimals (rank, unit) { function percentTwoDecimals(rank, unit) {
return Math.round(rank * unit * 100) / 100; return Math.round(rank * unit * 100) / 100;
} }
@ -238,13 +238,13 @@ const skills = {
name: "Specialist Bear", name: "Specialist Bear",
text: "Equipping two of the same Weapons on Iron Bear increases the damage they deal.", text: "Equipping two of the same Weapons on Iron Bear increases the damage they deal.",
ranks: 1, ranks: 1,
effect: (rank, level) => `Iron Bear Damage: +${percent(rank, 25)}%`, effect: (rank, level) => `Iron Bear Damage: +${percent(rank, 60)}%`,
}, },
"4": { "4": {
name: "Chemical Warfare", name: "Chemical Warfare",
text: "Salamander now deals Corrosive Damage. Additionally, Salamander's Melt Damage is increased.", text: "Salamander now deals Corrosive Damage. Additionally, Salamander's Melt Damage is increased.",
type: SKILLS.AUGMENT_CHEVRON, type: SKILLS.AUGMENT_CHEVRON,
effect: (rank, level) => `Salamander Element: Corrosive\nSalamander Melt Damage: +50%`, effect: (rank, level) => `Salamander Element: Corrosive\nSalamander Melt Damage: +125%`,
}, },
}, },
"5": { "5": {
@ -258,7 +258,7 @@ const skills = {
name: "Click, Click...", name: "Click, Click...",
text: "Moze gains increased Gun Damage as her magazine empties. The less ammo there is remaining, the greater the increase. If Moze has a COV gun equipped, she gains Gun Damage as her gun's heat increases.", text: "Moze gains increased Gun Damage as her magazine empties. The less ammo there is remaining, the greater the increase. If Moze has a COV gun equipped, she gains Gun Damage as her gun's heat increases.",
ranks: 3, ranks: 3,
effect: (rank, level) => `Gun Damage: Up to +${percent(rank, 12)}%`, effect: (rank, level) => `Gun Damage: Up to +${percent(rank, 20)}%`,
}, },
"3": null, "3": null,
"4": { "4": {
@ -290,7 +290,7 @@ const skills = {
"1": { "1": {
"1": { "1": {
name: "Fire in the Skag Den", name: "Fire in the Skag Den",
text: "Whenever Moze deals Splash Damage, she deals bonus Incendiary Damage.", text: "Whenever Moze and Iron Bear deal Splash Damage, they deal bonus Incendiary Damage.",
ranks: 5, ranks: 5,
effect: (rank, level) => `Bonus Incendiary Damage: +${percent(rank, 3)}% of damage dealt`, effect: (rank, level) => `Bonus Incendiary Damage: +${percent(rank, 3)}% of damage dealt`,
}, },
@ -404,14 +404,14 @@ const skills = {
name: "Explosive Punctuation", name: "Explosive Punctuation",
text: "When Moze deals Splash Damage, her Action Skill Cooldown Rate is briefly increased.", text: "When Moze deals Splash Damage, her Action Skill Cooldown Rate is briefly increased.",
ranks: 5, ranks: 5,
effect: (rank, level) => `Action Skill Cooldown Rate: +${percent(rank, 5)}%`, effect: (rank, level) => `Action Skill Cooldown Rate: +${percent(rank, 8)}%`,
}, },
"3": null, "3": null,
"4": { "4": {
name: "Hammerdown Protocol", name: "Hammerdown Protocol",
text: "Instead of a volley of conventional rockets, the Vanquisher Rocket Pod launches a single rocket with a nuclear warhead, dealing massive Radiation Damage.", text: "Instead of a volley of conventional rockets, the Vanquisher Rocket Pod launches a single rocket with a nuclear warhead, dealing massive Radiation Damage.",
type: SKILLS.AUGMENT_CHEVRON, type: SKILLS.AUGMENT_CHEVRON,
effect: (rank, level) => `Vanquisher Element: Raditation\nVanquisher Damage: +380%\nVanquisher Magazine Size: 1`, effect: (rank, level) => `Vanquisher Element: Raditation\nVanquisher Damage: +600%\nVanquisher Magazine Size: 1`,
}, },
}, },
"6": { "6": {
@ -489,7 +489,7 @@ const skills = {
name: "Capacitive Armature", name: "Capacitive Armature",
text: "When Railgun hits an enemy, it chains to nearby enemies, dealing reduced Shock Damage to more targets.", text: "When Railgun hits an enemy, it chains to nearby enemies, dealing reduced Shock Damage to more targets.",
type: SKILLS.AUGMENT_CHEVRON, type: SKILLS.AUGMENT_CHEVRON,
effect: (rank, level) => `Splinter Damage: 25% of damage dealt`, effect: (rank, level) => `Splinter Damage: 70% of damage dealt`,
}, },
"1": { "1": {
name: "Full Can of Whoop-Ass", name: "Full Can of Whoop-Ass",
@ -516,7 +516,7 @@ const skills = {
name: "Corrosive Sabot Round", name: "Corrosive Sabot Round",
text: "Railgun now fires a specialty round that deals reduced damage and explodes after a short delay. Railgun shots have reduced Fuel Drain and the Magazine Size is increased.", text: "Railgun now fires a specialty round that deals reduced damage and explodes after a short delay. Railgun shots have reduced Fuel Drain and the Magazine Size is increased.",
type: SKILLS.AUGMENT_CHEVRON, type: SKILLS.AUGMENT_CHEVRON,
effect: (rank, level) => `Railgun Element:Corrosive\nRailgun Damage: -33%\nRailgun Fuel Drain: -33%\nRailgun Magazine Size: +2`, effect: (rank, level) => `Railgun Element:Corrosive\nRailgun Damage: -15%\nRailgun Fuel Drain: -33%\nRailgun Magazine Size: +2`,
}, },
"1": { "1": {
name: "Behind the Iron Curtain", name: "Behind the Iron Curtain",
@ -556,7 +556,7 @@ const skills = {
name: "Shockhammer", name: "Shockhammer",
text: "Bear Fist is now capable of sustained rapid fire punching. Additionally, Bear Fist has reduced Fuel Drain and deals Bonus Shock Damage with each hit.", text: "Bear Fist is now capable of sustained rapid fire punching. Additionally, Bear Fist has reduced Fuel Drain and deals Bonus Shock Damage with each hit.",
type: SKILLS.AUGMENT_CHEVRON, type: SKILLS.AUGMENT_CHEVRON,
effect: (rank, level) => `Bear Fist Bonus Shock Damage: +19% of damage dealt\nBear Fist Fuel Drain: -40%`, effect: (rank, level) => `Bear Fist Bonus Shock Damage: +60% of damage dealt\nBear Fist Fuel Drain: -40%`,
}, },
}, },
"6": { "6": {
@ -570,4 +570,4 @@ const skills = {
}, },
}; };
export default skills; export default skills;