optc · ribcrush · Aug 13, 2016 · Aug 13, 2016 · Aug 13, 2016 · Aug 13, 2016
diff --git a/Chopperman.psd b/Chopperman.psd
diff --git a/README.md b/README.md
@@ -0,0 +1,33 @@
+# optc-db.github.io
+
+The Continuation of the highly loved and apreciated OPTC Database.
+
+This is a Database for all things One Piece Treasure Cruise, including Stats, Drops, Sockets and a Damage Calculator.
+
+This project is written in html and js, using angular, bootstrap and jquery.
+
+It is hosted on github pages, although you can just download it and run a local copy.
+
+# Team
+
+* Mondfischer - Took over the Project and responsible for adding features and data
+* Zeenigami - Joined shorty after and helps out with data and features (And usually adds the newest Units)
+* xfts - The newest member for fact checking and everything concerning translations
+* Everyone else on Discord/Reddit/Github etc that reports errors and wrong data
+
+# Installation
+
+Just download it and run it in some kind of Live preview or via xampp. Or better yet access it via http://optc-db.github.io
+
+Keep in mind though that the images are not hosted here, but instead linked from the offical site. So you would need an internet connection to see them.
+
+# Contact
+ You can reach us on Discord @Mondfischer and @Zeenigami and on Reddit as Mondfischer and Zee_n1
+
+ The site also has a google contact form, you can also open an Issue on here.
+
+# License
+
+ GNU General Public License
+
+ It's also in the Project named LICENSE.md.
diff --git a/characters/css/edgy.css b/characters/css/edgy.css
@@ -131,3 +131,10 @@ a:hover { color: #53dccd; }
 .pagination > li:hover > a {
     color: white;
 }
+
+@media (max-width: 1024px) {
+    #rightContainer {
+      background:   #404040;
+    }
+
+}
diff --git a/characters/css/index.css b/characters/css/index.css
@@ -1,3 +1,14 @@
+/*
+Enable for April First
+#rightContainer {
+-moz-transform: scale(1, -1);
+-webkit-transform: scale(1, -1);
+-o-transform: scale(1, -1);
+-ms-transform: scale(1, -1);
+transform: scale(1, -1);
+}
+*/
+
 @font-face {
 	font-family: 'icomoon';
 	src:url('../../res/icomoon.eot?xewvs9');
@@ -123,6 +134,7 @@ input[type="text"] {
 .BLOCK { background: darkslateblue; }
 .BOMB  { background: maroon; }
 .G     { background: orange; }
+.EMPTY { background: #777; }
 
 .cell-STR { font-weight: bold; color: red; }
 .cell-QCK { font-weight: bold; color: blue; }
@@ -315,7 +327,7 @@ input[type="text"] {
 }
 
 #controllers > span:not(.separator) {
-    width: 14.28%;
+    width: 9.09090909%;
     display: inline-block;
     padding: 2px 0;
     cursor: pointer;
@@ -842,6 +854,10 @@ unit > a:hover, .clickable:hover {
     height: 320px;
 }
 
+.chart-line {
+    height: 338px !important;
+}
+
 /*******************
  * SLOT THUMBNAILS *
  *******************/

diff --git a/characters/index.html b/characters/index.html
@@ -4,7 +4,9 @@
     <head>
 
         <meta charset="utf-8">
-        <meta name="description" itemprop="description" content="We data now">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Character Table">
+        <meta name="author" content="Zeenigami and Mondfischer">
+        <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help, Walkthroughs, Tutorials">
 
         <title>One Piece Treasure Cruise Character Table</title>
 
@@ -83,8 +85,9 @@
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-         })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', 'UA-64769042-1', 'auto');
+         })
+        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-73715806-1', 'auto');
         ga('send', 'pageview', '/characters');
         </script>
 

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
@@ -4,7 +4,7 @@
  * Common data *
  ***************/
 
