Skip to content

Commit

Permalink
A lot of fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Solaris333 committed Jan 16, 2024
1 parent d1e074d commit 238b01a
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 60 deletions.
13 changes: 11 additions & 2 deletions common/data/altspecials.js
Original file line number Diff line number Diff line change
Expand Up @@ -2878,8 +2878,10 @@ var ghostsAltSpecials = {
},
},
563: {
chainMultiplication: function(p) { return [1.25, 1.4, 1.25, 1.4][p.cached.multiplier]; },
chainMultiplicationPlus: function(p) { return [0, 0, 0.25, 0.25][p.cached.multiplier]; },
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 }; },
onActivation: function(p) {
var levels = [0, 1, 2, 3];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
Expand All @@ -2892,6 +2894,7 @@ var ghostsAltSpecials = {
},
564: {
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 }; },
onActivation: function(p) {
Expand All @@ -2906,6 +2909,7 @@ var ghostsAltSpecials = {
},
565: {
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 }; },
onActivation: function(p) {
Expand All @@ -2920,6 +2924,7 @@ var ghostsAltSpecials = {
},
566: {
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 }; },
onActivation: function(p) {
Expand All @@ -2934,6 +2939,7 @@ var ghostsAltSpecials = {
},
567: {
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 }; },
onActivation: function(p) {
Expand All @@ -2948,6 +2954,7 @@ var ghostsAltSpecials = {
},
568: {
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 }; },
onActivation: function(p) {
Expand All @@ -2962,6 +2969,7 @@ var ghostsAltSpecials = {
},
569: {
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 }; },
onActivation: function(p) {
Expand All @@ -2976,6 +2984,7 @@ var ghostsAltSpecials = {
},
570: {
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 }; },
onActivation: function(p) {
Expand Down
6 changes: 3 additions & 3 deletions common/data/details.js
Original file line number Diff line number Diff line change
Expand Up @@ -142097,9 +142097,9 @@ window.details = {
combined: "Deals 300x character's ATK in Typeless Fixed True damage to enemies, reduces enemies' Threshold Damage Reduction and Increased Defense duration by 7 turns, increases boost effects of ATK UP and Orb Amplification buffs by +0.5x, boosts Chain Multiplier Growth Rate by 1.75x for 1 turn and adds 2.0x to Chain multiplier for 1 turn. If your Captain is a Slasher or Free Spirit character, changes Class 1 of all characters to Slasher for 3 turns and changes Class 2 of all characters to Free Spirit for 3 turns."
},
specialName: "Calamity Quelling Ifrit and the King of Hell",
superSpecial: "Increases Chain Tap Timing Bonus of Cerebral and Free Spirit characters to +0.0x-0.7x for 1 turn depending on Tap Timing, transforms Slasher characters into Super Slasher characters, and transforms Free Spirit characters into Super Free Spirit characters.",
superSpecial: "Increases Chain Tap Timing Bonus of Slasher and Free Spirit characters to +0.0x-0.7x for 1 turn depending on Tap Timing, transforms Slasher characters into Super Slasher characters, and transforms Free Spirit characters into Super Free Spirit characters.",
SuperSpecialNotes: "Good: 0x | Great: 0.1x | Perfect 0.7x",
superSpecialCriteria: "This character must be captain and when this character is in Combined Form from Super Swap effect and your crew must consist of any 3 of the following, excluding Supports and counting only 1 per unit: Monkey D. Luffy, Nami, Usopp, Tony Tony Chopper, Nico Robin, Franky, Brook, Jinbe, Yamato, Trafalgar Law, Eustass Kid, Kozuki Momonosuke, Kozuki Hiyori (Komurasaki), Kin'emon, Izo, Raizo, Okiku, Ashura Doji (Shutenmaru), Dogstorm, Cat Viper, Kawamatsu, Denjiro (Kyoshiro)",
superSpecialCriteria: "When this character is in Combined Form from Super Swap effect and your crew must consist of any 3 of the following, excluding Supports and counting only 1 per unit: Monkey D. Luffy, Nami, Usopp, Tony Tony Chopper, Nico Robin, Franky, Brook, Jinbe, Yamato, Trafalgar Law, Eustass Kid, Kozuki Momonosuke, Kozuki Hiyori (Komurasaki), Kin'emon, Izo, Raizo, Okiku, Ashura Doji (Shutenmaru), Dogstorm, Cat Viper, Kawamatsu, Denjiro (Kyoshiro)",
superTandem: {
characterCondition: [
"Any 3 of the following, excluding Supports and counting only 1 per unit: Monkey D. Luffy, Yamato, Nami, Usopp, Tony Tony Chopper, Nico Robin, Franky, Brook, Jinbe, Kozuki Momonosuke, Kozuki Hiyori (Komurasaki), Kin'emon, Izo, Raizo, Okiku, Ashura Doji (Shutenmaru), Dogstorm, Cat Viper, Kawamatsu, Denjiro (Kyoshiro), Trafalgar Law, Eustass Kid. 1 of the following is required: Monkey D. Luffy, Yamato.",
Expand Down Expand Up @@ -142821,7 +142821,7 @@ window.details = {
special: "Reduces Silence, Paralysis and Burn duration by 6 turns, recovers 30,000 HP, and changes orbs, including [BLOCK] orbs, of top and bottom row characters into [RAINBOW] orbs. If your crew has ATK UP when the special is activated, boosts Color Affinity of [QCK] and Free Spirit characters by 2.75x for 1 turn, boosts ATK of [QCK] Free Spirit characters by 3x for 1 turn, and boosts ATK of other [QCK] and Free Spirit characters by 2.75x for 1 turn otherwise.",
specialName: "Bath Before the Feast",
superSpecial: "Reduces Silence duration by 6 turns, ignores Delay Debuff Protection and delays all enemies by 1 turn, boosts ATK against delayed enemies by 1.75x for 1 turn, and transforms [QCK] characters into Super [QCK] characters.",
superSpecialCriteria: "This character must be captain and HP must be below 30% or your crew must consist of any 3 of the following, excluding Supports and counting only 1 per unit: Roronoa Zoro, Nami, Usopp, Sanji, Tony Tony Chopper, Nico Robin, Franky, Brook, Jinbe, Yamato, Kozuki Momonosuke, Otama",
superSpecialCriteria: "This character must be captain and HP must be below 30% or your crew must consist of any 2 of the following, excluding Supports and counting only 1 per unit: Roronoa Zoro, Nami, Usopp, Sanji, Tony Tony Chopper, Nico Robin, Franky, Brook, Jinbe, Yamato, Kozuki Momonosuke, Otama",
support: [
{
Characters: "Kozuki Momonosuke, Yamato",
Expand Down
Loading

0 comments on commit 238b01a

Please sign in to comment.