Skip to content

Commit

Permalink
G5 Batch Update Finish
Browse files Browse the repository at this point in the history
  • Loading branch information
@Solaris333
Solaris333 committed Aug 3, 2023
1 parent e451c54 commit 6f756ca
Show file tree
Hide file tree
Showing 14 changed files with 1,667 additions and 1,137 deletions.
10 changes: 5 additions & 5 deletions common/data/aliases.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3953,11 +3953,11 @@ window.aliases = {
3950: [ '', '', '' ],
3951: [ '', '', '' ],
3952: [ '', '', 'PKA Pirate King Adventure' ],
3953: [ '', '', '' ],
3954: [ '', '', '' ],
3955: [ '', '', '' ],
3956: [ '', '', '' ],
3957: [ '', '', '' ],
3953: [ '', '', 'Rumble Secret Limited Legend' ],
3954: [ '', '', 'Rumble Secret Limited Legend' ],
3955: [ '', '', 'Super Secret Limited Legend Gear 5 G5' ],
3956: [ '', '', 'Super Secret Limited Legend Gear 5 G5' ],
3957: [ '', '', 'Super Secret Limited Legend Gear 5 G5' ],
3958: [ '', '', '' ],
3959: [ '', '', '' ],
3960: [ '', '', '' ],
Expand Down
9 changes: 9 additions & 0 deletions common/data/altspecials.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,15 @@ window.altspecials = {
3903: {
increaseDamageTaken: function(p) { return 2; },
},
3956: {
turnedOn: false,
onActivation: function(p) {
window.altspecials[p.team[p.sourceSlot].unit.number+1].turnedOn = true;
},
onDeactivation: function(p) {
window.altspecials[p.team[p.sourceSlot].unit.number+1].turnedOn = false;
},
},
};

var calcGhostStartIDAltSpecials = { "start": 5000 };
Expand Down
32 changes: 32 additions & 0 deletions common/data/captains.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13983,6 +13983,38 @@ window.captains = {
atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? 4 : 1; },
rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? 1.2 : 1; },
},
3953: {
atk: function(p) { return p.unit.class.has("Slasher") ? p.percHP >= 80 || p.percHP <= 25 ? 5.25 : 5 : 1; },
hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; },
},
3954: {
atk: function(p) { return p.unit.class.has("Slasher") ? p.percHP >= 80 || p.percHP <= 25 ? 5.25 : 5 : 1; },
hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; },
},
3955: {
atk: function(p) { return p.unit.type == "PSY" || p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 6 : 5.5 : p.actions[p.sourceSlot] ? 5 : 4.5; },
hp: function(p) { return p.unit.type == "PSY" || p.unit.class.has("Free Spirit") ? 1.2 : 1; },
},
3956: {
atk: function(p) { return p.unit.type == "PSY" || p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 6 : 5.5 : p.actions[p.sourceSlot] ? 5 : 4.5; },
hp: function(p) { return p.unit.type == "PSY" || p.unit.class.has("Free Spirit") ? 1.2 : 1; },
},
3958: {
atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 5.25 : 1; },
hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.35 : 1; },
},
3959: {
atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 5.25 : 1; },
hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.35 : 1; },
},
3960: {
atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 3.25 : 1; },
rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.35 : 1; },
},
3961: {
atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 3.25 : 1; },
rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.3 : 1; },
},
};

