Skip to content

Commit

Permalink
Various Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Solaris333
Solaris333 committed Mar 1, 2024
1 parent abbd4c4 commit 3e91f69
Show file tree
Hide file tree
Showing 10 changed files with 244 additions and 62 deletions.
2 changes: 1 addition & 1 deletion characters/js/directives.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ function conditionToString(condition, suffix) {
}
case "crew":
case "enemies":
return `When there are ${condition.count} or ${condition.comparator} ${condition.type} ${condition.targets ? arrayToString(condition.targets) + " characters " : ""}${condition.relative ? condition.type == "crew" ? "than the enemy team" : "than your crew" : ""} remaining, `
return `When there are ${condition.count} or ${condition.comparator} ${condition.type} ${condition.targets ? arrayToString(condition.targets) + " characters" : ""}${condition.relative ? condition.type == "crew" ? " than the enemy team" : " than your crew" : ""}${condition.composition ? "" : " remaining"}, `
case "trigger":
return `The first ${condition.count} times this character ${condition.stat == "takes damage" || condition.stat.includes("recieves") ? condition.stat : "lands a " + condition.stat}, `
case "debuff":
Expand Down
16 changes: 8 additions & 8 deletions common/data/altspecials.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2910,7 +2910,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2925,7 +2925,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2940,7 +2940,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2955,7 +2955,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2970,7 +2970,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2985,7 +2985,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -3000,7 +3000,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -3015,7 +3015,7 @@ var ghostsAltSpecials = {
atk: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
type: "type",
orb: function(p) { return [1.3, 2.25, 1.3, 2.25][p.cached.multiplier]; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }] : { Good: 0, Great: 0, Perfect: 0 }; },
tapTiming: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? [{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.0 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 },{ Good: 0, Great: 0, Perfect: 0.4 }][p.cached.multiplier] : { Good: 0, Great: 0, Perfect: 0 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand Down
2 changes: 1 addition & 1 deletion common/data/captains.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11652,7 +11652,7 @@ window.captains = {
},
3350: {
atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "INT") ? [[4.25, 4.25],[5, 5.25]][CrunchUtils.llimitUnlock(p, "captains")][CrunchUtils.limitUnlock(p, "captains")] : 1; },
atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "INT") ? [1,1.2][CrunchUtils.llimitUnlock(p, "captains")] : 1; },
hp: function(p) { return (p.unit.type == "QCK" || p.unit.type == "INT") ? [1,1.2][CrunchUtils.llimitUnlock(p, "captains")] : 1; },
},
3351: {
atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 3.5 : 1; },
Expand Down
Loading

0 comments on commit 3e91f69

Please sign in to comment.