Skip to content

Commit

Permalink
New EOM + Rumble Batch Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Solaris333 committed Mar 1, 2024
1 parent 02222ef commit abbd4c4
Show file tree
Hide file tree
Showing 39 changed files with 1,838 additions and 570 deletions.
Binary file modified api/images/full/transparent/4/000/4089.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified api/images/full/transparent/4/000/4096.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified api/images/full/transparent/4/000/4098.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/000/4099.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4101.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4102.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4103.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4104.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4105.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4106.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4107.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/full/transparent/4/100/4109.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/glo/4/100/4109.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/000/4099.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4101.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4102.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4103.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4104.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4105.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4106.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4107.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added api/images/thumbnail/jap/4/100/4109.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions common/data/aliases.js
Original file line number Diff line number Diff line change
Expand Up @@ -4095,21 +4095,21 @@ window.aliases = {
4092: [ '', '', 'Secret Limited Treasure Map TM' ],
4093: [ '', '', 'Secret Limited Treasure Map TM' ],
4094: [ '', '', 'Secret Limited Treasure Map TM' ],
4095: [ '', '', 'Secret Limited Kizuna KC Legend V6' ],
4096: [ '', '', 'Secret Limited Kizuna KC Legend V6' ],
4095: [ '', '', 'Legend V6' ],
4096: [ '', '', 'Legend V6' ],
4097: [ '', '', 'Secret Limited Kizuna KC' ],
4098: [ '', '', 'Mega Super 6+ V3' ],
4099: [ '', '', '' ],
4100: [ '', '', '' ],
4101: [ '', '', '' ],
4102: [ '', '', '' ],
4099: [ '', '', 'Anniversary Limited Legend' ],
4100: [ '', '', 'Anniversary Limited Legend' ],
4101: [ '', '', 'Anniversary Limited Legend V1' ],
4102: [ '', '', 'Anniversary Limited Legend V1' ],
4103: [ '', '', '' ],
4104: [ '', '', '' ],
4105: [ '', '', '' ],
4106: [ '', '', '' ],
4107: [ '', '', '' ],
4107: [ '', '', 'TM PKA' ],
4108: [ '', '', '' ],
4109: [ '', '', '' ],
4109: [ '', '', 'Secret Limited Rumble PR Legend V1' ],
4110: [ '', '', '' ],
4111: [ '', '', '' ],
4112: [ '', '', '' ],
Expand Down
6 changes: 6 additions & 0 deletions common/data/altspecials.js
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,12 @@ window.altspecials = {
window.altspecials[p.team[p.sourceSlot].unit.number+1].turnedOn = false;
},
},
4100: {
superAffinity: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
},
4058: {
atkbase: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Fighter") ? 1250 : 0; },
},
};

var calcGhostStartIDAltSpecials = { "start": 5000 };
Expand Down
6 changes: 6 additions & 0 deletions common/data/capspecials.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ window.capspecials = {
4085: {
affinityPlus: function(p) { return 0.25; },
},
4099: {
status: function(p) { return p.enemyEffects.increaseDamageTaken ? 2.25 : 1; },
},
4100: {
status: function(p) { return p.enemyEffects.increaseDamageTaken ? 2.25 : 1; },
},
};

var calcGhostStartIDCapSpecials = { "start": 5000 };
Expand Down
41 changes: 41 additions & 0 deletions common/data/captains.js
Original file line number Diff line number Diff line change
Expand Up @@ -14472,6 +14472,47 @@ window.captains = {
4098: {
atk: function(p) { return (window.specials[4098].turnedOn[p.sourceSlot]) && p.slot == p.sourceSlot ? [5.25, 5.75][CrunchUtils.llimitUnlock(p, "captains")] : p.unit.class.has("Fighter") || p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? [4.5, 5][CrunchUtils.llimitUnlock(p, "captains")] : 1; },
},
4099: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? p.classcount.Fighter > 1 && p.classcount.Slasher > 1 && p.classcount.Striker > 1 && p.classcount.Shooter > 1 ? 5.75 : 5 : 1; },
hp: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? 1.2 : 1; },
},
4100: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? p.classcount.Fighter > 1 && p.classcount.Slasher > 1 && p.classcount.Striker > 1 && p.classcount.Shooter > 1 ? 5.75 : 5 : 1; },
hp: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? 1.2 : 1; },
},
4101: {
atk: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Fighter") ? 5.5 : 1; },
hp: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Fighter") ? 1.4 : 1; },
},
4102: {
atk: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Fighter") ? 5.5 : 1; },
hp: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Fighter") ? 1.4 : 1; },
},
4103: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 3.5 : 1; },
},
4104: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Shooter") ? 3.5 : 1; },
},
4105: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 3.5 : 1; },
},
4106: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Shooter") ? 3.5 : 1; },
},
4107: {
atk: function(p) { return p.percHP >= 80 ? 4 : 3.75; },
hp: function(p) { return 1.25; },
},
4109: {
damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Driven" ]); },
hitAtk: function(p) {
if (!(p.unit.class.has('Slasher') || p.unit.class.has('Driven'))) return 1;
var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
return p.chainPosition === 0 ? 4.75 : (prev == 'Good' ? 5 : (prev == 'Great' ? 5.25 : (prev == 'Perfect' ? 5.5 : 4.75)));
},
hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
},
};

var calcGhostStartIDCaptains = { "start": 5000 };
Expand Down
20 changes: 10 additions & 10 deletions common/data/cooldowns.js
Original file line number Diff line number Diff line change
Expand Up @@ -4097,17 +4097,17 @@ window.cooldowns = [
[ 20, 15 ],
[ 19, 14 ],
[ 18, 13 ],
[ 21, 16 ],
[ 21, 16 ],
[ 21, 16 ],
[ 21, 16 ],
[ 20, 14 ],
[ 20, 14 ],
[ 19, 13 ],
[ 19, 13 ],
[ 19, 13 ],
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
[ 20, 15 ],
null,
null,
null,
Expand Down
Loading

0 comments on commit abbd4c4

Please sign in to comment.