var calcGhostStartIDCaptains = { "start": 5000 };
Expand Down
16 changes: 8 additions & 8 deletions common/data/cooldowns.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3951,15 +3951,15 @@ window.cooldowns = [
[ 20, 14 ],
[ 18, 12 ],
[ 15, 9 ],
[ 19, 14 ],
[ 19, 14 ],
[ 22, 17 ],
[ 22, 17 ],
null,
null,
null,
null,
null,
null,
null,
null,
null,
[ 20, 15 ],
[ 20, 15 ],
[ 18, 12 ],
[ 20, 14 ],
null,
null,
null,
Expand Down
1,355 changes: 238 additions & 1,117 deletions common/data/details.js
View file

Large diffs are not rendered by default.

68 changes: 64 additions & 4 deletions common/data/events.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,21 +616,21 @@ window.events = {
3306: {
onInsertion: function($scope) {
if (++$scope.options.meatOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [MEAT] orbs support.' });
$scope.notify({ text: 'Enabling [RCV] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.meatOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [MEAT] orbs support.' });
$scope.notify({ text: 'Disabling [RCV] orbs support.' });
}
},
3307: {
onInsertion: function($scope) {
if (++$scope.options.meatOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [MEAT] orbs support.' });
$scope.notify({ text: 'Enabling [RCV] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.meatOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [MEAT] orbs support.' });
$scope.notify({ text: 'Disabling [RCV] orbs support.' });
}
},
3350: {
Expand Down Expand Up @@ -1137,6 +1137,66 @@ window.events = {
$scope.notify({ text: 'Disabling [WANO], [TND] and [MEAT] orbs support.' });
}
},
3953: {
onInsertion: function($scope) {
if (++$scope.options.wanoOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [WANO] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.wanoOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [WANO] orbs support.' });
}
},
3954: {
onInsertion: function($scope) {
if (++$scope.options.wanoOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [WANO] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.wanoOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [WANO] orbs support.' });
}
},
3955: {
onInsertion: function($scope) {
if (++$scope.options.meatOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [RCV] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.meatOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [RCV] orbs support.' });
}
},
3956: {
onInsertion: function($scope) {
if (++$scope.options.meatOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [RCV] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.meatOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [RCV] orbs support.' });
}
},
3958: {
onInsertion: function($scope) {
if (++$scope.options.wanoOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [WANO] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.wanoOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [WANO] orbs support.' });
}
},
3959: {
onInsertion: function($scope) {
if (++$scope.options.wanoOrbsEnabled == 1)
$scope.notify({ text: 'Enabling [WANO] orbs support.' });
},
onRemoval: function($scope) {
if (--$scope.options.wanoOrbsEnabled === 0)
$scope.notify({ text: 'Disabling [WANO] orbs support.' });
}
},
5052: {
onInsertion: function($scope) {
if (++$scope.options.meatOrbsEnabled == 1)
Expand Down
12 changes: 12 additions & 0 deletions common/data/evolutions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5583,6 +5583,18 @@ window.evolutions = {
evolution: 3948,
evolvers: [ ]
},
3953: {
evolution: 3954,
evolvers: [ ]
},
3955: {
evolution: 3956,
evolvers: [ ]
},
3958: {
evolution: 3959,
evolvers: [ ]
},
4986: {
evolution: 4987,
evolvers: [ 118, 86, 266, 302, 267 ]
Expand Down
8 changes: 8 additions & 0 deletions common/data/families.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4530,6 +4530,14 @@ window.families = {
3950: [ ...Kikunojo ],
3951: [ ...Usopp ],
3952: [ ...Maha ],
3953: [ ...Kawamatsu ],
3954: [ ...Kawamatsu ],
3955: [ ...MonkeyDLuffy ],
3956: [ ...MonkeyDLuffy ],
3958: [ ...KozukiMomonosuke ],
3959: [ ...KozukiMomonosuke ],
3960: [ ...KozukiHiyori ],
3961: [ ...Denjiro ],
//break
4986: [ ...MonkeyDLuffy ],
4987: [ ...MonkeyDLuffy ],
Expand Down
8 changes: 8 additions & 0 deletions common/data/flags.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3851,6 +3851,14 @@ window.flags = {
3949: { rr: 1, rro: 1 },
3950: { rr: 1, rro: 1 },
3951: { rr: 1, rro: 1 },
3953: { rr: 1, rro: 1, lrr: 1, pflrr: 1 },
3954: { rr: 1, rro: 1, lrr: 1, pflrr: 1 },
3955: { rr: 1, rro: 1, lrr: 1, superlrr: 1 },
3956: { rr: 1, rro: 1, lrr: 1, superlrr: 1 },
3958: { rr: 1, rro: 1 },
3959: { rr: 1, rro: 1 },
3960: { rr: 1, rro: 1 },
3961: { rr: 1, rro: 1 },
//break
4986: { rr: 1, rro: 1, global: 1 },
4987: { rr: 1, rro: 1, global: 1 },
Expand Down
Loading

0 comments on commit 6f756ca

Please sign in to comment.