Skip to content

Commit

Permalink
Add patch 5.2 abilities
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-dyer-sp committed Feb 26, 2020
1 parent 925af23 commit b3f7589
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
Binary file added app/img/actions/veneration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/js/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ var AllActions = {
manipulation: new Action( 'manipulation', 'Manipulation', 0, 96, 1.0, 0.0, 0.0, 'countdown', 8, 'All', 65),
wasteNot: new Action( 'wasteNot', 'Waste Not', 0, 56, 1.0, 0.0, 0.0, 'countdown', 4, 'All', 15),
wasteNot2: new Action( 'wasteNot2', 'Waste Not II', 0, 98, 1.0, 0.0, 0.0, 'countdown', 8, 'All', 47),
veneration: new Action( 'veneration', 'Veneration', 0, 18, 1.0, 0.0, 0.0, 'countdown', 4, 'All', 15),
innovation: new Action( 'innovation', 'Innovation', 0, 18, 1.0, 0.0, 0.0, 'countdown', 4, 'All', 26),
greatStrides: new Action( 'greatStrides', 'Great Strides', 0, 32, 1.0, 0.0, 0.0, 'countdown', 3, 'All', 21),

Expand Down
13 changes: 7 additions & 6 deletions app/js/ffxivcraftmodel.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ function ApplyModifiers(s, action, condition) {
control += (0.2 * s.effects.countUps[AllActions.innerQuiet.shortName]) * s.synth.crafter.control;
}

// Since game version 5.0, effects increasing control are capped at crafter's original control + 3000
control = Math.min(control, s.synth.crafter.control + 3000);

// Effects modifying level difference
var effCrafterLevel = getEffectiveCrafterLevel(s.synth);
var effRecipeLevel = s.synth.recipe.level;
Expand Down Expand Up @@ -279,8 +276,8 @@ function ApplyModifiers(s, action, condition) {
progressIncreaseMultiplier += calcNameOfElementsBonus(s);
}

if (AllActions.innovation.shortName in s.effects.countDowns) {
progressIncreaseMultiplier += 0.2;
if (AllActions.veneration.shortName in s.effects.countDowns) {
progressIncreaseMultiplier += 0.5;
}

if (isActionEq(action, AllActions.muscleMemory)) {
Expand All @@ -299,7 +296,7 @@ function ApplyModifiers(s, action, condition) {
}

if (AllActions.innovation.shortName in s.effects.countDowns) {
qualityIncreaseMultiplier += 0.2;
qualityIncreaseMultiplier += 0.5;
}

// We can only use Byregot actions when we have at least 2 stacks of inner quiet
Expand Down Expand Up @@ -436,9 +433,13 @@ function ApplySpecialActionEffects(s, action, condition) {
}
}

if (isActionEq(action, AllActions.veneration.shortName) && (AllActions.veneration.shortName in s.effects.countDowns)) {
s.wastedActions += 1
}
if (isActionEq(action, AllActions.innovation.shortName) && (AllActions.innovation.shortName in s.effects.countDowns)) {
s.wastedActions += 1
}

}

function UpdateEffectCounters(s, action, condition, successProbability) {
Expand Down
2 changes: 2 additions & 0 deletions app/js/services/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
innerQuiet: { common: true, buff: true, skillID: {"Alchemist": 258, "Armorer": 254, "Blacksmith": 253, "Carpenter": 252, "Culinarian": 259, "Goldsmith": 255, "Leatherworker": 257, "Weaver": 256} },
greatStrides: { common: true, buff: true, skillID: {"Alchemist": 266, "Armorer": 262, "Blacksmith": 261, "Carpenter": 260, "Culinarian": 267, "Goldsmith": 263, "Leatherworker": 265, "Weaver": 264} },
innovation: { common: true, buff: true, skillID: {"Goldsmith": 284} },
veneration: { common: true, buff: true, skillID: {"Goldsmith": 284} },
tricksOfTheTrade: { common: true, skillID: {"Alchemist": 100098} },

// Heavensward
Expand Down Expand Up @@ -158,6 +159,7 @@
"innerQuiet",
"greatStrides",
"innovation",
"veneration",
"nameOfTheElements"
]
},
Expand Down

0 comments on commit b3f7589

Please sign in to comment.