New TM Batch Datamine and Update

characters/js/table.js

@@ -274,7 +274,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage) {
         if (filters.noLLB && window.details[id]) if("lLimit" in window.details[id]) return false;
 
         if (filters.noSupport && window.details[id]) if("support" in window.details[id]) return false;
-        if (filters.globalTM && [ 4094, 4092, 4093, 4088, 4074, 4082, 4084, 4089, 4086, 4087, 4058, 4060, 4062, 4064, 4065, 4054, 4068, 4067, 4085, 4066, 4078, 4079, 4080, 4063, 3336, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4047, 4053, 4056, 3981, 3822, 3758, 3689, 3467, 3416, 3368, 3094, 2763, 2659, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 4071, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4048, 4041, 4043, 4044, 4045, 4046, 4037, 4038, 4039, 4021, 2886, 3399, 3078, 2885, 3143, 2642, 2504, 2097, 5012, 1518, 353, 2953, 2569, 2375, 2471, 1945, 3580, 1251, 951, 3773, 3293, 2707, 3307, 3978, 3979, 3980, 3484, 3485, 4072, 4073, 4051, 4052, 2845, 2684, 603, 2782, 2640, 2524, 2457, 1606, 1597 ].indexOf(id) == -1) return false;
+        if (filters.globalTM && [ 4111, 4112, 4113, 4107, 4089, 4100, 4102, 4108, 4103, 4104, 4105, 4106, 4109, 4096, 4097, 4082, 4084, 4086, 4087, 4088, 4098, 4066, 4074, 4078, 4079, 4080, 4085, 4063, 4068, 4067, 3443, 3936, 3022, 3094, 3965, 2879, 3915, 3567, 3981, 3416, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 4071, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4054, 4058, 4060, 4062, 4064, 4065, 4056, 516, 1108, 1298, 1163, 5024, 2473, 2517, 2956, 3110, 3671, 1102, 1456, 2163, 2193, 2249, 2869, 2917, 3145, 3235, 3385, 4039, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 5054, 5055, 5056, 5057, 3584, 3585, 3586, 3564, 3565, 4094, 4093, 4092, 4072, 4073, 3460, 3083, 3017, 2092, 1842, 2751, 392, 929, 2165 ].indexOf(id) == -1) return false;
         if (filters.globalKC && [ 4075, 4076, 4058, 4060, 4062, 4065, 4064, 4074, 4066, 4071, 4072, 4073, 4068, 4067, 4063, 3336, 4080, 3227, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 4054, 4055, 2443, 2469, 2510, 2618, 3393, 3417, 4041, 4043, 3948, 3809, 3745, 3536, 3950, 3926, 3749, 3824, 3391, 3349, 3825, 3760, 3761, 3737, 3624, 3548, 3509, 3392, 3212, 3151, 5062, 5063, 5064, 5065, 5176, 5177, 5178, 5179, 5333, 5334, 5335, 5336 ].indexOf(id) == -1) return false;
         if (filters.globalPKA && [ 2936, 2940, 2938, 2942, 2944, 2948, 2946, 2952, 2950, 3884, 4025, 3999, 3976, 3952, 3927, 3885, 3305, 3304, 3353, 3382, 3401, 3400, 3425, 4021, 3874, 3903, 3887, 3855, 3835, 3796, 3815, 3795, 3770, 3743, 3750, 3728, 3713, 3678, 3657, 3620, 3634, 3601, 3560, 3579, 3559, 3520, 3539, 3518, 3481, 3498, 3477, 3436, 4047, 3886, 4033, 4067, 4068, 4041, 4043, 4044, 4045, 4046, 4053, 4056, 4058, 4065, 4066, 4060, 4062, 4063, 4064, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4074, 4080, 4078, 4079, 4087, 4086, 4085, 4082, 4084 ].indexOf(id) == -1) return false;
 

characters/views/sidebar.html

@@ -255,7 +255,7 @@
         <i class="pull-right fa fa-{{filters.tmkcEnabled ? 'chevron-up' : 'chevron-down'}}"></i>
     </span>
     <span class="filter width-12 exc" ng-model="filters.globalTM" ng-class="{ active: filters.globalTM }"
-        ng-click="filters.globalTM = !filters.globalTM">Treasure Map Boosters [Bonney]</span>
+        ng-click="filters.globalTM = !filters.globalTM">Treasure Map Boosters [S-Hawk]</span>
     <!--span class="filter width-6 exc" ng-model="filters.japanTM" ng-class="{ active: filters.japanTM }"
         ng-click="filters.japanTM = !filters.japanTM">Show Japan TM Boosters [Hyogoro the Flower]</span-->
     <span class="filter width-12 exc" ng-model="filters.globalKC" ng-class="{ active: filters.globalKC }"

common/data/aliases.js

@@ -4101,19 +4101,19 @@ window.aliases = {
     4098: [ '', '', 'Mega Super 6+ V3' ],
     4099: [ '', '', 'Anniversary Limited Legend' ],
     4100: [ '', '', 'Anniversary Limited Legend' ],
-    4101: [ '', '', 'Anniversary Limited Legend V1' ],
-    4102: [ '', '', 'Anniversary Limited Legend V1' ],
+    4101: [ '', '', 'Anniversary Legend V1' ],
+    4102: [ '', '', 'Anniversary Legend V1' ],
     4103: [ '', '', '' ],
     4104: [ '', '', '' ],
     4105: [ '', '', '' ],
     4106: [ '', '', '' ],
     4107: [ '', '', 'TM PKA' ],
-    4108: [ '', '', '' ],
+    4108: [ '', '', 'TM PKA' ],
     4109: [ '', '', 'Secret Limited Rumble PR Legend V1' ],
-    4110: [ '', '', '' ],
-    4111: [ '', '', '' ],
-    4112: [ '', '', '' ],
-    4113: [ '', '', '' ],
+    4110: [ '', '', 'Anniversary Legend' ],
+    4111: [ '', '', 'Anniversary Legend' ],
+    4112: [ '', '', 'TM' ],
+    4113: [ '', '', 'TM' ],
     4114: [ '', '', '' ],
     4115: [ '', '', '' ],
     4116: [ '', '', '' ],

common/data/captains.js

@@ -14504,6 +14504,10 @@ window.captains = {
         atk: function(p) { return p.percHP >= 80 ? 4 : 3.75; },
         hp: function(p) { return 1.25; },
     },
+    4108: {
+        atk: function(p) { return p.percHP >= 80 ? 4.25 : 4; },
+        hp: function(p) { return 1.25; },
+    },
     4109: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Driven" ]); },
         hitAtk: function(p) {
@@ -14513,6 +14517,21 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    4110: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? p.unit.cost <= 40 ? 6 : 5.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.3 : 1; },
+    },
+    4111: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? p.unit.cost <= 40 ? 6 : 5.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.3 : 1; },
+    },
+    4112: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 3.5 : 1; },
+    },
+    4113: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 3.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.2 : 1; },
+    },
 };
 
 var calcGhostStartIDCaptains = { "start": 5000 };

common/data/cooldowns.js

@@ -4106,12 +4106,12 @@ window.cooldowns = [
     [ 19, 13 ],
     [ 19, 13 ],
     [ 19, 13 ],
-    null,
+    [ 18, 12 ],
     [ 20, 15 ],
-    null,
-    null,
-    null,
-    null,
+    [ 22, 17 ],
+    [ 22, 17 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
     null,
     null,
     null,