Skip to content

Commit

Permalink
TM Batch info
Browse files Browse the repository at this point in the history
  • Loading branch information
Solaris333 committed Sep 6, 2023
1 parent ff56545 commit f80d0ab
Show file tree
Hide file tree
Showing 23 changed files with 626 additions and 24 deletions.
Binary file added api/images/full/transparent/3/900/3978.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/3/900/3979.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/3/900/3980.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/3/900/3981.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/3/900/3978.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/3/900/3979.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/3/900/3980.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/3/900/3981.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/3/900/3978.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/3/900/3979.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/3/900/3980.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/3/900/3981.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions common/data/aliases.js
Original file line number Diff line number Diff line change
Expand Up @@ -3978,10 +3978,10 @@ window.aliases = {
3975: [ '', '', '' ],
3976: [ '', '', 'PKA' ],
3977: [ '', '', 'Secret Limited Rumble' ],
3978: [ '', '', '' ],
3979: [ '', '', '' ],
3980: [ '', '', '' ],
3981: [ '', '', '' ],
3978: [ '', '', 'Secret Limited TM Treasure Map' ],
3979: [ '', '', 'Secret Limited TM Treasure Map' ],
3980: [ '', '', 'Secret Limited TM Treasure Map' ],
3981: [ '', '', 'TM Treasure Map' ],
3982: [ '', '', '' ],
3983: [ '', '', '' ],
3984: [ '', '', '' ],
Expand Down
16 changes: 16 additions & 0 deletions common/data/captains.js
Original file line number Diff line number Diff line change
Expand Up @@ -14071,6 +14071,22 @@ window.captains = {
atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
},
3978: {
atk: function(p) { return 3.5; },
hp: function(p) { return 1.25; },
},
3979: {
atk: function(p) { return 3.5; },
hp: function(p) { return 1.25; },
},
3980: {
atk: function(p) { return 3.25; },
hp: function(p) { return 1.25; },
},
3967: {
atk: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? [2.75, 3, 3.25, 3.5, 3.75, 4, 4.25][CrunchUtils.limitUnlock(p, "captains")] : 1; },
hp: function(p) { return p.unit.type == "STR" || p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? [1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2][CrunchUtils.limitUnlock(p, "captains")] : 1; },
},
};

var calcGhostStartIDCaptains = { "start": 5000 };
Expand Down
8 changes: 4 additions & 4 deletions common/data/cooldowns.js
Original file line number Diff line number Diff line change
Expand Up @@ -3976,10 +3976,10 @@ window.cooldowns = [
[ 19, 13 ],
[ 17, 11 ],
[ 12, 12 ],
null,
null,
null,
null,
[ 18, 13 ],
[ 18, 13 ],
[ 18, 13 ],
[ 35, 29 ],
null,
null,
null,
Expand Down
341 changes: 326 additions & 15 deletions common/data/details.js

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions common/data/drops.js
Original file line number Diff line number Diff line change
Expand Up @@ -6709,6 +6709,16 @@ window.drops = {
'Raging Sea': [ 3965, "3956-skull" ]
},

{
name: 'Lead Performers',
dropID: 'treasuremap73',
thumb: 3981,
global: true,
nakama: 8398100,
gamewith: null,
'Raging Sea': [ 3981, "3956-skull" ]
},

],


