TM WB 5+ Datamine

optc-db · Jan 10, 2024 · 880340c · 880340c
1 parent e97d325
commit 880340c
Show file tree

Hide file tree

Showing 15 changed files with 507 additions and 11 deletions.
diff --git a/api/images/thumbnail/glo/4/000/4071.png b/api/images/thumbnail/glo/4/000/4071.png
diff --git a/api/images/thumbnail/glo/4/000/4072.png b/api/images/thumbnail/glo/4/000/4072.png
diff --git a/api/images/thumbnail/glo/4/000/4073.png b/api/images/thumbnail/glo/4/000/4073.png
diff --git a/api/images/thumbnail/glo/4/000/4074-skull.png b/api/images/thumbnail/glo/4/000/4074-skull.png
diff --git a/api/images/thumbnail/glo/4/000/4074.png b/api/images/thumbnail/glo/4/000/4074.png
diff --git a/api/images/thumbnail/jap/4/000/4071.png b/api/images/thumbnail/jap/4/000/4071.png
diff --git a/api/images/thumbnail/jap/4/000/4072.png b/api/images/thumbnail/jap/4/000/4072.png
diff --git a/api/images/thumbnail/jap/4/000/4073.png b/api/images/thumbnail/jap/4/000/4073.png
diff --git a/api/images/thumbnail/jap/4/000/4074-skull.png b/api/images/thumbnail/jap/4/000/4074-skull.png
diff --git a/api/images/thumbnail/jap/4/000/4074.png b/api/images/thumbnail/jap/4/000/4074.png
diff --git a/characters/js/table.js b/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 && [ 4050, 4051, 4052, 4041, 4043, 4033, 4047, 4053, 4044, 4045, 4046, 4048, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4038, 4039, 4037, 4025, 4006, 4021, 4010, 3965, 3915, 3842, 3822, 3527, 3506, 3663, 3273, 3197, 2362, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4008, 3984, 3986, 3987, 3988, 3993, 3995, 3996, 3997, 3998, 4000, 3989, 3957, 3999, 3990, 3991, 3143, 3078, 2846, 2504, 3289, 2197, 2097, 2281, 516, 227, 2908, 3017, 2785, 2649, 2755, 1978, 1378, 1310, 3580, 3385, 3940, 2835, 3307, 5543, 5544, 5545, 5546, 5535, 5536, 5537, 5538, 5520, 5521, 5522, 5523, 5206, 5207, 5208, 5209, 3934, 3935, 3733, 3732, 4004, 4005, 2698, 1861, 3083, 2723, 713, 664, 538, 424, 263 ].indexOf(id) == -1) return false;
+        if (filters.globalTM && [ 4071, 4072, 4073, 4066, 4053, 4074, 4058, 4060, 4062, 4063, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570, 4064, 4065, 4054, 4041, 4043, 4044, 4045, 4046, 4048, 4068, 4067, 4047, 4056, 3336, 4025, 4033, 4038, 4039, 4037, 3936, 3894, 3736, 3689, 3217, 3022, 2850, 2792, 2299, 1972, 5210, 5211, 5212, 5213, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4010, 4021, 3671, 3263, 2956, 2670, 1815, 1879, 1432, 603, 447, 418, 2813, 2489, 2290, 2249, 2037, 926, 882, 924, 3235, 3210, 3835, 2195, 3962, 3963, 3964, 3544, 3545, 4051, 4052, 2517, 2908, 1733, 2428, 2091, 2021, 1828, 1566, 948, 5070, 5071, 5072, 5073 ].indexOf(id) == -1) return false;
         if (filters.globalKC && [ 4054, 4055, 4041, 4043, 4044, 4045, 4046, 4048, 4050, 4051, 4052, 4047, 4053, 2007, 4056, 3886, 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 2261, 2336, 2362, 2387, 3369, 3350, 3967, 3508, 3391, 3937, 3623, 3591, 3569, 3568, 3528, 3445, 3446, 3447, 3152, 3973, 3956, 3957, 3959, 3896, 3493, 2706, 5353, 5354, 5355, 5356 ].indexOf(id) == -1) return false;
         if (filters.globalPKA && [ 2936, 2940, 2938, 2942, 2944, 2948, 2946, 2952, 2950, 3884, 3999, 3976, 3952, 3927, 3885, 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, 3886, 4025, 3336, 4033, 4047, 4041, 4043, 4044, 4045, 4046, 4037, 4038, 4039, 4011, 4012, 4020, 4022, 4023, 4056, 4053, 4063, 4064, 4065, 4058, 4060, 4062, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570 ].indexOf(id) == -1) return false;
 