-var filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 55 ] };
+var filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 99 ] };
 
 /***************
  * Controllers *
@@ -15,7 +15,10 @@ var app = angular.module('optc');
 app.controller('MainCtrl',function($scope, $rootScope, $state, $stateParams, $timeout, $storage, $controller) {
 
     var colors = Chart.defaults.global.colours;
+    //Change Default Chart Colors
+    Chart.defaults.global.colours = ["#0e91d3", "#F7464A", "#4D5360", "#97BBCD", "#F7464A", "#4D5360", "#4D5360"];
     colors = colors.splice(2,0,colors.splice(1,1)[0]);
+
 
     if (!$rootScope.hasOwnProperty('nightMode')) {
         $rootScope.nightMode = $storage.get('chars.night', false);
@@ -48,8 +51,8 @@ app.controller('SidebarCtrl',function($scope, $rootScope, $stateParams, $timeout
     });
 
     $scope.clearFilters = function() {
-        filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 55 ] };
-        $rootScope.filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 55 ] };
+        filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 99 ] };
+        $rootScope.filters = { custom: [ ], classes: [ ], stars: [ ], cost: [ 1, 99 ] };
     };
 
     $scope.onFilterClick = function(e, value) {
@@ -139,6 +142,26 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
                     location: location
                 });
             });
+
+            //Super Hack Job to show Karoo as a socket for Vivi
+            if (family == "Nefertari Vivi"){
+                if (!$scope.families.filter(function(e) { return e.uid == 445; }).length>0){
+                    $scope.families.push({
+                        uid: 445,
+                        name: units[444].name,
+                        location:  {data: ["All Difficulties"], name: "Supersonic Duck Squadron! Fortnight", thumb:445}
+                    });
+                }
+            }
+            if (family == "Demalo Black"){
+                if (!$scope.families.filter(function(e) { return e.uid == 985; }).length>0){
+                    $scope.families.push({
+                        uid: 985,
+                        name: units[985].name,
+                        location:  {data: ["Ultimate"], name: "Clash!? Impostor Straw Hat Pirates", thumb:989}
+                    });
+                }
+            }
         });
     }
 
@@ -165,6 +188,7 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
     };
     $scope.getPrevious = function() { return $stateParams.previous.concat($scope.id); };
     $scope.isCaptainHybrid = ($scope.details && $scope.details.captain && $scope.details.captain.global);
+    $scope.isSailorHybrid = ($scope.details && $scope.details.sailor && $scope.details.sailor.global);
     $scope.isSpecialHybrid = ($scope.details && $scope.details.special && $scope.details.special.global);
     $scope.isSpecialStaged = ($scope.details && $scope.details.special && $scope.details.special.constructor == Array);
 
@@ -199,14 +223,143 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
             multiTooltipTemplate: '<%= Math.round(value * { HP: 4000, ATK: 1500, RCV: 550 }[label] / 100) %>'
         }
     };
+
+    if($scope.unit.maxLevel<6)
+        $scope.showLine = false;
+
+    // radars for Line Graph
+    if ($scope.unit.incomplete) return;
+    if ($scope.unit.maxLevel>6){
+        $scope.radarHP = {
+            labels: [1,Math.ceil($scope.unit.maxLevel*0.1) , Math.ceil($scope.unit.maxLevel*0.2), Math.ceil($scope.unit.maxLevel*0.3), Math.ceil($scope.unit.maxLevel*0.4), Math.ceil($scope.unit.maxLevel*0.5), Math.ceil($scope.unit.maxLevel*0.6),Math.ceil($scope.unit.maxLevel*0.7), Math.ceil($scope.unit.maxLevel*0.8), Math.ceil($scope.unit.maxLevel*0.9), $scope.unit.maxLevel],
+            series: [$scope.unit.name+' HP'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'hp', 1),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.unit, 'hp', Math.ceil($scope.unit.maxLevel*0.9)),
+                 $scope.unit.maxHP]
+            ]};
+    $scope.radarATK = {
+            labels: [1,Math.ceil($scope.unit.maxLevel*0.1) , Math.ceil($scope.unit.maxLevel*0.2), Math.ceil($scope.unit.maxLevel*0.3), Math.ceil($scope.unit.maxLevel*0.4), Math.ceil($scope.unit.maxLevel*0.5), Math.ceil($scope.unit.maxLevel*0.6),Math.ceil($scope.unit.maxLevel*0.7), Math.ceil($scope.unit.maxLevel*0.8), Math.ceil($scope.unit.maxLevel*0.9), $scope.unit.maxLevel],
+            series: [$scope.unit.name+' ATK'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'atk', 1),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.unit, 'atk', Math.ceil($scope.unit.maxLevel*0.9)),
+                 $scope.unit.maxATK]
+            ]};
+        $scope.radarRCV = {
+            labels: [1,Math.ceil($scope.unit.maxLevel*0.1) , Math.ceil($scope.unit.maxLevel*0.2), Math.ceil($scope.unit.maxLevel*0.3), Math.ceil($scope.unit.maxLevel*0.4), Math.ceil($scope.unit.maxLevel*0.5), Math.ceil($scope.unit.maxLevel*0.6),Math.ceil($scope.unit.maxLevel*0.7), Math.ceil($scope.unit.maxLevel*0.8), Math.ceil($scope.unit.maxLevel*0.9), $scope.unit.maxLevel],
+            series: [$scope.unit.name+' RCV'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'rcv', 1),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.unit, 'rcv', Math.ceil($scope.unit.maxLevel*0.9)),
+                 $scope.unit.maxRCV]
+            ]};
+    }else{
+        $scope.radarHP = {
+            labels: ['1',$scope.unit.maxLevel],
+            series: ['HP'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'hp', 1) , $scope.unit.maxHP]
+            ]
+        };
+        $scope.radarATK = {
+            labels: ['1',$scope.unit.maxLevel],
+            series: ['ATK'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'atk', 1) , $scope.unit.maxATK]
+            ]
+        };
+        $scope.radarRCV = {
+            labels: ['1',$scope.unit.maxLevel],
+            series: ['RCV'],
+            data: [
+                [CharUtils.getStatOfUnit($scope.unit, 'rcv', 1) , $scope.unit.maxRCV]
+            ]
+        };
+    }
+
     $scope.$watch('compare',function(compare) {
+        //Delete old Comparison data
         $scope.radar.data = $scope.radar.data.slice(0,1);
+        $scope.radarHP.data = $scope.radarHP.data.slice(0,1);
+        $scope.radarHP.series = $scope.radarHP.series.slice(0,1);
+        $scope.radarATK.data = $scope.radarATK.data.slice(0,1);
+        $scope.radarATK.series = $scope.radarATK.series.slice(0,1);
+        $scope.radarRCV.data = $scope.radarRCV.data.slice(0,1);
+        $scope.radarRCV.series = $scope.radarRCV.series.slice(0,1);
         if (compare) {
             $scope.radar.data.push([
                 $scope.compare.maxHP / 4000 * 100,
                 $scope.compare.maxATK / 1500 * 100,
                 Math.max(0, $scope.compare.maxRCV / 550 * 100)
             ]);
+
+            $scope.radarHP.series.push($scope.compare.name+' HP');
+            $scope.radarHP.data.push(
+                [CharUtils.getStatOfUnit($scope.compare, 'hp', 1),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.compare, 'hp', Math.ceil($scope.compare.maxLevel*0.9)),
+                 $scope.compare.maxHP]
+            );
+            $scope.radarATK.series.push($scope.compare.name+' ATK');
+            $scope.radarATK.data.push(
+                [CharUtils.getStatOfUnit($scope.compare, 'atk', 1),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.compare, 'atk', Math.ceil($scope.compare.maxLevel*0.9)),
+                 $scope.compare.maxATK]
+            );
+            $scope.radarRCV.series.push($scope.compare.name+' RCV');
+            $scope.radarRCV.data.push(
+                [CharUtils.getStatOfUnit($scope.compare, 'rcv', 1),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.1)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.2)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.3)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.4)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.5)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.6)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.7)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.8)),
+                 CharUtils.getStatOfUnit($scope.compare, 'rcv', Math.ceil($scope.compare.maxLevel*0.9)),
+                 $scope.compare.maxRCV]
+            );
         }
         if (!$scope.$$phase) $scope.$apply();
     });
@@ -217,7 +370,7 @@ app.controller('ColumnsCtrl',function($scope, $rootScope, $state, $stateParams,
 
     $scope.columns = { 'HP/ATK': false, 'HP/RCV': false, 'ATK/RCV': false, 'ATK/CMB': false,
         'CMB': false, 'ATK/cost': false, 'HP/cost': false, 'Minimum cooldown': false,
-        'Initial cooldown': false };
+        'Initial cooldown': false,'MAX EXP': false };
 
     var additionalColumns = $storage.get('charColumns', [ ]);