Expand Down
4 changes: 4 additions & 0 deletions common/data/families.js
Original file line number Diff line number Diff line change
Expand Up @@ -4557,6 +4557,10 @@ window.families = {
3975: [ ...Killer ],
3976: [ ...Tama ],
3977: [ ...JeanBart ],
3978: [ ...RoronoaZoro ],
3979: [ ...VinsmokeSanji ],
3980: [ ...Raizo ],
3981: [ ...King, ...Queen, ...Jack ],
//break
4986: [ ...MonkeyDLuffy ],
4987: [ ...MonkeyDLuffy ],
Expand Down
3 changes: 3 additions & 0 deletions common/data/flags.js
Original file line number Diff line number Diff line change
Expand Up @@ -3872,6 +3872,9 @@ window.flags = {
3974: { rr: 1, rro: 1 },
3975: { rr: 1, rro: 1 },
3977: { rr: 1, rro: 1, lrr: 1, pflrr: 1 },
3978: { rr: 1, rro: 1, lrr: 1, tmlrr: 1 },
3979: { rr: 1, rro: 1, lrr: 1, tmlrr: 1 },
3980: { rr: 1, rro: 1, lrr: 1, tmlrr: 1 },
//break
4986: { rr: 1, rro: 1, global: 1 },
4987: { rr: 1, rro: 1, global: 1 },
Expand Down
216 changes: 216 additions & 0 deletions common/data/rumble.json
Original file line number Diff line number Diff line change
Expand Up @@ -273680,6 +273680,222 @@
"criteria": "near"
}
},
{
"ability": [
{
"effects": [
{
"attributes": [ "ATK" ],
"effect": "buff",
"level": 1,
"targeting": { "targets": [ "[STR]" ] }
},
{
"attributes": [ "SPD" ],
"effect": "debuff",
"level": 1,
"targeting": { "targets": [ "[DEX]" ] }
}
]
},
{
"effects": [
{
"override": { "level": 2 }
},
{
"override": { "level": 1 }
}
]
},
{
"effects": [
{
"override": { "level": 3 }
},
{
"override": { "level": 2 }
}
]
},
{
"effects": [
{
"override": { "level": 4 }
},
{
"override": { "level": 2 }
}
]
},
{
"effects": [
{
"override": { "level": 5 }
},
{
"override": { "level": 3 }
}
]
}
],
"id": 3981,
"pattern": [
{
"action": "attack",
"type": "Normal"
},
{
"action": "heal",
"area": "Medium",
"level": 2
},
{
"action": "attack",
"type": "Normal"
},
{
"action": "heal",
"area": "Small",
"level": 2
}
],
"resilience": [
{
"attribute": "Silence",
"chance": 60,
"type": "debuff"
}
],
"special": [
{
"cooldown": 26,
"effects": [
{
"amount": 0.5,
"effect": "damage",
"range": { "direction": "sideways", "size": "large" },
"targeting": { "targets": [ "enemies" ] },
"type": "atk"
},
{
"attributes": [ "ATK" ],
"duration": 6,
"effect": "buff",
"level": 1,
"targeting": { "targets": [ "[STR]" ] }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 0.6 }
},
{
"override": { "level": 1, "duration": 7 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 0.7 }
},
{
"override": { "level": 1, "duration": 8 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 0.8 }
},
{
"override": { "level": 1, "duration": 9 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 0.9 }
},
{
"override": { "level": 2, "duration": 10 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 1 }
},
{
"override": { "level": 2, "duration": 11 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 1.1 }
},
{
"override": { "level": 2, "duration": 12 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 1.2 }
},
{
"override": { "level": 3, "duration": 13 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 1.3 }
},
{
"override": { "level": 3, "duration": 14 }
}
]
},
{
"cooldown": 26,
"effects": [
{
"override": { "amount": 1.4 }
},
{
"override": { "level": 3, "duration": 15 }
}
]
}
],
"stats": {
"def": 158,
"rumbleType": "ATK",
"spd": 167
},
"target": {
"criteria": "near"
}
},
{
"basedOn": 2999,
"id": 5259
Expand Down
9 changes: 9 additions & 0 deletions common/data/sailors.js
Original file line number Diff line number Diff line change
Expand Up @@ -3067,6 +3067,15 @@ window.sailors = {
3977: {
atkStatic: function(p) { return p.unit.type == "PSY" || p.unit.type == "INT" ? 75 : 0; },
},
3978: {
staticMult: function(p) { return [0, 5][CrunchUtils.limitUnlock(p, "sailors")]; }
},
3979: {
atkStatic: function(p) { return [0, 150][CrunchUtils.limitUnlock(p, "sailors")]; },
},
3981: {
atkStatic: function(p) { return p.slot <= 1 ? [0, 100, 100][CrunchUtils.limitUnlock(p, "sailors")] : 0; },
},
4986: {
staticMult: function(p) { return 3; }
},
Expand Down
31 changes: 30 additions & 1 deletion common/data/specials.js
Original file line number Diff line number Diff line change
Expand Up @@ -16486,7 +16486,7 @@ window.specials = {
p.cached.multiplier = p.percHP > 99 ? 2 : 1;
},
},
3975: {
3977: {
atkbase: function(p) { return p.unit.type == "PSY" || p.unit.type == "INT" ? [1000, 0, 1000][p.cached.multiplier] : 0; },
status: function(p) { return p.defenseDown ? [1, 2.25, 2.25][p.cached.multiplier] : 1; },
onActivation: function(p) {
Expand All @@ -16499,6 +16499,35 @@ window.specials = {
});
},
},
3978: {
chain: function(p) { return 2.5; },
chainLimiter: function(p) {
var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
return p.chainPosition === 0 ? 1 : (prev == 'Good' || prev == 'Great' || prev == 'Perfect') ? 20 : 1;
},
},
3979: {
chainAddition: function(p) { return 1.2; },
},
3980: {
atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "INT" ? 1.75 : 1; },
type: "type",
orb: function(p) { return p.unit.type == "PSY" || p.unit.type == "INT" ? 1.75 : 1; },
},
3981: {
atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Powerhouse") ? [2.25, 2.5][p.cached.multiplier] : 1; },
type: "type",
orbPlus: function(p) { return [0, 0.25][p.cached.multiplier]; },
onActivation: function(p) {
var levels = [0, 1];
var n = (levels.indexOf(p.cached.multiplier) + 1) % levels.length;
p.cached.multiplier = levels[n];
p.scope.notify({
text: 'Using the ' + ["No Kaido Effects", "Kaido Effects"][levels[n]] + '. To switch to ' + ["No Kaido Effects", "Kaido Effects"][levels[(n + 1) % levels.length]] + ', disable and re-enable this special',
name: (p.team[p.sourceSlot].unit.number+1).toString() + 'warning'
});
},
},
};

var calcGhostStartIDSpecials = { "start": 5000 };
Expand Down
4 changes: 4 additions & 0 deletions common/data/units.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f80d0ab

Please sign in to comment.