diff --git a/characters/views/sidebar.html b/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 [Luffy]</span>
+        ng-click="filters.globalTM = !filters.globalTM">Treasure Map Boosters [Zoro]</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 }"

diff --git a/common/data/details.js b/common/data/details.js
diff --git a/common/data/effects.js b/common/data/effects.js
@@ -410,25 +410,25 @@ window.effects = {
         atk: function(p) {
             var boost = 1;
             var id = p.number + 1;
-            if([ 4050, 4051, 4052, 4041, 4043, 4033, 4047, 4053 ].indexOf(id) != -1) boost = 2.5;
-            if([ 4044, 4045, 4046, 4048, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4038, 4039, 4037, 4025, 4006, 4021, 4010, 3965, 3915, 3842, 3822, 3527, 3506, 3663, 3273, 3197, 2362, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3934, 3935, 3733, 3732, 4004, 4005 ].indexOf(id) != -1) boost = 1.25;
-            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4008, 3984, 3986, 3987, 3988, 3993, 3995, 3996, 3997, 3998, 4000, 3989, 3957, 3999, 3990, 3991, 3143, 3078, 2846, 2504, 3289, 2197, 2097, 2281, 516, 227, 2908, 3017, 2785, 2649, 2755, 1978, 1378, 1310, 3580, 3385, 3940, 2835, 3307, 5543, 5544, 5545, 5546, 5535, 5536, 5537, 5538, 5520, 5521, 5522, 5523, 5206, 5207, 5208, 5209, 2698, 1861, 3083, 2723, 713, 664, 538, 424, 263 ].indexOf(id) != -1) boost = 1.2;
+            if([ 4071, 4072, 4073, 4066, 4053, 4074, 4058, 4060, 4062, 4063, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570 ].indexOf(id) != -1) boost = 2.5;
+            if([ 4064, 4065, 4054, 4041, 4043, 4044, 4045, 4046, 4048, 4068, 4067, 4047, 4056, 3336, 4025, 4033, 4038, 4039, 4037, 3936, 3894, 3736, 3689, 3217, 3022, 2850, 2792, 2299, 1972, 5210, 5211, 5212, 5213, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3962, 3963, 3964, 3544, 3545, 4051, 4052 ].indexOf(id) != -1) boost = 1.25;
+            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4010, 4021, 3671, 3263, 2956, 2670, 1815, 1879, 1432, 603, 447, 418, 2813, 2489, 2290, 2249, 2037, 926, 882, 924, 3235, 3210, 3835, 2195, 2517, 2908, 1733, 2428, 2091, 2021, 1828, 1566, 948, 5070, 5071, 5072, 5073 ].indexOf(id) != -1) boost = 1.2;
             return boost;
         },
         hp: function(p) {
             var boost = 1;
             var id = p.number + 1;
-            if([ 4050, 4051, 4052, 4041, 4043, 4033, 4047, 4053 ].indexOf(id) != -1) boost = 2.5;
-            if([ 4044, 4045, 4046, 4048, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4038, 4039, 4037, 4025, 4006, 4021, 4010, 3965, 3915, 3842, 3822, 3527, 3506, 3663, 3273, 3197, 2362, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3934, 3935, 3733, 3732, 4004, 4005 ].indexOf(id) != -1) boost = 1.25;
-            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4008, 3984, 3986, 3987, 3988, 3993, 3995, 3996, 3997, 3998, 4000, 3989, 3957, 3999, 3990, 3991, 3143, 3078, 2846, 2504, 3289, 2197, 2097, 2281, 516, 227, 2908, 3017, 2785, 2649, 2755, 1978, 1378, 1310, 3580, 3385, 3940, 2835, 3307, 5543, 5544, 5545, 5546, 5535, 5536, 5537, 5538, 5520, 5521, 5522, 5523, 5206, 5207, 5208, 5209, 2698, 1861, 3083, 2723, 713, 664, 538, 424, 263 ].indexOf(id) != -1) boost = 1.2;
+            if([ 4071, 4072, 4073, 4066, 4053, 4074, 4058, 4060, 4062, 4063, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570 ].indexOf(id) != -1) boost = 2.5;
+            if([ 4064, 4065, 4054, 4041, 4043, 4044, 4045, 4046, 4048, 4068, 4067, 4047, 4056, 3336, 4025, 4033, 4038, 4039, 4037, 3936, 3894, 3736, 3689, 3217, 3022, 2850, 2792, 2299, 1972, 5210, 5211, 5212, 5213, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3962, 3963, 3964, 3544, 3545, 4051, 4052 ].indexOf(id) != -1) boost = 1.25;
+            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4010, 4021, 3671, 3263, 2956, 2670, 1815, 1879, 1432, 603, 447, 418, 2813, 2489, 2290, 2249, 2037, 926, 882, 924, 3235, 3210, 3835, 2195, 2517, 2908, 1733, 2428, 2091, 2021, 1828, 1566, 948, 5070, 5071, 5072, 5073 ].indexOf(id) != -1) boost = 1.2;
             return boost;
         },
         rcv: function(p) {
             var boost = 1;
             var id = p.number + 1;
-            if([ 4050, 4051, 4052, 4041, 4043, 4033, 4047, 4053 ].indexOf(id) != -1) boost = 2.5;
-            if([ 4044, 4045, 4046, 4048, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4038, 4039, 4037, 4025, 4006, 4021, 4010, 3965, 3915, 3842, 3822, 3527, 3506, 3663, 3273, 3197, 2362, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3934, 3935, 3733, 3732, 4004, 4005 ].indexOf(id) != -1) boost = 1.25;
-            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4008, 3984, 3986, 3987, 3988, 3993, 3995, 3996, 3997, 3998, 4000, 3989, 3957, 3999, 3990, 3991, 3143, 3078, 2846, 2504, 3289, 2197, 2097, 2281, 516, 227, 2908, 3017, 2785, 2649, 2755, 1978, 1378, 1310, 3580, 3385, 3940, 2835, 3307, 5543, 5544, 5545, 5546, 5535, 5536, 5537, 5538, 5520, 5521, 5522, 5523, 5206, 5207, 5208, 5209, 2698, 1861, 3083, 2723, 713, 664, 538, 424, 263 ].indexOf(id) != -1) boost = 1.2;
+            if([ 4071, 4072, 4073, 4066, 4053, 4074, 4058, 4060, 4062, 4063, 5559, 5560, 5561, 5562, 5567, 5568, 5569, 5570 ].indexOf(id) != -1) boost = 2.5;
+            if([ 4064, 4065, 4054, 4041, 4043, 4044, 4045, 4046, 4048, 4068, 4067, 4047, 4056, 3336, 4025, 4033, 4038, 4039, 4037, 3936, 3894, 3736, 3689, 3217, 3022, 2850, 2792, 2299, 1972, 5210, 5211, 5212, 5213, 3364, 3462, 3483, 3523, 3543, 3563, 3641, 3735, 3775, 3861, 3933, 4003, 4050, 5393, 5394, 5395, 5396, 5516, 5517, 5518, 5519, 5551, 5552, 5553, 5554, 3962, 3963, 3964, 3544, 3545, 4051, 4052 ].indexOf(id) != -1) boost = 1.25;
+            if([ 2936, 2938, 2940, 2942, 2944, 2946, 2948, 2950, 2952, 3884, 3886, 4029, 4032, 4031, 4030, 4011, 4012, 4020, 4022, 4023, 4010, 4021, 3671, 3263, 2956, 2670, 1815, 1879, 1432, 603, 447, 418, 2813, 2489, 2290, 2249, 2037, 926, 882, 924, 3235, 3210, 3835, 2195, 2517, 2908, 1733, 2428, 2091, 2021, 1828, 1566, 948, 5070, 5071, 5072, 5073 ].indexOf(id) != -1) boost = 1.2;
             return boost;
         },
 	},

diff --git a/common/data/units.js b/common/data/units.js